Re-do some .h files to limit exposure of internal values, .h files,

and dependencies on config.h; return to a simple, concrete boolean type

diff --git a/lib/neatogen/quad_prog_vpsc.h b/lib/neatogen/quad_prog_vpsc.h
index e78b2045d4527d1d91fce4a41f65c16c5d3a136b..e69bcee44a5e89cee1ccb56bf39bb34e7cbeb544 100644 (file)
--- a/lib/neatogen/quad_prog_vpsc.h
+++ b/lib/neatogen/quad_prog_vpsc.h
@@ -68,7 +68,7 @@ extern void generateNonoverlapConstraints(
         float nsizeScale,
         float** coords,
         int k,
-       bool transitiveClosure,
+       boolean transitiveClosure,
        ipsep_options* opt
 );
 

diff --git a/lib/neatogen/smart_ini_x.c b/lib/neatogen/smart_ini_x.c
index b04e2dffd89424d0423110cff9b7b345d24b7b1e..dde478246e37c08c9919cacf51054886084cfe15 100644 (file)
--- a/lib/neatogen/smart_ini_x.c
+++ b/lib/neatogen/smart_ini_x.c
@@ -268,7 +268,7 @@ void IMDS_given_dim(vtx_data* graph, int n, double* given_coords,
        double pos_i;
        double* balance = N_GNEW(n, double);
        double b;
-       bool converged;
+       boolean converged;
 
 #if 0
        iterations1=mat_mult_count1=0; /* We don't compute the x-axis at all. */
@@ -352,9 +352,9 @@ void IMDS_given_dim(vtx_data* graph, int n, double* given_coords,
                }
        }
 
-       for (converged=false,iterations2=0; iterations2<200 && !converged; iterations2++) {
-               conjugate_gradient_f(lap, y, balance, n, conj_tol, n, true);
-               converged=true;
+       for (converged=FALSE,iterations2=0; iterations2<200 && !converged; iterations2++) {
+               conjugate_gradient_f(lap, y, balance, n, conj_tol, n, TRUE);
+               converged=TRUE;
                for (i=0; i<n; i++) {
                        pos_i=y[i];
                        b=0;
@@ -371,7 +371,7 @@ void IMDS_given_dim(vtx_data* graph, int n, double* given_coords,
                                }
                        }
                        if ((b != balance[i]) && (fabs(1-b/balance[i])>1e-5)) {
-                               converged=false;
+                               converged=FALSE;
                                balance[i]=b;
                        }
                }