From: Chris Dams <Chris.Dams@mi.infn.it>
Date: Mon, 11 Dec 2006 15:38:40 +0000 (+0000)
Subject: Added some abses to the code for numerical integration.
X-Git-Tag: release_1-4-0~46
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=43ba0ff254f5a06261e46a1eed8a1f3776174add

Added some abses to the code for numerical integration.
---

diff --git a/ginac/integral.cpp b/ginac/integral.cpp
index 0c42ed5f..18fedb2e 100644
--- a/ginac/integral.cpp
+++ b/ginac/integral.cpp
@@ -279,7 +279,7 @@ ex adaptivesimpson(const ex & x, const ex & a_in, const ex & b_in, const ex & f,
 	fbvec[i] = subsvalue(x, b, f);
 	svec[i] = hvec[i]*(favec[i]+4*fcvec[i]+fbvec[i])/3;
 	lvec[i] = 1;
-	errorvec[i] = error*svec[i];
+	errorvec[i] = error*abs(svec[i]);
 
 	while (i>0) {
 		ex fd = subsvalue(x, avec[i]+hvec[i]/2, f);
@@ -292,7 +292,7 @@ ex adaptivesimpson(const ex & x, const ex & a_in, const ex & b_in, const ex & f,
 		ex nu4 = fbvec[i];
 		ex nu5 = hvec[i];
 		// hopefully prevents a crash if the function is zero sometimes.
-		ex nu6 = max(errorvec[i], (s1+s2)*error);
+		ex nu6 = max(errorvec[i], abs(s1+s2)*error);
 		ex nu7 = svec[i];
 		int nu8 = lvec[i];
 		--i;