From 9f631fecc80e69a15db3f92e3301fed9836ec8e3 Mon Sep 17 00:00:00 2001
From: Gilles Sadowski <erans@apache.org>
Date: Tue, 31 Aug 2010 12:05:00 +0000
Subject: [PATCH] Added checks for "null".

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@991164 13f79535-47bb-0310-9956-ffa450edef68
---
 .../BaseMultivariateRealOptimizer.java            |  1 +
 .../BaseMultivariateVectorialOptimizer.java       |  1 +
 .../general/BaseAbstractScalarOptimizer.java      | 12 ++++++++++++
 .../general/BaseAbstractVectorialOptimizer.java   | 15 ++++++++++++++-
 .../AbstractUnivariateRealOptimizer.java          |  9 +++++++++
 .../univariate/BaseUnivariateRealOptimizer.java   |  2 ++
 6 files changed, 39 insertions(+), 1 deletion(-)

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 38e572fdf..89e8d42d8 100644
--- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
@@ -50,6 +50,7 @@ public interface BaseMultivariateRealOptimizer<FUNC extends MultivariateRealFunc
      * @throws DimensionMismatchException if the start point dimension is wrong.
      * @throws TooManyEvaluationsException if the maximal number of evaluations is
      * exceeded.
+     * @throws NullArgumentException if any argument is {@code null}.
      */
     RealPointValuePair optimize(FUNC f, GoalType goalType, double[] startPoint)
         throws FunctionEvaluationException;
diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java
index 30596f81e..231a24484 100644
--- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java
@@ -52,6 +52,7 @@ public interface BaseMultivariateVectorialOptimizer<FUNC extends MultivariateVec
      * @throws DimensionMismatchException if the start point dimension is wrong.
      * @throws TooManyEvaluationsException if the maximal number of evaluations is
      * exceeded.
+     * @throws NullArgumentException if any argument is {@code null}.
      */
     VectorialPointValuePair optimize(FUNC f, double[] target, double[] weight,
                                      double[] startPoint)
diff --git a/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java
index 12f0ea9f5..de8c8b8e3 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java
@@ -21,6 +21,7 @@ import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.util.Incrementor;
 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.analysis.MultivariateRealFunction;
 import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
 import org.apache.commons.math.optimization.GoalType;
@@ -124,6 +125,17 @@ public abstract class BaseAbstractScalarOptimizer<T extends MultivariateRealFunc
                                        GoalType goalType,
                                        double[] startPoint)
         throws FunctionEvaluationException {
+        // Checks.
+        if (f == null) {
+            throw new NullArgumentException();
+        }
+        if (goalType == null) {
+            throw new NullArgumentException();
+        }
+        if (startPoint == null) {
+            throw new NullArgumentException();
+        }
+
         // Reset.
         evaluations.resetCount();
 
diff --git a/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractVectorialOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractVectorialOptimizer.java
index 65d1f80c1..4a84fb3c1 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractVectorialOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/general/BaseAbstractVectorialOptimizer.java
@@ -22,6 +22,7 @@ import org.apache.commons.math.util.Incrementor;
 import org.apache.commons.math.exception.MaxCountExceededException;
 import org.apache.commons.math.exception.TooManyEvaluationsException;
 import org.apache.commons.math.exception.DimensionMismatchException;
+import org.apache.commons.math.exception.NullArgumentException;
 import org.apache.commons.math.analysis.MultivariateVectorialFunction;
 import org.apache.commons.math.optimization.BaseMultivariateVectorialOptimizer;
 import org.apache.commons.math.optimization.GoalType;
@@ -122,7 +123,19 @@ public abstract class BaseAbstractVectorialOptimizer<FUNC extends MultivariateVe
                                             double[] target, double[] weight,
                                             double[] startPoint)
         throws FunctionEvaluationException {
-
+        // Checks.
+        if (f == null) {
+            throw new NullArgumentException();
+        }
+        if (target == null) {
+            throw new NullArgumentException();
+        }
+        if (weight == null) {
+            throw new NullArgumentException();
+        }
+        if (startPoint == null) {
+            throw new NullArgumentException();
+        }
         if (target.length != weight.length) {
             throw new DimensionMismatchException(target.length, weight.length);
         }
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
index 913397c18..7aeabf4a9 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
@@ -21,6 +21,7 @@ import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.util.Incrementor;
 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.analysis.UnivariateRealFunction;
 import org.apache.commons.math.optimization.GoalType;
 import org.apache.commons.math.optimization.ConvergenceChecker;
@@ -115,6 +116,14 @@ public abstract class AbstractUnivariateRealOptimizer
                                                  double min, double max,
                                                  double startValue)
         throws FunctionEvaluationException {
+        // Checks.
+        if (f == null) {
+            throw new NullArgumentException();
+        }
+        if (goalType == null) {
+            throw new NullArgumentException();
+        }
+
         // Reset.
         searchMin = min;
         searchMax = max;
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
index 46b64aa53..19adf826c 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
@@ -19,6 +19,7 @@ package org.apache.commons.math.optimization.univariate;
 
 import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.exception.NullArgumentException;
 import org.apache.commons.math.optimization.BaseOptimizer;
 import org.apache.commons.math.optimization.GoalType;
 
@@ -80,6 +81,7 @@ public interface BaseUnivariateRealOptimizer<FUNC extends UnivariateRealFunction
      * function.
      * @throws IllegalArgumentException if {@code min > max} or the endpoints
      * do not satisfy the requirements specified by the optimizer.
+     * @throws NullArgumentException if any argument is {@code null}.
      */
     UnivariateRealPointValuePair optimize(FUNC f, GoalType goalType,
                                           double min, double max,