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

Added checks for "null". 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@991164 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2010-08-31 12:05:00 +00:00
parent a21faeae6e
commit 9f631fecc8
6 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
View File

@ -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;

1
src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java
View File

@ -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)

12
src/main/java/org/apache/commons/math/optimization/general/BaseAbstractScalarOptimizer.java
View File

@ -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();

15
src/main/java/org/apache/commons/math/optimization/general/BaseAbstractVectorialOptimizer.java
View File

@ -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);
}

9
src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
View File

@ -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;

2
src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
View File

@ -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,