remove useless flag parameter to remove_overlap

This function has no path in which it sets this output parameter to non-zero.

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index 65c419750f8f9b093f90b95921fa9f40b6230aa0..f7c99ac5f3aeb2e98e701183a1ee395084a2339a 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -408,7 +408,7 @@ makeMap (SparseMatrix graph, int n, real* x, real* width, int* grouping,
       SparseMatrix D;
       D = SparseMatrix_get_real_adjacency_matrix_symmetrized(graph);
       remove_overlap(dim, D, x, width, 1000, 5000.,
-                    ELSCHEME_NONE, 0, NULL, NULL, TRUE, &flag);
+                    ELSCHEME_NONE, 0, NULL, NULL, TRUE);
       
       nart = nart0;
       nrandom = nr0;

diff --git a/lib/neatogen/adjust.c b/lib/neatogen/adjust.c
index 2d0f31a3fbc1ae925fff5c4c4327e3bc62dbe132..5470d1aea80a9fcf0b25876df6cf22f1ef887961 100644 (file)
--- a/lib/neatogen/adjust.c
+++ b/lib/neatogen/adjust.c
@@ -749,7 +749,7 @@ fdpAdjust (graph_t* g, adjust_data* am)
     real *sizes;
     real *pos = N_NEW(Ndim * agnnodes(g), real);
     Agnode_t *n;
-    int flag, i;
+    int flag = 0, i;
     expand_t sep = sepFactor(g);
     pointf pad;
 
@@ -777,7 +777,7 @@ fdpAdjust (graph_t* g, adjust_data* am)
     }
 
     remove_overlap(Ndim, A, pos, sizes, am->value, am->scaling, 
-                  ELSCHEME_NONE, 0, NULL, NULL, mapBool (agget(g, "overlap_shrink"), TRUE), &flag);
+                  ELSCHEME_NONE, 0, NULL, NULL, mapBool (agget(g, "overlap_shrink"), TRUE));
 
     for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
        real *npos = pos + (Ndim * ND_id(n));

diff --git a/lib/neatogen/overlap.c b/lib/neatogen/overlap.c
index 83061cb7feb59c184beab7e4c9d263bf3eecc611..8828c18899e91b36238bdaef9a357394bae04888 100644 (file)
--- a/lib/neatogen/overlap.c
+++ b/lib/neatogen/overlap.c
@@ -539,7 +539,7 @@ static int check_convergence(real max_overlap, real res, int has_penalty_terms,
 }
 
 void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling, 
-                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking, int *flag){
+                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking){
   /* 
      edge_labeling_scheme: if ELSCHEME_NONE, n_constr_nodes/constr_nodes/A_constr are not used
 
@@ -584,8 +584,6 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
 
   if (!ntry) return;
 
-  *flag = 0;
-
 #ifdef DEBUG
   _statistics[0] = _statistics[1] = 0.;
   {FILE*fp;
@@ -640,7 +638,7 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
   if (has_penalty_terms){
     /* now do without penalty */
     remove_overlap(dim, A, x, label_sizes, ntry, 0.,
-                  ELSCHEME_NONE, 0, NULL, NULL, do_shrinking, flag);
+                  ELSCHEME_NONE, 0, NULL, NULL, do_shrinking);
   }
 
 #ifdef DEBUG
@@ -672,7 +670,7 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
 #include <common/types.h>
 #include <sparse/SparseMatrix.h>
 void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling,
-                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking, int *flag)
+                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking)
 {
     static int once;
 
@@ -687,7 +685,6 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
     (void)constr_nodes;
     (void)A_constr;
     (void)do_shrinking;
-    (void)flag;
 
     if (once == 0) {
        once = 1;

diff --git a/lib/neatogen/overlap.h b/lib/neatogen/overlap.h
index 13e03c37abe63de40e4908b1daa8b8a1e1ba0e8d..108f89a90dea7a1945d3521c1be0541f03c4d042 100644 (file)
--- a/lib/neatogen/overlap.h
+++ b/lib/neatogen/overlap.h
@@ -49,5 +49,5 @@ typedef struct relative_position_constraints_struct*  relative_position_constrai
 real OverlapSmoother_smooth(OverlapSmoother sm, int dim, real *x);
 
 void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling, 
-                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int doShrink, int *flag);
+                   int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int doShrink);
 real overlap_scaling(int dim, int m, real *x, real *width, real scale_sta, real scale_sto, real epsilon, int maxiter);

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 9e2cd9d071ec3bee3bf74167ff585b3da42af153..209ba64e0fb84bc84d2ffaa206cac75acc33f769 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -2003,7 +2003,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
     assert(!(*flag));
     attach_edge_label_coordinates(dim, A, n_edge_label_nodes, edge_label_nodes, x, x2);
     remove_overlap(dim, A, x, label_sizes, ctrl->overlap, ctrl->initial_scaling,
-                  ctrl->edge_labeling_scheme, n_edge_label_nodes, edge_label_nodes, A, ctrl->do_shrinking, flag);
+                  ctrl->edge_labeling_scheme, n_edge_label_nodes, edge_label_nodes, A, ctrl->do_shrinking);
     SparseMatrix_delete(A2);
     FREE(x2);
     if (A != A0) SparseMatrix_delete(A);
@@ -2123,7 +2123,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
 
 
   remove_overlap(dim, A, x, label_sizes, ctrl->overlap, ctrl->initial_scaling,
-                ctrl->edge_labeling_scheme, n_edge_label_nodes, edge_label_nodes, A, ctrl->do_shrinking, flag);
+                ctrl->edge_labeling_scheme, n_edge_label_nodes, edge_label_nodes, A, ctrl->do_shrinking);
 
  RETURN:
   *ctrl = ctrl0;