remove unused label_sizes argument to improve_contiguity

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index 44e331bb2ca5c36d3482162c514d82fdaa8e26e3..83517fc294765cbbbe05e2cda2eac52c6b8248de 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -525,7 +525,7 @@ makeMap (SparseMatrix graph, int n, real* x, real* width, int* grouping,
      contiguous so we move point positions to improve contiguity */
   if (graph && improve_contiguity_n) {
     for (i = 0; i < improve_contiguity_n; i++){
-      improve_contiguity(n, dim, grouping, poly_point_map, x, graph, width);
+      improve_contiguity(n, dim, grouping, poly_point_map, x, graph);
       nart = nart0;
       nrandom = nr0;
       make_map_from_rectangle_groups(exclude_random, pm->include_OK_points,

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index 4382cb9a667910e28120bd4d82bb2dabaafb9cfb..e95cdc803a9d6fcb1d5d156bbcaac6dc6a66feb9 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -112,7 +112,7 @@ static int get_poly_id(int ip, SparseMatrix point_poly_map){
   return point_poly_map->ja[point_poly_map->ia[ip]];
 }
  
-void improve_contiguity(int n, int dim, int *grouping, SparseMatrix poly_point_map, real *x, SparseMatrix graph, real *label_sizes){
+void improve_contiguity(int n, int dim, int *grouping, SparseMatrix poly_point_map, real *x, SparseMatrix graph){
  /* 
      grouping: which group each of the vertex belongs to
      poly_point_map: a matrix of dimension npolys x (n + nrandom), poly_point_map[i,j] != 0 if polygon i contains the point j.

diff --git a/cmd/gvmap/make_map.h b/cmd/gvmap/make_map.h
index f9ed10251c695a4ba0f978afa98a3ffc11b5998a..4865fc9de72e21e97798b094c7e84536322afb8e 100644 (file)
--- a/cmd/gvmap/make_map.h
+++ b/cmd/gvmap/make_map.h
@@ -26,7 +26,7 @@ int make_map_from_point_groups(int exclude_random, int include_OK_points, int n,
                               SparseMatrix *country_graph, int *flag);
 
 
-void improve_contiguity(int n, int dim, int *grouping, SparseMatrix poly_point_map, real *x, SparseMatrix graph, real *label_sizes);
+void improve_contiguity(int n, int dim, int *grouping, SparseMatrix poly_point_map, real *x, SparseMatrix graph);
 
 
 #if 0