Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MATH-599 

Added brackets around single-statement conditional branches.


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1139460 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2011-06-24 23:13:00 +00:00
parent 06828ea9a8
commit 7b371c06a9
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java
View File

@ -86,8 +86,12 @@ public abstract class BaseSecantSolver extends AbstractUnivariateRealSolver {
// If one of the bounds is the exact root, return it. Since these are
// not under-approximations or over-approximations, we can return them
// regardless of the allowed solutions.
if (f0 == 0.0) return x0;
if (f1 == 0.0) return x1;
if (f0 == 0.0) {
return x0;
}
if (f1 == 0.0) {
return x1;
}
// Verify bracketing of initial solution.
verifyBracketing(x0, x1);
@ -115,7 +119,9 @@ public abstract class BaseSecantSolver extends AbstractUnivariateRealSolver {
// If the new approximation is the exact root, return it. Since
// this is not an under-approximation or an over-approximation,
// we can return it regardless of the allowed solutions.
if (fx == 0.0) return x;
if (fx == 0.0) {
return x;
}
// Update the bounds with the new approximation.
if (method == Method.SECANT) {
@ -134,8 +140,12 @@ public abstract class BaseSecantSolver extends AbstractUnivariateRealSolver {
inverted = !inverted;
} else {
// We had [x0..x1]. We update it to [x0, x].
if (method == Method.ILLINOIS) f0 *= 0.5;
if (method == Method.PEGASUS) f0 *= f1 / (f1 + fx);
if (method == Method.ILLINOIS) {
f0 *= 0.5;
}
if (method == Method.PEGASUS) {
f0 *= f1 / (f1 + fx);
}
x1 = x;
f1 = fx;
}