summaryrefslogtreecommitdiffstats
path: root/src/libcola/gradient_projection.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2017-02-23 14:39:39 +0000
committerShlomi Fish <shlomif@shlomifish.org>2017-02-23 14:39:39 +0000
commitd82d8e6de61b5a3da73af7d7003b8281720c3dc1 (patch)
tree50a151920b32f95afd0fa0c04f175322657ebb18 /src/libcola/gradient_projection.cpp
parentMerged. (diff)
parentDisplay style attribute properties when object row selected. Allow their dele... (diff)
downloadinkscape-d82d8e6de61b5a3da73af7d7003b8281720c3dc1.tar.gz
inkscape-d82d8e6de61b5a3da73af7d7003b8281720c3dc1.zip
Merged.
(bzr r15369.1.19)
Diffstat (limited to 'src/libcola/gradient_projection.cpp')
-rw-r--r--src/libcola/gradient_projection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp
index c8488a545..c079c3149 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/libcola/gradient_projection.cpp
@@ -50,7 +50,7 @@ unsigned GradientProjection::solve(double * b) {
//cerr << "in gradient projection: n=" << n << endl;
for (i=0;i<n;i++) {
assert(!IS_NAN(place[i]));
- assert(!isinf(place[i]));
+ assert(IS_FINITE(place[i]));
vars[i]->desiredPosition=place[i];
}
try {
@@ -98,7 +98,7 @@ unsigned GradientProjection::solve(double * b) {
for (i=0; i<n; i++) {
place[i]-=alpha*g[i];
assert(!IS_NAN(place[i]));
- assert(!isinf(place[i]));
+ assert(IS_FINITE(place[i]));
vars[i]->desiredPosition=place[i];
}
for (DummyVars::iterator it=dummy_vars.begin();it!=dummy_vars.end();++it){