remove unused norm_1 output parameter to country_graph_coloring

diff --git a/cmd/gvmap/country_graph_coloring.c b/cmd/gvmap/country_graph_coloring.c
index fd314f759ccf4186cd352ee11f80a597e9cab007..a706f9e08d9b10a59330e7a046d02c68374c533f 100644 (file)
--- a/cmd/gvmap/country_graph_coloring.c
+++ b/cmd/gvmap/country_graph_coloring.c
@@ -162,6 +162,7 @@ static void country_graph_coloring_internal(int seed, SparseMatrix A, int **p, r
   if (A2 != A) SparseMatrix_delete(A2);
   SparseMatrix_delete(L);
 }
-void country_graph_coloring(int seed, SparseMatrix A, int **p, real *norm_1){
-  country_graph_coloring_internal(seed, A, p, norm_1);
+void country_graph_coloring(int seed, SparseMatrix A, int **p){
+  real norm_1;
+  country_graph_coloring_internal(seed, A, p, &norm_1);
 }

diff --git a/cmd/gvmap/country_graph_coloring.h b/cmd/gvmap/country_graph_coloring.h
index 9d8a0d476098ab4f0a8bc3dae1dc8dbb773438b7..45cb1469e26abd1e730d1a80a973c151187dab6d 100644 (file)
--- a/cmd/gvmap/country_graph_coloring.h
+++ b/cmd/gvmap/country_graph_coloring.h
@@ -13,7 +13,7 @@
 
 #include <sparse/SparseMatrix.h>
 
-void country_graph_coloring(int seed, SparseMatrix A, int **p, real *norm_1);
+void country_graph_coloring(int seed, SparseMatrix A, int **p);
 
 void improve_antibandwidth_by_swapping(SparseMatrix A, int *p);
 

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index f40e4bb976511511dc147152b38944915f0968d6..a593e228b60b34b532677c0b46dbab1c2fed26ca 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -90,9 +90,8 @@ void map_optimal_coloring(int seed, SparseMatrix A, float *rgb_r,  float *rgb_g,
   float *u = NULL;
   int n = A->m;
   int i;
-  real norm1;
 
-  country_graph_coloring(seed, A, &p, &norm1);
+  country_graph_coloring(seed, A, &p);
 
   rgb_r++; rgb_b++; rgb_g++;/* seems necessary, but need to better think about cases when clusters are not contiguous */
   vector_float_take(n, rgb_r, n, p, &u);