neatogen constrained_majorization_new_with_gaps: remove unused 'ndim' parameter

Note that the call to this function from
`constrained_majorization_new_with_gaps` also seems confused about the meaning
of its parameters. But no attempt is made to correct this.

diff --git a/lib/neatogen/constrained_majorization.c b/lib/neatogen/constrained_majorization.c
index e30c7db788165b46ed42eb09a21b4916feac7287..80768fb4a48b1bd5c55b504cf95837a99754a639 100644 (file)
--- a/lib/neatogen/constrained_majorization.c
+++ b/lib/neatogen/constrained_majorization.c
@@ -435,7 +435,7 @@ int stress_majorization_with_hierarchy(vtx_data * graph,    /* Input graph in spars
            if (k == 1) {
                /* use quad solver in the y-dimension */
                constrained_majorization_new_with_gaps(cMajEnv, b[k],
-                                                      coords, dim, k,
+                                                      coords, k,
                                                       localConstrMajorIterations,
                                                       hierarchy_boundaries,
                                                       levels_gap);

diff --git a/lib/neatogen/quad_prog_solve.c b/lib/neatogen/quad_prog_solve.c
index 5febf0051ce6381b3625ee8b58afaa842fffbf41..1bfa9198b3556e02ecb1338464252ecfad16e337 100644 (file)
--- a/lib/neatogen/quad_prog_solve.c
+++ b/lib/neatogen/quad_prog_solve.c
@@ -143,7 +143,7 @@ constrained_majorization_new(CMajEnv * e, float *b, float **coords,
     }
     if (levels_gap != 0) {
        return constrained_majorization_new_with_gaps(e, b, coords,
-                                                     cur_axis, dims,
+                                                     dims,
                                                      max_iterations,
                                                      hierarchy_boundaries,
                                                      levels_gap);
@@ -384,7 +384,7 @@ constrained_majorization_new(CMajEnv * e, float *b, float **coords,
 
 int
 constrained_majorization_new_with_gaps(CMajEnv * e, float *b,
-                                      float **coords, int ndims,
+                                      float **coords,
                                       int cur_axis, int max_iterations,
                                       float *hierarchy_boundaries,
                                       float levels_gap)

diff --git a/lib/neatogen/quad_prog_solver.h b/lib/neatogen/quad_prog_solver.h
index 473f187bcf845093eb71c7fa4d47874ea6b8b138..bd65f723e0de87fad6b4426a46d6b454667edf33 100644 (file)
--- a/lib/neatogen/quad_prog_solver.h
+++ b/lib/neatogen/quad_prog_solver.h
@@ -40,7 +40,7 @@ extern int constrained_majorization_new(CMajEnv*, float*, float**,
                                         int, int, int, float*, float);
 
 extern int constrained_majorization_new_with_gaps(CMajEnv*, float*, float**, 
-                                                  int, int, int,  float*, float);
+                                                  int, int,  float*, float);
 extern void deleteCMajEnv(CMajEnv *e);
 
 extern float** unpackMatrix(float * packedMat, int n);