gvmap: remove 'accuracy' parameter from 'map_palette_optimal_coloring'

This is always passed as 0.01.

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index d1b7bd2ae897e4935c20df303ec6102a96097780..0f2ed36b1e88ced0ccc28eb00906931d8246b0f8 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -370,7 +370,7 @@ makeMap (SparseMatrix graph, int n, double* x, double* width, int* grouping,
   if (pm->color_optimize && country_graph && rgb_r && rgb_g && rgb_b) 
     map_optimal_coloring(pm->seed, country_graph, rgb_r,  rgb_g, rgb_b);
   else if (pm->color_scheme_str){
-    map_palette_optimal_coloring(pm->color_scheme_str, country_graph, 0.01, -10,
+    map_palette_optimal_coloring(pm->color_scheme_str, country_graph, -10,
                &rgb_r, &rgb_g, &rgb_b);
   }
 

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index 3b238171dc202b756046f1c4e432ea173ca7b1db..262b2368ca9a2b6c5b1c708d9d4e7a81ce80ac82 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -28,16 +28,13 @@
 #include <edgepaint/lab.h>
 #include <edgepaint/node_distinct_coloring.h>
 
-void map_palette_optimal_coloring(char *color_scheme, SparseMatrix A0, double accuracy, int seed, 
+void map_palette_optimal_coloring(char *color_scheme, SparseMatrix A0, int seed, 
                                  float **rgb_r, float **rgb_g, float **rgb_b){
   /*
     for a graph A, get a distinctive color of its nodes so that the color distanmce among all nodes are maximized. Here
     color distance on a node is defined as the minimum of color differences between a node and its neighbors.
-    accuracy is the threshold given so that when finding the coloring for each node, the optimal is
-    with in "accuracy" of the true global optimal.
     color_scheme: rgb, gray, lab, or one of the color palettes in color_palettes.h, or a list of hex rgb colors separaterd by comma like "#ff0000,#00ff00"
     A: the graph of n nodes
-    accuracy: how accurate to find the optimal
     cdim: dimension of the color space
     seed: random_seed. If negative, consider -seed as the number of random start iterations
     rgb_r, rgb_g, rgb_b: float array of length A->m + 1, which contains color for each country. 1-based
@@ -65,6 +62,10 @@ void map_palette_optimal_coloring(char *color_scheme, SparseMatrix A0, double ac
   // color. Ignored if scheme is not COLOR_LAB.
   char *lightness = "0,100";
 
+  // accuracy is the threshold given so that when finding the coloring for each
+  // node, the optimal is with in "accuracy" of the true global optimal.
+  const double accuracy = 0.01;
+
   node_distinct_coloring(color_scheme, lightness, weightedQ, A, accuracy, seed,
                          &cdim, &colors);
 

diff --git a/cmd/gvmap/make_map.h b/cmd/gvmap/make_map.h
index 156ce2d5c23e91ad9251b614d404ea2069c5c8d9..01ccfdc8dd3fcb24f273e1f7d390819d23679ea9 100644 (file)
--- a/cmd/gvmap/make_map.h
+++ b/cmd/gvmap/make_map.h
@@ -28,7 +28,7 @@ void plot_dot_map(Agraph_t* gr, int n, int dim, double *x, SparseMatrix polys,
                   const char* opacity, SparseMatrix A, FILE*);
 
 void map_optimal_coloring(int seed, SparseMatrix A, float *rgb_r,  float *rgb_g, float *rgb_b);
-void map_palette_optimal_coloring(char *color_scheme, SparseMatrix A, double accuracy, int seed, float **rgb_r, float **rgb_g, float **rgb_b);
+void map_palette_optimal_coloring(char *color_scheme, SparseMatrix A, int seed, float **rgb_r, float **rgb_g, float **rgb_b);
 
 enum {POLY_LINE_REAL_EDGE, POLY_LINE_NOT_REAL_EDGE};
 #define neighbor(t, i, edim, elist) elist[(edim)*(t)+i]