sparse: remove 'node_weights' from 'multilevel_spring_electrical_embedding'

This parameter is always passed as `NULL`.

diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c
index 74fb94bc61749470994768d8f9e02e2cf01d1bf9..38a347015df4f655b7c8a156883a9eb3eaaeec60 100644 (file)
--- a/lib/sfdpgen/sfdpinit.c
+++ b/lib/sfdpgen/sfdpinit.c
@@ -108,7 +108,7 @@ static void sfdpLayout(graph_t * g, spring_electrical_control ctrl,
     switch (ctrl->method) {
     case METHOD_SPRING_ELECTRICAL:
     case METHOD_SPRING_MAXENT:
-       multilevel_spring_electrical_embedding(Ndim, A, D, ctrl, NULL, sizes, pos, n_edge_label_nodes, edge_label_nodes, &flag);
+       multilevel_spring_electrical_embedding(Ndim, A, D, ctrl, sizes, pos, n_edge_label_nodes, edge_label_nodes, &flag);
        break;
     case METHOD_UNIFORM_STRESS:
        uniform_stress(Ndim, A, pos, &flag);

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 538393f1c96283e667aa4e2fbd180b27f0113b8f..3b55ffaf6415a996da17d9cdd03dcda986b166b1 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -1924,7 +1924,7 @@ static SparseMatrix shorting_edge_label_nodes(SparseMatrix A, int n_edge_label_n
 
 }
 
-static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0, SparseMatrix D0, spring_electrical_control ctrl, double *node_weights, double *label_sizes,
+static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0, SparseMatrix D0, spring_electrical_control ctrl, double *label_sizes,
                                            double *x, int n_edge_label_nodes, int *edge_label_nodes, int *flag){
 
 
@@ -1972,7 +1972,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
 
     double *x2 = MALLOC(sizeof(double)*(A->m)*dim);
     A2 = shorting_edge_label_nodes(A, n_edge_label_nodes, edge_label_nodes);
-    multilevel_spring_electrical_embedding(dim, A2, NULL, ctrl, NULL, NULL, x2, 0, NULL, flag);
+    multilevel_spring_electrical_embedding(dim, A2, NULL, ctrl, NULL, x2, 0, NULL, flag);
 
     assert(!(*flag));
     attach_edge_label_coordinates(dim, A, n_edge_label_nodes, edge_label_nodes, x, x2);
@@ -1987,7 +1987,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
 
   mctrl = Multilevel_control_new(ctrl->multilevel_coarsen_scheme, ctrl->multilevel_coarsen_mode);
   mctrl->maxlevel = ctrl->multilevels;
-  grid0 = Multilevel_new(A, D, node_weights, mctrl);
+  grid0 = Multilevel_new(A, D, NULL, mctrl);
 
   grid = Multilevel_get_coarsest(grid0);
   if (Multilevel_is_finest(grid)){
@@ -2083,7 +2083,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
   cpu = clock();
 #endif
 
-  post_process_smoothing(dim, A, ctrl, node_weights, x, flag);
+  post_process_smoothing(dim, A, ctrl, NULL, x, flag);
 
   if (Verbose) fprintf(stderr, "ctrl->overlap=%d\n",ctrl->overlap);
 
@@ -2105,7 +2105,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
   Multilevel_delete(grid0);
 }
 
-void multilevel_spring_electrical_embedding(int dim, SparseMatrix A, SparseMatrix D, spring_electrical_control ctrl, double *node_weights, double *label_sizes,
+void multilevel_spring_electrical_embedding(int dim, SparseMatrix A, SparseMatrix D, spring_electrical_control ctrl, double *label_sizes,
                                 double *x, int n_edge_label_nodes, int *edge_label_nodes, int *flag){
-  multilevel_spring_electrical_embedding_core(dim, A, D, ctrl, node_weights, label_sizes, x, n_edge_label_nodes, edge_label_nodes, flag);
+  multilevel_spring_electrical_embedding_core(dim, A, D, ctrl, label_sizes, x, n_edge_label_nodes, edge_label_nodes, flag);
 }

diff --git a/lib/sfdpgen/spring_electrical.h b/lib/sfdpgen/spring_electrical.h
index 894dbf3b87b5d40b36002d37c13aa2c9955ffdf4..abc7b3092d2f0ecda8d638dd753d618e13eb537e 100644 (file)
--- a/lib/sfdpgen/spring_electrical.h
+++ b/lib/sfdpgen/spring_electrical.h
@@ -69,7 +69,7 @@ void spring_electrical_control_print(spring_electrical_control ctrl);
 void spring_electrical_embedding(int dim, SparseMatrix A0, spring_electrical_control ctrl, double *node_weights, double *x, int *flag);
 void spring_electrical_embedding_fast(int dim, SparseMatrix A0, spring_electrical_control ctrl, double *node_weights, double *x, int *flag);
 
-void multilevel_spring_electrical_embedding(int dim, SparseMatrix A0, SparseMatrix D, spring_electrical_control ctrl, double *node_weights, double *label_sizes, 
+void multilevel_spring_electrical_embedding(int dim, SparseMatrix A0, SparseMatrix D, spring_electrical_control ctrl, double *label_sizes, 
                                            double *x, int n_edge_label_nodes, int *edge_label_nodes, int *flag);
 
 void export_embedding(FILE *fp, int dim, SparseMatrix A, double *x, double *width);