* Fix typo: the last argument to adaptivesimpson was unused.

[ginac.git] / ginac / integral.cpp

diff --git a/ginac/integral.cpp b/ginac/integral.cpp
index 419e08282735d657dab7a24f5a01d1237d4e79a5..bc28ce99aef33b0d36d5f63e19bb382e9e719fac 100644 (file)
--- a/ginac/integral.cpp
+++ b/ginac/integral.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symbolic  integral. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "integral.h"
@@ -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;