Author: erans
Date: Fri Dec 9 12:42:50 2011
New Revision: 1212377
URL: http://svn.apache.org/viewvc?rev=1212377&view=rev
Log:
MATH-707
Class name change:
"MultivariateRealOptimizer" -> "MultivariateOptimizer"
"DifferentiableMultivariateRealOptimizer" ->
"DifferentiableMultivariateOptimizer"
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java
- copied, changed from r1212373,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java
- copied, changed from r1212373,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -24,8 +24,8 @@ import org.apache.commons.math.analysis.
* Commons-FastMath. Users of the API are advised to base their code on
* the following interfaces:
* <ul>
- * <li>{@link
org.apache.commons.math.optimization.MultivariateRealOptimizer}</li>
- * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer}</li>
+ * <li>{@link org.apache.commons.math.optimization.MultivariateOptimizer}</li>
+ * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer}</li>
* </ul>
*
* @param <FUNC> Type of the objective function to be optimized.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -24,8 +24,8 @@ import org.apache.commons.math.analysis.
* Commons-FastMath. Users of the API are advised to base their code on
* the following interfaces:
* <ul>
- * <li>{@link
org.apache.commons.math.optimization.MultivariateRealOptimizer}</li>
- * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer}</li>
+ * <li>{@link org.apache.commons.math.optimization.MultivariateOptimizer}</li>
+ * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer}</li>
* </ul>
*
* @param <FUNC> Type of the objective function to be optimized.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -22,8 +22,8 @@ package org.apache.commons.math.optimiza
* Commons-Math. Users of the API are advised to base their code on
* the following interfaces:
* <ul>
- * <li>{@link
org.apache.commons.math.optimization.MultivariateRealOptimizer}</li>
- * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer}</li>
+ * <li>{@link org.apache.commons.math.optimization.MultivariateOptimizer}</li>
+ * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer}</li>
* <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer}</li>
* <li>{@link
org.apache.commons.math.optimization.univariate.UnivariateRealOptimizer}</li>
* </ul>
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -21,7 +21,7 @@ import org.apache.commons.math.analysis.
import org.apache.commons.math.random.RandomVectorGenerator;
/**
- * Special implementation of the {@link
DifferentiableMultivariateRealOptimizer}
+ * Special implementation of the {@link DifferentiableMultivariateOptimizer}
* interface adding multi-start features to an existing optimizer.
*
* This class wraps a classical optimizer to use it several times in
@@ -33,7 +33,7 @@ import org.apache.commons.math.random.Ra
*/
public class DifferentiableMultivariateMultiStartOptimizer
extends
BaseMultivariateMultiStartOptimizer<DifferentiableMultivariateFunction>
- implements DifferentiableMultivariateRealOptimizer {
+ implements DifferentiableMultivariateOptimizer {
/**
* Create a multi-start optimizer from a single-start optimizer.
*
@@ -43,7 +43,7 @@ public class DifferentiableMultivariateM
* equal to 1.
* @param generator Random vector generator to use for restarts.
*/
- public DifferentiableMultivariateMultiStartOptimizer(final
DifferentiableMultivariateRealOptimizer optimizer,
+ public DifferentiableMultivariateMultiStartOptimizer(final
DifferentiableMultivariateOptimizer optimizer,
final int starts,
final
RandomVectorGenerator generator) {
super(optimizer, starts, generator);
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java
(from r1212373,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java&r1=1212373&r2=1212377&rev=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -26,11 +26,11 @@ import org.apache.commons.math.analysis.
* Optimization algorithms find the input point set that either {@link GoalType
* maximize or minimize} an objective function.
*
- * @see MultivariateRealOptimizer
+ * @see MultivariateOptimizer
* @see DifferentiableMultivariateVectorOptimizer
*
* @version $Id$
* @since 2.0
*/
-public interface DifferentiableMultivariateRealOptimizer
+public interface DifferentiableMultivariateOptimizer
extends BaseMultivariateOptimizer<DifferentiableMultivariateFunction> {}
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -21,7 +21,7 @@ import org.apache.commons.math.analysis.
import org.apache.commons.math.random.RandomVectorGenerator;
/**
- * Special implementation of the {@link MultivariateRealOptimizer} interface
adding
+ * Special implementation of the {@link MultivariateOptimizer} interface adding
* multi-start features to an existing optimizer.
*
* This class wraps a classical optimizer to use it several times in
@@ -33,7 +33,7 @@ import org.apache.commons.math.random.Ra
*/
public class MultivariateMultiStartOptimizer
extends BaseMultivariateMultiStartOptimizer<MultivariateFunction>
- implements MultivariateRealOptimizer {
+ implements MultivariateOptimizer {
/**
* Create a multi-start optimizer from a single-start optimizer.
*
@@ -43,7 +43,7 @@ public class MultivariateMultiStartOptim
* equal to 1.
* @param generator Random vector generator to use for restarts.
*/
- public MultivariateMultiStartOptimizer(final MultivariateRealOptimizer
optimizer,
+ public MultivariateMultiStartOptimizer(final MultivariateOptimizer
optimizer,
final int starts,
final RandomVectorGenerator
generator) {
super(optimizer, starts, generator);
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java
(from r1212373,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java&r1=1212373&r2=1212377&rev=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -25,10 +25,10 @@ import org.apache.commons.math.analysis.
* <p>Optimization algorithms find the input point set that either {@link
GoalType
* maximize or minimize} an objective function.</p>
*
- * @see DifferentiableMultivariateRealOptimizer
+ * @see DifferentiableMultivariateOptimizer
* @see DifferentiableMultivariateVectorOptimizer
* @version $Id$
* @since 2.0
*/
-public interface MultivariateRealOptimizer
+public interface MultivariateOptimizer
extends BaseMultivariateOptimizer<MultivariateFunction> {}
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -29,7 +29,7 @@ import org.apache.commons.math.linear.Ar
import org.apache.commons.math.linear.RealVector;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.RealPointValuePair;
-import org.apache.commons.math.optimization.MultivariateRealOptimizer;
+import org.apache.commons.math.optimization.MultivariateOptimizer;
/**
* Powell's BOBYQA algorithm. This implementation is translated and
@@ -51,7 +51,7 @@ import org.apache.commons.math.optimizat
*/
public class BOBYQAOptimizer
extends BaseAbstractMultivariateSimpleBoundsOptimizer<MultivariateFunction>
- implements MultivariateRealOptimizer {
+ implements MultivariateOptimizer {
/** Minimum dimension of the problem: {@value} */
public static final int MINIMUM_PROBLEM_DIMENSION = 2;
/** Default value for {@link #initialTrustRegionRadius}: {@value} . */
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -33,7 +33,7 @@ import org.apache.commons.math.linear.Ma
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.MultivariateRealOptimizer;
+import org.apache.commons.math.optimization.MultivariateOptimizer;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.apache.commons.math.optimization.SimpleScalarValueChecker;
import org.apache.commons.math.random.MersenneTwister;
@@ -82,7 +82,7 @@ import org.apache.commons.math.util.Math
public class CMAESOptimizer
extends BaseAbstractMultivariateOptimizer<MultivariateFunction>
- implements MultivariateRealOptimizer {
+ implements MultivariateOptimizer {
/** Default value for {@link #checkFeasableCount}: {@value}. */
public static final int DEFAULT_CHECKFEASABLECOUNT = 0;
/** Default value for {@link #stopFitness}: {@value}. */
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -26,7 +26,7 @@ import org.apache.commons.math.exception
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.optimization.MultivariateRealOptimizer;
+import org.apache.commons.math.optimization.MultivariateOptimizer;
import org.apache.commons.math.optimization.univariate.BracketFinder;
import org.apache.commons.math.optimization.univariate.BrentOptimizer;
import
org.apache.commons.math.optimization.univariate.UnivariateRealPointValuePair;
@@ -47,7 +47,7 @@ import org.apache.commons.math.optimizat
*/
public class PowellOptimizer
extends BaseAbstractMultivariateOptimizer<MultivariateFunction>
- implements MultivariateRealOptimizer {
+ implements MultivariateOptimizer {
/**
* Minimum relative tolerance.
*/
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -25,7 +25,7 @@ import org.apache.commons.math.optimizat
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.apache.commons.math.optimization.SimpleScalarValueChecker;
-import org.apache.commons.math.optimization.MultivariateRealOptimizer;
+import org.apache.commons.math.optimization.MultivariateOptimizer;
/**
* This class implements simplex-based direct search optimization.
@@ -85,7 +85,7 @@ import org.apache.commons.math.optimizat
*/
public class SimplexOptimizer
extends BaseAbstractMultivariateOptimizer<MultivariateFunction>
- implements MultivariateRealOptimizer {
+ implements MultivariateOptimizer {
/** Simplex. */
private AbstractSimplex simplex;
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
Fri Dec 9 12:42:50 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.optimiza
import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
import org.apache.commons.math.analysis.MultivariateVectorFunction;
-import
org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer;
+import
org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.RealPointValuePair;
@@ -35,7 +35,7 @@ import org.apache.commons.math.optimizat
*/
public abstract class AbstractScalarDifferentiableOptimizer
extends
BaseAbstractMultivariateOptimizer<DifferentiableMultivariateFunction>
- implements DifferentiableMultivariateRealOptimizer {
+ implements DifferentiableMultivariateOptimizer {
/**
* Objective function gradient.
*/
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
Fri Dec 9 12:42:50 2011
@@ -35,11 +35,11 @@
* <li>{@link
org.apache.commons.math.optimization.univariate.UnivariateRealOptimizer
* UnivariateRealOptimizer} for {@link
org.apache.commons.math.analysis.UnivariateFunction
* univariate real functions}</li>
- * <li>{@link org.apache.commons.math.optimization.MultivariateRealOptimizer
- * MultivariateRealOptimizer} for {@link
org.apache.commons.math.analysis.MultivariateFunction
+ * <li>{@link org.apache.commons.math.optimization.MultivariateOptimizer
+ * MultivariateOptimizer} for {@link
org.apache.commons.math.analysis.MultivariateFunction
* multivariate real functions}</li>
- * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer
- * DifferentiableMultivariateRealOptimizer} for {@link
+ * <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer
+ * DifferentiableMultivariateOptimizer} for {@link
* org.apache.commons.math.analysis.DifferentiableMultivariateFunction
* differentiable multivariate real functions}</li>
* <li>{@link
org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer
@@ -57,7 +57,7 @@
* real function} thanks to the {@link
* org.apache.commons.math.optimization.LeastSquaresConverter
LeastSquaresConverter} helper class.
* The transformed function can be optimized using any implementation of the
{@link
- * org.apache.commons.math.optimization.MultivariateRealOptimizer
MultivariateRealOptimizer} interface.
+ * org.apache.commons.math.optimization.MultivariateOptimizer
MultivariateOptimizer} interface.
* </p>
*
* <p>
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
Fri Dec 9 12:42:50 2011
@@ -792,7 +792,7 @@ public class BatteryNISTTest {
}
/* generic test runner */
- private double[] run(MultivariateRealOptimizer optim,
DifferentiableMultivariateFunction func, double[] start) {
+ private double[] run(MultivariateOptimizer optim,
DifferentiableMultivariateFunction func, double[] start) {
return (optim.optimize(1000000, func, GoalType.MINIMIZE,
start).getPointRef());
}
/* generic test runner for AbstractScalarDifferentiableOptimizer */
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java
Fri Dec 9 12:42:50 2011
@@ -253,7 +253,7 @@ public class BOBYQAOptimizerTest {
System.out.println(func.getClass().getName() + " BEGIN"); // XXX
int dim = startPoint.length;
-// MultivariateRealOptimizer optim =
+// MultivariateOptimizer optim =
// new PowellOptimizer(1e-13, Math.ulp(1d));
// RealPointValuePair result = optim.optimize(100000, func, goal,
startPoint);
final double[] lB = boundaries == null ? null : boundaries[0];
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java
Fri Dec 9 12:42:50 2011
@@ -27,7 +27,7 @@ import org.apache.commons.math.exception
import org.apache.commons.math.exception.NotPositiveException;
import org.apache.commons.math.exception.OutOfRangeException;
import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.MultivariateRealOptimizer;
+import org.apache.commons.math.optimization.MultivariateOptimizer;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.apache.commons.math.random.MersenneTwister;
import org.junit.Assert;
@@ -375,7 +375,7 @@ public class CMAESOptimizerTest {
RealPointValuePair expected) {
int dim = startPoint.length;
// test diagonalOnly = 0 - slow but normally fewer feval#
- MultivariateRealOptimizer optim =
+ MultivariateOptimizer optim =
new CMAESOptimizer(
lambda, inSigma, boundaries, 30000,
stopValue, isActive, diagonalOnly, 0, new
MersenneTwister(),false);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java?rev=1212377&r1=1212376&r2=1212377&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
Fri Dec 9 12:42:50 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.optimiza
import org.apache.commons.math.analysis.MultivariateFunction;
import org.apache.commons.math.analysis.SumSincFunction;
import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.MultivariateRealOptimizer;
+import org.apache.commons.math.optimization.MultivariateOptimizer;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.junit.Assert;
import org.junit.Test;
@@ -131,7 +131,7 @@ public class PowellOptimizerTest {
GoalType goal,
double fTol,
double pointTol) {
- final MultivariateRealOptimizer optim = new PowellOptimizer(fTol,
Math.ulp(1d));
+ final MultivariateOptimizer optim = new PowellOptimizer(fTol,
Math.ulp(1d));
final RealPointValuePair result = optim.optimize(1000, func, goal,
init);
final double[] found = result.getPoint();
