sparse: remove 'weight' from 'QuadTree_new_from_point_list'

This parameter is always passed as `NULL`.

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index 602808711d392db9154fc455cde25ab0c1ad029c..8e1c30358e56e250ac716ae02aac30fc67757fac 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -1115,9 +1115,9 @@ static int make_map_internal(int exclude_random, int include_OK_points,
       fprintf(stderr, "after adding edge points, n:%d->%d\n",n, nz);
       n = nz;
       x = y;
-      qt = QuadTree_new_from_point_list(dim, nz, max_qtree_level, y, NULL);
+      qt = QuadTree_new_from_point_list(dim, nz, max_qtree_level, y);
     } else {
-      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
     }
   }
   graph = NULL;

diff --git a/lib/edgepaint/lab.c b/lib/edgepaint/lab.c
index 67334853819d479a292510dfe6a44cebbcfbb0e8..44e698f6c6ee953ca292b30f8f5c2b8d83040ca9 100644 (file)
--- a/lib/edgepaint/lab.c
+++ b/lib/edgepaint/lab.c
@@ -194,7 +194,7 @@ QuadTree lab_gamut_quadtree(const char *lightness, int max_qtree_level){
   int dim = 3;
 
   if (!x) return NULL;
-  qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+  qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
 
 
   free(x);

diff --git a/lib/edgepaint/node_distinct_coloring.c b/lib/edgepaint/node_distinct_coloring.c
index 43e31cdc1c5ecf0da839f87142055f82c6e7a71b..64e9d1ca05dd9bb944b273022206de3d82763ea9 100644 (file)
--- a/lib/edgepaint/node_distinct_coloring.c
+++ b/lib/edgepaint/node_distinct_coloring.c
@@ -230,7 +230,7 @@ int node_distinct_coloring(char *color_scheme, char *lightness, bool weightedQ,
     scheme = COLOR_LAB;
     color_blend_rgb2lab(color_scheme, maxcolors, &colors);
     assert(colors);
-    qt = QuadTree_new_from_point_list(cdim, maxcolors, max_qtree_level, colors, NULL);
+    qt = QuadTree_new_from_point_list(cdim, maxcolors, max_qtree_level, colors);
     assert(qt);
   } else {
     return ERROR_BAD_COLOR_SCHEME;

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index a09d9295e889f046ae100a79fbe2646f94a78a48..b3dfc9edcaa8e81c066895bc16792e6d90d67b7d 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -550,7 +550,7 @@ void spring_electrical_embedding_fast(int dim, SparseMatrix A0, spring_electrica
 #ifdef TIME
     start = clock();
 #endif
-    qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+    qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
 
 #ifdef TIME
     qtree_new_cpu += ((double) (clock() - start))/CLOCKS_PER_SEC;
@@ -747,7 +747,7 @@ static void spring_electrical_embedding_slow(int dim, SparseMatrix A0, spring_el
 
     if (USE_QT) {
       max_qtree_level = oned_optimizer_get(qtree_level_optimizer);
-      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
     }
 #ifdef TIME
     start2 = clock();
@@ -991,7 +991,7 @@ void spring_electrical_embedding(int dim, SparseMatrix A0, spring_electrical_con
     if (USE_QT) {
 
       max_qtree_level = oned_optimizer_get(qtree_level_optimizer);
-      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
 
        
     }
@@ -1282,7 +1282,7 @@ static void spring_maxent_embedding(int dim, SparseMatrix A0, SparseMatrix D, sp
 #endif
 
     if (USE_QT) {
-      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
     }
 
     /*
@@ -1467,7 +1467,7 @@ void spring_electrical_spring_embedding(int dim, SparseMatrix A0, SparseMatrix D
     nsuper_avg = 0;
 
     if (USE_QT) {
-      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x, NULL);
+      qt = QuadTree_new_from_point_list(dim, n, max_qtree_level, x);
     }
 
     for (i = 0; i < n; i++){

diff --git a/lib/sparse/QuadTree.c b/lib/sparse/QuadTree.c
index eeb9092490d8084e8722fbae7cb4458c5863402e..19b697505d417c652e392c47cab57a51033e0e6b 100644 (file)
--- a/lib/sparse/QuadTree.c
+++ b/lib/sparse/QuadTree.c
@@ -341,10 +341,9 @@ void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double
   for (i = 0; i < 4; i++) counts[i] /= n;
 
 }
-QuadTree QuadTree_new_from_point_list(int dim, int n, int max_level, double *coord, double *weight){
+QuadTree QuadTree_new_from_point_list(int dim, int n, int max_level, double *coord){
   /* form a new QuadTree data structure from a list of coordinates of n points
      coord: of length n*dim, point i sits at [i*dim, i*dim+dim - 1]
-     weight: node weight of lentgth n. If NULL, unit weight assumed.
    */
   double *xmin, *xmax, *center, width;
   QuadTree qt = NULL;
@@ -379,14 +378,8 @@ QuadTree QuadTree_new_from_point_list(int dim, int n, int max_level, double *coo
   width *= 0.52;
   qt = QuadTree_new(dim, center, width, max_level);
 
-  if (weight){
-    for (i = 0; i < n; i++){
-      qt = QuadTree_add(qt, &(coord[i*dim]), weight[i], i);
-    }
-  } else {
-    for (i = 0; i < n; i++){
-      qt = QuadTree_add(qt, &(coord[i*dim]), 1, i);
-    }
+  for (i = 0; i < n; i++){
+    qt = QuadTree_add(qt, &(coord[i*dim]), 1, i);
   }
 
 

diff --git a/lib/sparse/QuadTree.h b/lib/sparse/QuadTree.h
index 4fd52bd4b51f4ccbebd82b932ecc896fd16f09ab..2c2f684ec3201650f64a906d685da1700b8edf4e 100644 (file)
--- a/lib/sparse/QuadTree.h
+++ b/lib/sparse/QuadTree.h
@@ -46,7 +46,7 @@ QuadTree QuadTree_add(QuadTree q, double *coord, double weight, int id);/* coord
 
 void QuadTree_print(FILE *fp, QuadTree q);
 
-QuadTree QuadTree_new_from_point_list(int dim, int n, int max_level, double *coord, double *weight);
+QuadTree QuadTree_new_from_point_list(int dim, int n, int max_level, double *coord);
 
 double point_distance(double *p1, double *p2, int dim);