gvmap make_map_from_rectangle_groups: remove now unused 'flag' parameter

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index 72811954f7d2b169d32b15dbf4755ff5881a1864..c8a48c2840196237f8743e75d2ce2885d9259bd6 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -363,7 +363,7 @@ makeMap (SparseMatrix graph, int n, double* x, double* width, int* grouping,
   make_map_from_rectangle_groups(exclude_random, pm->include_OK_points,
                                 n, dim, x, width, grouping, graph, pm->bbox_margin, &nrandom, &nart, pm->nedgep, 
                                 pm->shore_depth_tol, edge_bridge_tol, &xcombined, &nverts, &x_poly, &npolys, &poly_lines, 
-                                &polys, &polys_groups, &poly_point_map, &country_graph, pm->highlight_cluster, &flag);
+                                &polys, &polys_groups, &poly_point_map, &country_graph, pm->highlight_cluster);
 
   if (Verbose) fprintf(stderr,"nart = %d\n",nart);
   /* compute a good color permutation */
@@ -389,9 +389,8 @@ makeMap (SparseMatrix graph, int n, double* x, double* width, int* grouping,
       make_map_from_rectangle_groups(exclude_random, pm->include_OK_points,
                                     n, dim, x, width, grouping, graph, pm->bbox_margin, &nrandom, &nart, pm->nedgep, 
                                     pm->shore_depth_tol, edge_bridge_tol, &xcombined, &nverts, &x_poly, &npolys, &poly_lines, 
-                                    &polys, &polys_groups, &poly_point_map, &country_graph, pm->highlight_cluster, &flag);
+                                    &polys, &polys_groups, &poly_point_map, &country_graph, pm->highlight_cluster);
     }
-    assert(!flag);    
     {
       SparseMatrix D;
       D = SparseMatrix_get_real_adjacency_matrix_symmetrized(graph);
@@ -403,9 +402,8 @@ makeMap (SparseMatrix graph, int n, double* x, double* width, int* grouping,
       make_map_from_rectangle_groups(exclude_random, pm->include_OK_points,
                                     n, dim, x, width, grouping, graph, pm->bbox_margin, &nrandom, &nart, pm->nedgep, 
                                     pm->shore_depth_tol, edge_bridge_tol, &xcombined, &nverts, &x_poly, &npolys, &poly_lines, 
-                                    &polys, &polys_groups, &poly_point_map, &country_graph, pm->highlight_cluster, &flag);
+                                    &polys, &polys_groups, &poly_point_map, &country_graph, pm->highlight_cluster);
     }
-    assert(!flag);
     
   }
 

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index f3664448a6d4347f143e02526374d0d9a933580f..ea46c3c5f029d822b3c0366fb2ecf30ba8ab9f44 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -1323,7 +1323,7 @@ int make_map_from_rectangle_groups(int exclude_random, int include_OK_points,
                                   double shore_depth_tol, double edge_bridge_tol,
                                   double **xcombined, int *nverts, double **x_poly, 
                                   int *npolys, SparseMatrix *poly_lines, SparseMatrix *polys, int **polys_groups, SparseMatrix *poly_point_map, 
-                                  SparseMatrix *country_graph, int highlight_cluster, int *flag){
+                                  SparseMatrix *country_graph, int highlight_cluster){
 
   /* create a list of polygons from a list of rectangles in 2D. rectangles belong to groups. rectangles in the same group that are also close 
      geometrically will be in the same polygon describing the outline of the group. The main difference for this function and

diff --git a/cmd/gvmap/make_map.h b/cmd/gvmap/make_map.h
index ff290012767c6b546a1b15472083dc9668c8e7a3..c06091997a84cdc7cc3d62d49f82685c6c0f4a6b 100644 (file)
--- a/cmd/gvmap/make_map.h
+++ b/cmd/gvmap/make_map.h
@@ -17,7 +17,7 @@ int make_map_from_rectangle_groups(int exclude_random, int include_OK_points, in
                                   int *grouping, SparseMatrix graph, double bounding_box_margin[], int *nrandom,int *nart, int nedgep, 
                                   double shore_depth_tol, double edge_bridge_tol, double **xcombined, int *nverts, double **x_poly, 
                                   int *npolys, SparseMatrix *poly_lines, SparseMatrix *polys, int **polys_groups, SparseMatrix *poly_point_map, 
-                                  SparseMatrix *country_graph, int highlight_cluster, int *flag);
+                                  SparseMatrix *country_graph, int highlight_cluster);
 
 void improve_contiguity(int n, int dim, int *grouping, SparseMatrix poly_point_map, double *x, SparseMatrix graph);