]> granicus.if.org Git - graphviz/commitdiff
stress_majorization_kD_mkernel: remove unused 'nedges_graph' parameter
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 26 Jun 2022 22:43:35 +0000 (15:43 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 26 Jun 2022 22:43:35 +0000 (15:43 -0700)
lib/neatogen/constrained_majorization.c
lib/neatogen/neatoinit.c
lib/neatogen/stress.c
lib/neatogen/stress.h

index e83e5bf60b9741d4b09aa66bae59e96de0d441af..53a9334fe1668a0c084dd64dccd0037c3f6e4c69 100644 (file)
@@ -91,7 +91,7 @@ int stress_majorization_with_hierarchy(vtx_data * graph,      /* Input graph in spars
        }
     }
     if (!directionalityExist) {
-       return stress_majorization_kD_mkernel(graph, n, nedges_graph,
+       return stress_majorization_kD_mkernel(graph, n,
                                              d_coords, nodes, dim, opts,
                                              model, maxi);
     }
@@ -105,7 +105,7 @@ int stress_majorization_with_hierarchy(vtx_data * graph,    /* Input graph in spars
        double *y;
        if (dim > 2) {
            /* the dim==2 case is handled below                      */
-           if (stress_majorization_kD_mkernel(graph, n, nedges_graph,
+           if (stress_majorization_kD_mkernel(graph, n,
                                           d_coords + 1, nodes, dim - 1,
                                           opts, model, 15) < 0)
                return -1;
@@ -128,7 +128,7 @@ int stress_majorization_with_hierarchy(vtx_data * graph,    /* Input graph in spars
        }
        if (num_levels < 1) {
            /* no hierarchy found, use faster algorithm */
-           return stress_majorization_kD_mkernel(graph, n, nedges_graph,
+           return stress_majorization_kD_mkernel(graph, n,
                                                  d_coords, nodes, dim,
                                                  opts, model, maxi);
        }
index b27539f86c8f10852ae884a13da88cc1343484f2..775e7ed779522a9599279c4a99fbff2a4c52ae16 100644 (file)
@@ -1242,7 +1242,7 @@ majorization(graph_t *mg, graph_t * g, int nv, int mode, int model, int dim, adj
     }
     else
 #endif
-       rv = stress_majorization_kD_mkernel(gp, nv, ne, coords, nodes, Ndim, opts, model, MaxIter);
+       rv = stress_majorization_kD_mkernel(gp, nv, coords, nodes, Ndim, opts, model, MaxIter);
 
     if (rv < 0) {
        agerr(AGPREV, "layout aborted\n");
index 1f16026d6419ad4db4437096134bd6f0c2a2d545..032fe3050bd4fbdff909ac5bed975d6f61531ed4 100644 (file)
@@ -862,7 +862,6 @@ static void dumpMatrix(float *Dij, int n)
  */
 int stress_majorization_kD_mkernel(vtx_data * graph,   /* Input graph in sparse representation */
                                   int n,       /* Number of nodes */
-                                  int nedges_graph,    /* Number of edges */
                                   double **d_coords,   /* coordinates of nodes (output layout) */
                                   node_t ** nodes,     /* original nodes */
                                   int dim,     /* dimemsionality of layout */
index 3e1d85a357af200ecec3715a34ca7c4f928a1fe0..3e6467efe0acab02fc9ed895d93aec5926257137 100644 (file)
@@ -42,7 +42,6 @@ extern "C" {
     /* Slowest and most accurate optimization */
     extern int stress_majorization_kD_mkernel(vtx_data * graph,        /* Input graph in sparse representation */
                                              int n,    /* Number of nodes */
-                                             int nedges_graph, /* Number of edges */
                                              double **coords,  /* coordinates of nodes (output layout)  */
                                              node_t **nodes,   /* original nodes  */
                                              int dim,  /* dimemsionality of layout */