sfdpgen spring_electrical_control: remove 'multilevel_coarsen_scheme'

This was never set to anything other than
`COARSEN_INDEPENDENT_EDGE_SET_HEAVEST_EDGE_PERNODE_SUPERNODES_FIRST`.

diff --git a/lib/sfdpgen/Multilevel.c b/lib/sfdpgen/Multilevel.c
index 2ca9314534dbda235dc94193d3be41389c1da7b8..83f827762d87b9c27583f5b41f0d5b0f5e84c0c2 100644 (file)
--- a/lib/sfdpgen/Multilevel.c
+++ b/lib/sfdpgen/Multilevel.c
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-Multilevel_control Multilevel_control_new(int scheme, int mode){
+Multilevel_control Multilevel_control_new(int mode) {
   Multilevel_control ctrl;
 
   ctrl = GNEW(struct Multilevel_control_struct);
@@ -25,15 +25,10 @@ Multilevel_control Multilevel_control_new(int scheme, int mode){
   ctrl->maxlevel = 1<<30;
   ctrl->randomize = TRUE;
   /* now set in spring_electrical_control_new(), as well as by command line argument -c
-    ctrl->coarsen_scheme = COARSEN_INDEPENDENT_EDGE_SET_HEAVEST_CLUSTER_PERNODE_LEAVES_FIRST;
-    ctrl->coarsen_scheme = COARSEN_INDEPENDENT_VERTEX_SET_RS;
-    ctrl->coarsen_scheme = COARSEN_INDEPENDENT_EDGE_SET_HEAVEST_EDGE_PERNODE;
-    ctrl->coarsen_scheme = COARSEN_HYBRID;
-    ctrl->coarsen_scheme = COARSEN_INDEPENDENT_EDGE_SET_HEAVEST_EDGE_PERNODE_SUPERNODES_FIRST;
     ctrl->coarsen_mode = COARSEN_MODE_FORCEFUL; or COARSEN_MODE_GENTLE;
   */
 
-  ctrl->coarsen_scheme = scheme;
+  ctrl->coarsen_scheme = COARSEN_INDEPENDENT_EDGE_SET_HEAVEST_EDGE_PERNODE_SUPERNODES_FIRST;
   ctrl->coarsen_mode = mode;
   return ctrl;
 }

diff --git a/lib/sfdpgen/Multilevel.h b/lib/sfdpgen/Multilevel.h
index 7826857a32ca16a48c95e162fb2000377f4b1c28..e83474376a8de7220160776c39a902ee7d90e7b6 100644 (file)
--- a/lib/sfdpgen/Multilevel.h
+++ b/lib/sfdpgen/Multilevel.h
@@ -48,7 +48,7 @@ struct Multilevel_control_struct {
 
 typedef struct Multilevel_control_struct *Multilevel_control;
 
-Multilevel_control Multilevel_control_new(int scheme, int mode);
+Multilevel_control Multilevel_control_new(int mode);
 
 void Multilevel_control_delete(Multilevel_control ctrl);
 

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index 7da5e1e209a15ea94ef32bec8b3ce8a8703f343c..bd6f8fbd653384d021f044ccb4c7a3dc0d23e1ed 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -40,10 +40,8 @@ spring_electrical_control spring_electrical_control_new(){
   ctrl->C = 0.2;/* another parameter. f_a(i,j) = C*dist(i,j)^2/K * d_ij, f_r(i,j) = K^(3-p)/dist(i,j)^(-p). By default C = 0.2. */
   ctrl->multilevels = FALSE;/* if <=1, single level */
 
-  //ctrl->multilevel_coarsen_scheme = COARSEN_INDEPENDENT_EDGE_SET;
   //ctrl->multilevel_coarsen_mode = COARSEN_MODE_GENTLE;
 
-  ctrl->multilevel_coarsen_scheme = COARSEN_INDEPENDENT_EDGE_SET_HEAVEST_EDGE_PERNODE_SUPERNODES_FIRST;  /* pass on to Multilevel_control->coarsen_scheme */
   ctrl->multilevel_coarsen_mode = COARSEN_MODE_FORCEFUL;/*alternative: COARSEN_MODE_GENTLE. pass on to Multilevel_control->coarsen_mode */
 
 
@@ -89,8 +87,8 @@ void spring_electrical_control_print(spring_electrical_control ctrl){
   fprintf (stderr, "  repulsive and attractive exponents: %.03f %.03f\n", ctrl->p, ctrl->q);
   fprintf (stderr, "  random start %d seed %d\n", ctrl->random_start, ctrl->random_seed);
   fprintf (stderr, "  K : %.03f C : %.03f\n", ctrl->K, ctrl->C);
-  fprintf (stderr, "  max levels %d coarsen_scheme %d coarsen_node %d\n", ctrl->multilevels,
-    ctrl->multilevel_coarsen_scheme,ctrl->multilevel_coarsen_mode);
+  fprintf (stderr, "  max levels %d coarsen_node %d\n", ctrl->multilevels,
+           ctrl->multilevel_coarsen_mode);
   fprintf (stderr, "  quadtree size %d max_level %d\n", ctrl->quadtree_size, ctrl->max_qtree_level);
   fprintf (stderr, "  Barnes-Hutt constant %.03f tolerance  %.03f maxiter %d\n", ctrl->bh, ctrl->tol, ctrl->maxiter);
   fprintf (stderr, "  cooling %.03f step size  %.03f adaptive %d\n", ctrl->cool, ctrl->step, ctrl->adaptive_cooling);
@@ -1916,7 +1914,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0
     return;
   }
 
-  mctrl = Multilevel_control_new(ctrl->multilevel_coarsen_scheme, ctrl->multilevel_coarsen_mode);
+  mctrl = Multilevel_control_new(ctrl->multilevel_coarsen_mode);
   mctrl->maxlevel = ctrl->multilevels;
   grid0 = Multilevel_new(A, D, mctrl);
 

diff --git a/lib/sfdpgen/spring_electrical.h b/lib/sfdpgen/spring_electrical.h
index 932bab01e5b6caacbb0508266cb50669071ab708..8018a649eba1941feefbf2b1008f32c5b404ea58 100644 (file)
--- a/lib/sfdpgen/spring_electrical.h
+++ b/lib/sfdpgen/spring_electrical.h
@@ -32,7 +32,6 @@ struct spring_electrical_control_struct {
   double K;/* the natural distance. If K < 0, K will be set to the average distance of an edge */
   double C;/* another parameter. f_a(i,j) = C*dist(i,j)^2/K * d_ij, f_r(i,j) = K^(3-p)/dist(i,j)^(-p). By default C = 0.2. */
   int multilevels;/* if <=1, single level */
-  int multilevel_coarsen_scheme;/* pass on to Multilevel_control->coarsen_scheme */
   int multilevel_coarsen_mode;/* pass on to Multilevel_control->coarsen_mode */
   int quadtree_size;/* cut off size above which quadtree approximation is used */
   int max_qtree_level;/* max level of quadtree */