From: Richard Kreckel Date: Wed, 14 Sep 2005 00:41:25 +0000 (+0000) Subject: * Fix typo: the last argument to adaptivesimpson was unused. X-Git-Tag: release_1-4-0~153 X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=f4f72212e7428c848c1a1771864c2f1b09f8962f;ds=sidebyside * Fix typo: the last argument to adaptivesimpson was unused. --- diff --git a/ginac/integral.cpp b/ginac/integral.cpp index 8024e7b2..bc28ce99 100644 --- a/ginac/integral.cpp +++ b/ginac/integral.cpp @@ -248,7 +248,7 @@ ex adaptivesimpson(const ex & x, const ex & a, const ex & b, const ex & f, const fbvec[i] = subsvalue(x, b, f); svec[i] = hvec[i]*(favec[i]+4*fcvec[i]+fbvec[i])/3; lvec[i] = 1; - errorvec[i] = integral::relative_integration_error*svec[i]; + errorvec[i] = error*svec[i]; while (i>0) { ex fd = subsvalue(x, avec[i]+hvec[i]/2, f); @@ -261,7 +261,7 @@ ex adaptivesimpson(const ex & x, const ex & a, const ex & b, const ex & f, const 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)*integral::relative_integration_error); + ex nu6 = max(errorvec[i], (s1+s2)*error); ex nu7 = svec[i]; int nu8 = lvec[i]; --i;