X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fintegral.cpp;h=bc28ce99aef33b0d36d5f63e19bb382e9e719fac;hp=8024e7b20bf21ffd4410e85189e23107e4f5798c;hb=f4f72212e7428c848c1a1771864c2f1b09f8962f;hpb=7d6eeaeab9327e8a3349df45fb6cc6486bb43162 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;