neatogen initLayout: remove unused 'graph' parameter

diff --git a/lib/neatogen/constrained_majorization.c b/lib/neatogen/constrained_majorization.c
index 46136b68da49d5e058c4513782257cbb9e278482..e30c7db788165b46ed42eb09a21b4916feac7287 100644 (file)
--- a/lib/neatogen/constrained_majorization.c
+++ b/lib/neatogen/constrained_majorization.c
@@ -155,7 +155,7 @@ int stress_majorization_with_hierarchy(vtx_data * graph,    /* Input graph in spars
            }
        }
     } else {
-       initLayout(graph, n, dim, d_coords, nodes);
+       initLayout(n, dim, d_coords, nodes);
        if (compute_hierarchy(graph, n, abs_tol, relative_tol, NULL, &ordering,
                          &levels, &num_levels)) {
            iterations = -1;

diff --git a/lib/neatogen/constrained_majorization_ipsep.c b/lib/neatogen/constrained_majorization_ipsep.c
index fce7362c1586414f26f35b43c38889ec1dd84db2..34b1292e6ed52bd0534491d7d5aeb296e45edc23 100644 (file)
--- a/lib/neatogen/constrained_majorization_ipsep.c
+++ b/lib/neatogen/constrained_majorization_ipsep.c
@@ -100,7 +100,7 @@ int stress_majorization_cola(vtx_data * graph,      /* Input graph in sparse represen
     float maxEdgeLen = 0;
     double max = 1;
 
-    initLayout(graph, n, dim, d_coords, nodes);
+    initLayout(n, dim, d_coords, nodes);
     if (n == 1)
        return 0;
 

diff --git a/lib/neatogen/stress.c b/lib/neatogen/stress.c
index 032fe3050bd4fbdff909ac5bed975d6f61531ed4..4fd4eb7f9ef122f1d8c4f247986384f426e7dfaf 100644 (file)
--- a/lib/neatogen/stress.c
+++ b/lib/neatogen/stress.c
@@ -138,10 +138,7 @@ compute_stress1(double **coords, dist_data * distances, int dim, int n, int exp)
  * a position, use it.
  * Return true if some node is fixed.
  */
-int
-initLayout(vtx_data * graph, int n, int dim, double **coords,
-          node_t ** nodes)
-{
+int initLayout(int n, int dim, double **coords, node_t **nodes) {
     node_t *np;
     double *xp;
     double *yp;
@@ -984,7 +981,7 @@ int stress_majorization_kD_mkernel(vtx_data * graph,        /* Input graph in sparse re
            orthog1(n, d_coords[i]);
        }
     } else {
-       havePinned = initLayout(graph, n, dim, d_coords, nodes);
+       havePinned = initLayout(n, dim, d_coords, nodes);
     }
     if (Verbose)
        fprintf(stderr, ": %.2f sec", elapsed_sec());

diff --git a/lib/neatogen/stress.h b/lib/neatogen/stress.h
index 3e6467efe0acab02fc9ed895d93aec5926257137..3e18f815092812b9c7b0bb44360cf9ffb648d788 100644 (file)
--- a/lib/neatogen/stress.h
+++ b/lib/neatogen/stress.h
@@ -54,7 +54,7 @@ extern float *compute_apsp_packed(vtx_data * graph, int n);
 extern float *compute_apsp_artifical_weights_packed(vtx_data * graph, int n);
 extern float* circuitModel(vtx_data * graph, int nG);
 extern float* mdsModel (vtx_data * graph, int nG);
-extern int initLayout(vtx_data * graph, int n, int dim, double **coords, node_t** nodes);
+extern int initLayout(int n, int dim, double **coords, node_t **nodes);
 
 #ifdef __cplusplus
 }