From 8a38c52bce619b07117cdd87a183eb05fb51e28e Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Fri, 6 Jun 2008 01:43:35 +0000
Subject: merge gsoc2008_johan_path2geom into trunk

(bzr r5823)
---
 src/libcola/cola.cpp                | 2 +-
 src/libcola/gradient_projection.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libcola')

diff --git a/src/libcola/cola.cpp b/src/libcola/cola.cpp
index afad49eb2..2119ea981 100644
--- a/src/libcola/cola.cpp
+++ b/src/libcola/cola.cpp
@@ -132,7 +132,7 @@ void ConstrainedMajorizationLayout::majlayout(
             }
             b[i] += degree * coords[i];
         }
-        assert(!isNaN(b[i]));
+        assert(!IS_NAN(b[i]));
     }
     if(constrainedLayout) {
         setupDummyVars();
diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp
index 94844ca88..237cb94af 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/libcola/gradient_projection.cpp
@@ -50,7 +50,7 @@ unsigned GradientProjection::solve(double * b) {
     solver = setupVPSC();
     //cerr << "in gradient projection: n=" << n << endl;
     for (i=0;i<n;i++) {
-        assert(!isNaN(place[i]));
+        assert(!IS_NAN(place[i]));
         assert(!isinf(place[i]));
         vars[i]->desiredPosition=place[i];
     }
@@ -98,7 +98,7 @@ unsigned GradientProjection::solve(double * b) {
         // move to new unconstrained position
 		for (i=0; i<n; i++) {
 			place[i]-=alpha*g[i];
-            assert(!isNaN(place[i]));
+            assert(!IS_NAN(place[i]));
             assert(!isinf(place[i]));
             vars[i]->desiredPosition=place[i];
 		}
-- 
cgit v1.2.3