X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fintegral.cpp;h=40dd75c9812a446e34656201ff3c57eb4f457764;hp=0c42ed5fdcbd31075615b0818645c0057a168990;hb=99901bd5c74203caece07e3e2948780887a0e822;hpb=29b420743599f001b8bfc8b63fb6ac81aa3dfba7

diff --git a/ginac/integral.cpp b/ginac/integral.cpp
index 0c42ed5f..40dd75c9 100644
--- a/ginac/integral.cpp
+++ b/ginac/integral.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symbolic  integral. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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
@@ -48,7 +48,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(integral, basic,
 //////////
 
 integral::integral()
-		: inherited(&integral::tinfo_static),
+		: 
 		x((new symbol())->setflag(status_flags::dynallocated))
 {}
 
@@ -59,7 +59,7 @@ integral::integral()
 // public
 
 integral::integral(const ex & x_, const ex & a_, const ex & b_, const ex & f_)
-		: inherited(&integral::tinfo_static), x(x_), a(a_), b(b_), f(f_)
+		:  x(x_), a(a_), b(b_), f(f_)
 {
 	if (!is_a<symbol>(x)) {
 		throw(std::invalid_argument("first argument of integral must be of type symbol"));
@@ -70,8 +70,9 @@ integral::integral(const ex & x_, const ex & a_, const ex & b_, const ex & f_)
 // archiving
 //////////
 
-integral::integral(const archive_node & n, lst & sym_lst) : inherited(n, sym_lst)
+void integral::read_archive(const archive_node& n, lst& sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	n.find_ex("x", x, sym_lst);
 	n.find_ex("a", a, sym_lst);
 	n.find_ex("b", b, sym_lst);
@@ -87,8 +88,6 @@ void integral::archive(archive_node & n) const
 	n.add_ex("f", f);
 }
 
-DEFAULT_UNARCHIVE(integral)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -189,9 +188,7 @@ ex integral::evalf(int level) const
 	// results after subsituting a number for the integration variable.
 	if (is_exactly_a<numeric>(ea) && is_exactly_a<numeric>(eb) 
 			&& is_exactly_a<numeric>(ef.subs(x==12.34).evalf())) {
-		try {
 			return adaptivesimpson(x, ea, eb, ef);
-		} catch (runtime_error &rte) {}
 	}
 
 	if (are_ex_trivially_equal(a, ea) && are_ex_trivially_equal(b, eb)
@@ -223,7 +220,7 @@ struct error_and_integral
 
 struct error_and_integral_is_less
 {
-	bool operator()(const error_and_integral &e1,const error_and_integral &e2)
+	bool operator()(const error_and_integral &e1,const error_and_integral &e2) const
 	{
 		int c = e1.integral.compare(e2.integral);
 		if(c < 0)
@@ -279,7 +276,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 +289,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;
@@ -436,7 +433,7 @@ unsigned integral::return_type() const
 	return f.return_type();
 }
 
-tinfo_t integral::return_type_tinfo() const
+return_type_t integral::return_type_tinfo() const
 {
 	return f.return_type_tinfo();
 }
@@ -474,4 +471,5 @@ ex integral::eval_integ() const
 	return *this;
 }
 
+GINAC_BIND_UNARCHIVER(integral);
 } // namespace GiNaC