From d8e1809529ef78737dbbe4080622330970866793 Mon Sep 17 00:00:00 2001
From: Gilles Sadowski <erans@apache.org>
Date: Sat, 29 Oct 2011 11:19:30 +0000
Subject: [PATCH] MATH-697 Fixed bug in check that the initial value is within
 bounds.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1194874 13f79535-47bb-0310-9956-ffa450edef68
---
 .../BaseMultivariateRealOptimizer.java        |  6 ++-
 .../direct/BaseAbstractScalarOptimizer.java   | 38 +++++++++++--------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
index 61b2000d0..a09e7e9f4 100644
--- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
@@ -73,8 +73,10 @@ public interface BaseMultivariateRealOptimizer<FUNC extends MultivariateRealFunc
      * if the maximal number of evaluations is exceeded.
      * @throws org.apache.commons.math.exception.NullArgumentException if
      * {@code f}, {@code goalType} or {@code startPoint} is {@code null}.
-     * @throws org.apache.commons.math.exception.OutOfRangeException if any
-     * of the initial values is out of bounds.
+     * @throws org.apache.commons.math.exception.NumberIsTooSmallException if any
+     * of the initial values is less than its lower bound.
+     * @throws org.apache.commons.math.exception.NumberIsTooLargeException if any
+     * of the initial values is greater than its upper bound.
      */
     RealPointValuePair optimize(int maxEval, FUNC f, GoalType goalType,
                                 double[] startPoint,
diff --git a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java b/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java
index 22fa4456a..4582d2c20 100644
--- a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java
@@ -22,7 +22,8 @@ import org.apache.commons.math.exception.MaxCountExceededException;
 import org.apache.commons.math.exception.TooManyEvaluationsException;
 import org.apache.commons.math.exception.NullArgumentException;
 import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.OutOfRangeException;
+import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math.exception.NumberIsTooLargeException;
 import org.apache.commons.math.analysis.MultivariateRealFunction;
 import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
 import org.apache.commons.math.optimization.GoalType;
@@ -125,21 +126,28 @@ public abstract class BaseAbstractScalarOptimizer<FUNC extends MultivariateRealF
             throw new NullArgumentException();
         }
         final int dim = startPoint.length;
-        if (lower != null &&
-            lower.length != dim) {
-            throw new DimensionMismatchException(lower.length, dim);
+        if (lower != null) {
+            if (lower.length != dim) {
+                throw new DimensionMismatchException(lower.length, dim);
+            }
+            for (int i = 0; i < dim; i++) {
+                final double v = startPoint[i];
+                final double lo = lower[i];
+                if (v < lo) {
+                    throw new NumberIsTooSmallException(v, lo, true);
+                }
+            }
         }
-        if (upper != null &&
-            upper.length != dim) {
-            throw new DimensionMismatchException(upper.length, dim);
-        }
-        for (int i = 0; i < dim; i++) {
-            final double v = startPoint[i];
-            final double lo = lower[i];
-            final double hi = upper[i];
-            if (v < lo ||
-                v > hi) {
-                throw new OutOfRangeException(v, lo, hi);
+        if (upper != null) {
+            if (upper.length != dim) {
+                throw new DimensionMismatchException(upper.length, dim);
+            }
+            for (int i = 0; i < dim; i++) {
+                final double v = startPoint[i];
+                final double hi = upper[i];
+                if (v > hi) {
+                    throw new NumberIsTooLargeException(v, hi, true);
+                }
             }
         }