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

MATH-466 Fix the same problem in the 3rd class 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1056417 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2011-01-07 17:51:44 +00:00
parent 787d654a60
commit fa4135a048
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java
View File

@ -23,6 +23,8 @@ import java.util.Comparator;
import org.apache.commons.math.analysis.UnivariateRealFunction;
import org.apache.commons.math.exception.MathUserException;
import org.apache.commons.math.exception.MathIllegalStateException;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.random.RandomGenerator;
import org.apache.commons.math.optimization.GoalType;
@ -60,14 +62,24 @@ public class MultiStartUnivariateRealOptimizer<FUNC extends UnivariateRealFuncti
* Create a multi-start optimizer from a single-start optimizer.
*
* @param optimizer Single-start optimizer to wrap.
* @param starts Number of starts to perform (including the
* first one), multi-start is disabled if value is less than or
* equal to 1.
* @param starts Number of starts to perform, must be >=1.
* Multi-start is disabled if {@code starts == 1}.
* @param generator Random generator to use for restarts.
* @throws NullArgumentException if {@code optimizer} or {@code generator}
* is {@code null}.
* @throws NotStrictlyPositiveException if {@code starts < 1}.
*/
public MultiStartUnivariateRealOptimizer(final BaseUnivariateRealOptimizer<FUNC> optimizer,
final int starts,
final RandomGenerator generator) {
if (optimizer == null ||
generator == null) {
throw new NullArgumentException();
}
if (starts < 1) {
throw new NotStrictlyPositiveException(starts);
}
this.optimizer = optimizer;
this.starts = starts;
this.generator = generator;
@ -163,7 +175,7 @@ public class MultiStartUnivariateRealOptimizer<FUNC extends UnivariateRealFuncti
sortPairs(goal);
if (optima[0] == null) {
throw lastException;
throw lastException; // cannot be null if starts >=1
}
// Return the point with the best objective function value.