fixed files form Math #23

Spirals-Team · Mar 7, 2017 · 87d3022 · 87d3022
1 parent e0ba336
commit 87d3022
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/projects/Math/23/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java b/projects/Math/23/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
@@ -148,6 +148,7 @@ protected UnivariatePointValuePair doOptimize() {
         UnivariatePointValuePair current
             = new UnivariatePointValuePair(x, isMinim ? fx : -fx);
         // Best point encountered so far (which is the initial guess).
+        UnivariatePointValuePair best = current;
 
         int iter = 0;
         while (true) {
@@ -231,10 +232,15 @@ protected UnivariatePointValuePair doOptimize() {
                 // User-defined convergence checker.
                 previous = current;
                 current = new UnivariatePointValuePair(u, isMinim ? fu : -fu);
+                best = best(best,
+                            best(current,
+                                 previous,
+                                 isMinim),
+                            isMinim);
 
                 if (checker != null) {
                     if (checker.converged(iter, previous, current)) {
-                        return best(current, previous, isMinim);
+                        return best;
                     }
                 }
 
@@ -271,9 +277,10 @@ protected UnivariatePointValuePair doOptimize() {
                     }
                 }
             } else { // Default termination (Brent's criterion).
-                return
+                return best(best,
                             best(current,
                                  previous,
+                                 isMinim),
                             isMinim);
             }
             ++iter;