Class name change:
  "BaseMultivariateRealOptimizer" -> "BaseMultivariateOptimizer"


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1212373 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2011-12-09 12:35:37 +00:00
parent 86dcb3c6ce
commit 5fef93ec7d
8 changed files with 12 additions and 12 deletions

View File

@ -41,9 +41,9 @@ import org.apache.commons.math.random.RandomVectorGenerator;
* @since 3.0
*/
public class BaseMultivariateMultiStartOptimizer<FUNC extends MultivariateFunction>
implements BaseMultivariateRealOptimizer<FUNC> {
implements BaseMultivariateOptimizer<FUNC> {
/** Underlying classical optimizer. */
private final BaseMultivariateRealOptimizer<FUNC> optimizer;
private final BaseMultivariateOptimizer<FUNC> optimizer;
/** Maximal number of evaluations allowed. */
private int maxEvaluations;
/** Number of evaluations already performed for all starts. */
@ -67,7 +67,7 @@ public class BaseMultivariateMultiStartOptimizer<FUNC extends MultivariateFuncti
* is {@code null}.
* @throws NotStrictlyPositiveException if {@code starts < 1}.
*/
protected BaseMultivariateMultiStartOptimizer(final BaseMultivariateRealOptimizer<FUNC> optimizer,
protected BaseMultivariateMultiStartOptimizer(final BaseMultivariateOptimizer<FUNC> optimizer,
final int starts,
final RandomVectorGenerator generator) {
if (optimizer == null ||

View File

@ -33,7 +33,7 @@ import org.apache.commons.math.analysis.MultivariateFunction;
* @version $Id$
* @since 3.0
*/
public interface BaseMultivariateRealOptimizer<FUNC extends MultivariateFunction>
public interface BaseMultivariateOptimizer<FUNC extends MultivariateFunction>
extends BaseOptimizer<RealPointValuePair> {
/**
* Optimize an objective function.

View File

@ -34,7 +34,7 @@ import org.apache.commons.math.analysis.MultivariateFunction;
* @since 3.0
*/
public interface BaseMultivariateSimpleBoundsOptimizer<FUNC extends MultivariateFunction>
extends BaseMultivariateRealOptimizer<FUNC> {
extends BaseMultivariateOptimizer<FUNC> {
/**
* Optimize an objective function.
*

View File

@ -33,4 +33,4 @@ import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
* @since 2.0
*/
public interface DifferentiableMultivariateRealOptimizer
extends BaseMultivariateRealOptimizer<DifferentiableMultivariateFunction> {}
extends BaseMultivariateOptimizer<DifferentiableMultivariateFunction> {}

View File

@ -31,4 +31,4 @@ import org.apache.commons.math.analysis.MultivariateFunction;
* @since 2.0
*/
public interface MultivariateRealOptimizer
extends BaseMultivariateRealOptimizer<MultivariateFunction> {}
extends BaseMultivariateOptimizer<MultivariateFunction> {}

View File

@ -22,7 +22,7 @@ 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.MultivariateFunction;
import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
import org.apache.commons.math.optimization.BaseMultivariateOptimizer;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.RealPointValuePair;
@ -39,7 +39,7 @@ import org.apache.commons.math.optimization.SimpleScalarValueChecker;
* @since 2.2
*/
public abstract class BaseAbstractMultivariateOptimizer<FUNC extends MultivariateFunction>
implements BaseMultivariateRealOptimizer<FUNC> {
implements BaseMultivariateOptimizer<FUNC> {
/** Evaluations counter. */
protected final Incrementor evaluations = new Incrementor();
/** Convergence checker. */

View File

@ -18,7 +18,7 @@
package org.apache.commons.math.optimization.direct;
import org.apache.commons.math.analysis.MultivariateFunction;
import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
import org.apache.commons.math.optimization.BaseMultivariateOptimizer;
import org.apache.commons.math.optimization.BaseMultivariateSimpleBoundsOptimizer;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.RealPointValuePair;
@ -41,7 +41,7 @@ import org.apache.commons.math.exception.NumberIsTooLargeException;
*/
public abstract class BaseAbstractMultivariateSimpleBoundsOptimizer<FUNC extends MultivariateFunction>
extends BaseAbstractMultivariateOptimizer<FUNC>
implements BaseMultivariateRealOptimizer<FUNC>,
implements BaseMultivariateOptimizer<FUNC>,
BaseMultivariateSimpleBoundsOptimizer<FUNC> {
/** Lower bounds. */
private double[] lowerBound;

View File

@ -54,7 +54,7 @@ import org.apache.commons.math.util.MathUtils;
* user is responsible for converting his bounded point to unbounded by calling
* {@link #boundedToUnbounded(double[])} before providing them to the optimizer.
* For the same reason, the point returned by the {@link
* org.apache.commons.math.optimization.BaseMultivariateRealOptimizer#optimize(int,
* org.apache.commons.math.optimization.BaseMultivariateOptimizer#optimize(int,
* MultivariateFunction, org.apache.commons.math.optimization.GoalType, double[])}
* method is unbounded. So to convert this point to bounded, users must call
* {@link #unboundedToBounded(double[])} by themselves!</p>