X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finifcns.cpp;h=cc0209208da959329d60fd3dbd9d1e1076d5d477;hb=c5be6a0d868b7fbf2bf51ed3ee2d2f50d3574b99;hp=f366e779e70fbdb18a64e0447b8b21263f3704ee;hpb=87ed87c395d6121fe468efc68ee2cd33a7e91200;p=ginac.git

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index f366e779..cc020920 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -1011,13 +1011,20 @@ fsolve(const ex& f_in, const symbol& x, const numeric& x1, const numeric& x2)
 		if (!is_a<numeric>(dx_))
 			throw std::runtime_error("fsolve(): function derivative does not evaluate numerically");
 		xx[side] += ex_to<numeric>(dx_);
-
-		ex f_x = f.subs(x == xx[side]).evalf();
-		if (!is_a<numeric>(f_x))
-			throw std::runtime_error("fsolve(): function does not evaluate numerically");
-		fx[side] = ex_to<numeric>(f_x);
-
-		if ((side==0 && xx[0]<xxprev) || (side==1 && xx[1]>xxprev) || xx[0]>xx[1]) {
+		// Now check if Newton-Raphson method shot out of the interval 
+		bool bad_shot = (side == 0 && xx[0] < xxprev) || 
+				(side == 1 && xx[1] > xxprev) || xx[0] > xx[1];
+		if (!bad_shot) {
+			// Compute f(x) only if new x is inside the interval.
+			// The function might be difficult to compute numerically
+			// or even ill defined outside the interval. Also it's
+			// a small optimization. 
+			ex f_x = f.subs(x == xx[side]).evalf();
+			if (!is_a<numeric>(f_x))
+				throw std::runtime_error("fsolve(): function does not evaluate numerically");
+			fx[side] = ex_to<numeric>(f_x);
+		}
+		if (bad_shot) {
 			// Oops, Newton-Raphson method shot out of the interval.
 			// Restore, and try again with the other side instead!
 			xx[side] = xxprev;