From 3f65599dfcc47b79c9251126d7f0cc53645d27ad Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Wed, 15 Sep 2021 21:22:40 -0700 Subject: [PATCH] sparse_stress_subspace_majorization_kD: replace a boolean with a C99 bool And reflow some text. --- lib/neatogen/stress.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/neatogen/stress.c b/lib/neatogen/stress.c index d0d6c4e81..0f8ef58a2 100644 --- a/lib/neatogen/stress.c +++ b/lib/neatogen/stress.c @@ -318,7 +318,7 @@ static int sparse_stress_subspace_majorization_kD(vtx_data * graph, /* Input gra double *b_restricted; double L_ij; double old_stress, new_stress; - boolean converged; + bool converged; for (i = 0; i < subspace_dim; i++) { subspace[i] = d_storage + i * n; @@ -622,7 +622,7 @@ static int sparse_stress_subspace_majorization_kD(vtx_data * graph, /* Input gra b = N_GNEW(n, double); b_restricted = N_GNEW(subspace_dim, double); old_stress = compute_stress1(coords, distances, dim, n, exp); - for (converged = FALSE, iterations = 0; + for (converged = false, iterations = 0; iterations < n_iterations && !converged; iterations++) { /* Axis-by-axis optimization: */ @@ -659,11 +659,9 @@ static int sparse_stress_subspace_majorization_kD(vtx_data * graph, /* Input gra directions[k], coords[k]); } - if ((converged = (iterations % 2 == 0))) { /* check for convergence each two iterations */ + if ((converged = iterations % 2 == 0)) { /* check for convergence each two iterations */ new_stress = compute_stress1(coords, distances, dim, n, exp); - converged = - fabs(new_stress - old_stress) / (new_stress + 1e-10) < - Epsilon; + converged = fabs(new_stress - old_stress) / (new_stress + 1e-10) < Epsilon; old_stress = new_stress; } } -- 2.40.0