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

Reverted incompatible changes in r980013. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X@1065489 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Phil Steitz 2011-01-31 06:42:00 +00:00
parent 3c9ec4827b
commit 03449e890b
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,9 @@ import org.apache.commons.math.MaxEvaluationsExceededException;
import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.MaxIterationsExceededException;
import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.UnivariateRealFunction;
import org.apache.commons.math.exception.MathUserException; import org.apache.commons.math.exception.MathUserException;
import org.apache.commons.math.exception.MathUnsupportedOperationException;
import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.exception.NoDataException;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.UnivariateRealOptimizer; import org.apache.commons.math.optimization.UnivariateRealOptimizer;
@ -36,11 +38,11 @@ import org.apache.commons.math.optimization.UnivariateRealOptimizer;
public abstract class AbstractUnivariateRealOptimizer public abstract class AbstractUnivariateRealOptimizer
extends ConvergingAlgorithmImpl implements UnivariateRealOptimizer { extends ConvergingAlgorithmImpl implements UnivariateRealOptimizer {
/** Indicates where a root has been computed. */ /** Indicates where a root has been computed. */
private boolean resultComputed; protected boolean resultComputed;
/** The last computed root. */ /** The last computed root. */
private double result; protected double result;
/** Value of the function at the last computed result. */ /** Value of the function at the last computed result. */
private double functionValue; protected double functionValue;
/** Maximal number of evaluations allowed. */ /** Maximal number of evaluations allowed. */
private int maxEvaluations; private int maxEvaluations;
/** Number of evaluations already performed. */ /** Number of evaluations already performed. */
@ -254,6 +256,11 @@ public abstract class AbstractUnivariateRealOptimizer
/** /**
* Method for implementing actual optimization algorithms in derived * Method for implementing actual optimization algorithms in derived
* classes. * classes.
*
* From version 3.0 onwards, this method will be abstract - i.e.
* concrete implementations will have to implement it. If this method
* is not implemented, subclasses must override
* {@link #optimize(UnivariateRealFunction, GoalType, double, double)}.
* *
* @return the optimum. * @return the optimum.
* @throws MaxIterationsExceededException if the maximum iteration count * @throws MaxIterationsExceededException if the maximum iteration count
@ -261,6 +268,8 @@ public abstract class AbstractUnivariateRealOptimizer
* @throws MathUserException if an error occurs evaluating * @throws MathUserException if an error occurs evaluating
* the function. * the function.
*/ */
protected abstract double doOptimize() protected double doOptimize()
throws MaxIterationsExceededException, MathUserException; throws MaxIterationsExceededException, MathUserException {
throw new MathUnsupportedOperationException(LocalizedFormats.NOT_OVERRIDEN);
}
} }