From cc9549e5683099c8e772a8b7ef71833e55d6c7ed Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Fri, 22 Jul 2022 18:06:16 -0700 Subject: [PATCH] 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. --- lib/neatogen/constrained_majorization.c | 2 +- lib/neatogen/quad_prog_solve.c | 4 ++-- lib/neatogen/quad_prog_solver.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/neatogen/constrained_majorization.c b/lib/neatogen/constrained_majorization.c index e30c7db78..80768fb4a 100644 --- 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 5febf0051..1bfa9198b 100644 --- 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 473f187bc..bd65f723e 100644 --- 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); -- 2.40.0