X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fintegral.cpp;h=b5c1bf17b24ce0d7bd6c32af098c025c6f79af47;hb=0052e44b34c982b13b08454fd6c9429fe7a90f71;hp=d6a39cd0045611e0fd43140b79fcba986555268b;hpb=d327f3f00c66a79d42855939866047b3e8caa630;p=ginac.git

diff --git a/ginac/integral.cpp b/ginac/integral.cpp
index d6a39cd0..b5c1bf17 100644
--- a/ginac/integral.cpp
+++ b/ginac/integral.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symbolic  integral. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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
@@ -159,8 +159,8 @@ ex integral::eval(int level) const
 	if (ea==eb)
 		return _ex0;
 
-	if (are_ex_trivially_equal(eintvar,x) && are_ex_trivially_equal(ea,a)
-			&& are_ex_trivially_equal(eb,b) && are_ex_trivially_equal(ef,f))
+	if (are_ex_trivially_equal(eintvar,x) && are_ex_trivially_equal(ea,a) &&
+	    are_ex_trivially_equal(eb,b) && are_ex_trivially_equal(ef,f))
 		return this->hold();
 	return (new integral(eintvar, ea, eb, ef))
 		->setflag(status_flags::dynallocated | status_flags::evaluated);
@@ -185,16 +185,14 @@ ex integral::evalf(int level) const
 	}
 
 	// 12.34 is just an arbitrary number used to check whether a number
-	// 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 {
+	// results after substituting 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())) {
 			return adaptivesimpson(x, ea, eb, ef);
-		} catch (runtime_error &rte) {}
 	}
 
-	if (are_ex_trivially_equal(a, ea) && are_ex_trivially_equal(b, eb)
-				&& are_ex_trivially_equal(f, ef))
+	if (are_ex_trivially_equal(a, ea) && are_ex_trivially_equal(b, eb) &&
+	    are_ex_trivially_equal(f, ef))
 			return *this;
 		else
 			return (new integral(x, ea, eb, ef))
@@ -409,8 +407,8 @@ ex integral::expand(unsigned options) const
 			return (prefactor*integral(x, newa, newb, rest)).expand(options);
 	}
 
-	if (are_ex_trivially_equal(a, newa) && are_ex_trivially_equal(b, newb)
-			&& are_ex_trivially_equal(f, newf)) {
+	if (are_ex_trivially_equal(a, newa) && are_ex_trivially_equal(b, newb) &&
+	    are_ex_trivially_equal(f, newf)) {
 		if (options==0)
 			this->setflag(status_flags::expanded);
 		return *this;
@@ -446,8 +444,8 @@ ex integral::conjugate() const
 	ex conjb = b.conjugate();
 	ex conjf = f.conjugate().subs(x.conjugate()==x);
 
-	if (are_ex_trivially_equal(a, conja) && are_ex_trivially_equal(b, conjb)
-			&& are_ex_trivially_equal(f, conjf))
+	if (are_ex_trivially_equal(a, conja) && are_ex_trivially_equal(b, conjb) &&
+	    are_ex_trivially_equal(f, conjf))
 		return *this;
 
 	return (new integral(x, conja, conjb, conjf))