From: erg <devnull@localhost>
Date: Thu, 7 Dec 2006 22:49:36 +0000 (+0000)
Subject: Re-do some .h files to limit exposure of internal values, .h files,
X-Git-Tag: LAST_LIBGRAPH~32^2~5772
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9780d6ede346c9b5c529e84cbe29fe4239638a1;p=graphviz

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/constrained_majorization.c b/lib/neatogen/constrained_majorization.c
index ce7d2a1a0..9e3992f27 100644
--- a/lib/neatogen/constrained_majorization.c
+++ b/lib/neatogen/constrained_majorization.c
@@ -55,7 +55,7 @@ stress_majorization_with_hierarchy(
 	*************************************************/
 
 	int i,j,k;
-	bool directionalityExist = FALSE;
+	boolean directionalityExist = FALSE;
 	float * lap1 = NULL;
 	float * dist_accumulator = NULL;
 	float * tmp_coords = NULL;
@@ -87,7 +87,7 @@ stress_majorization_with_hierarchy(
 	int step;
 	float val;
 	double old_stress, new_stress;
-	bool converged;
+	boolean converged;
 	int len;
     int num_levels;
     float *hierarchy_boundaries;
@@ -319,7 +319,7 @@ stress_majorization_with_hierarchy(
 	unpackedLap = unpackMatrix(lap2, n);
 	cMajEnv=initConstrainedMajorization(lap2, n, ordering, levels, num_levels);
 
-	for (converged=false,iterations=0; iterations<maxi && !converged; iterations++) {
+	for (converged=FALSE,iterations=0; iterations<maxi && !converged; iterations++) {
 
 		/* First, construct Laplacian of 1/(d_ij*|p_i-p_j|)  */
 		set_vector_val(n, 0, degrees);
diff --git a/lib/neatogen/constrained_majorization_ipsep.c b/lib/neatogen/constrained_majorization_ipsep.c
index 9c200aaf8..d751edd88 100644
--- a/lib/neatogen/constrained_majorization_ipsep.c
+++ b/lib/neatogen/constrained_majorization_ipsep.c
@@ -97,7 +97,7 @@ int stress_majorization_cola(
     int step;
     float val;
     double old_stress, new_stress = 0;
-    bool converged;
+    boolean converged;
     int len;
     double nsizeScale = 0;
     float maxEdgeLen = 0;
@@ -270,7 +270,7 @@ int stress_majorization_cola(
 
     lap1 = N_GNEW(lap_length, float);
 
-    for (converged = false, iterations = 0;
+    for (converged = FALSE, iterations = 0;
 	 iterations < maxi && !converged; iterations++) {
 
 	/* First, construct Laplacian of 1/(d_ij*|p_i-p_j|)  */
@@ -376,7 +376,7 @@ int stress_majorization_cola(
 		fprintf(stderr, "nsizescale=%f,iterations=%d\n",
 			nsizeScale, iterations);
 	    iterations = 0;
-	    converged = false;
+	    converged = FALSE;
 	}
 
 
@@ -395,7 +395,7 @@ int stress_majorization_cola(
 	if (opt->noverlap == 1 && nsizeScale > 0.001) {
 	    generateNonoverlapConstraints(cMajEnvHor, nsizeScale, coords,
 					  0,
-					  nsizeScale < 0.5 ? false : true,
+					  nsizeScale < 0.5 ? FALSE : TRUE,
 					  opt);
 	}
 	if (cMajEnvHor->m > 0) {
@@ -416,7 +416,7 @@ int stress_majorization_cola(
 	}
 	if (opt->noverlap == 1 && nsizeScale > 0.001) {
 	    generateNonoverlapConstraints(cMajEnvVrt, nsizeScale, coords,
-					  1, false, opt);
+					  1, FALSE, opt);
 	}
 	if (cMajEnvVrt->m > 0) {
 #ifdef MOSEK