Author: erans
Date: Fri Dec 9 11:59:23 2011
New Revision: 1212344
URL: http://svn.apache.org/viewvc?rev=1212344&view=rev
Log:
MATH-707
Class name change:
"MultiStartMultivariateRealOptimizer" -> "MultivariateMultiStartOptimizer"
"BaseMultiStartMultivariateRealOptimizer" ->
"BaseMultivariateMultiStartOptimizer"
"MultiStartDifferentiableMultivariateRealOptimizer" ->
"DifferentiableMultivariateMultiStartOptimizer"
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizerTest.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizerTest.java
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
(from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateRealOptimizer.java&r1=1212327&r2=1212344&rev=1212344&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
Fri Dec 9 11:59:23 2011
@@ -32,15 +32,15 @@ import org.apache.commons.math.random.Ra
*
* This interface is mainly intended to enforce the internal coherence of
* Commons-Math. Users of the API are advised to base their code on
- * {@link MultiStartMultivariateRealOptimizer} or on
- * {@link MultiStartDifferentiableMultivariateRealOptimizer}.
+ * {@link MultivariateMultiStartOptimizer} or on
+ * {@link DifferentiableMultivariateMultiStartOptimizer}.
*
* @param <FUNC> Type of the objective function to be optimized.
*
* @version $Id$
* @since 3.0
*/
-public class BaseMultiStartMultivariateRealOptimizer<FUNC extends
MultivariateFunction>
+public class BaseMultivariateMultiStartOptimizer<FUNC extends
MultivariateFunction>
implements BaseMultivariateRealOptimizer<FUNC> {
/** Underlying classical optimizer. */
private final BaseMultivariateRealOptimizer<FUNC> optimizer;
@@ -67,7 +67,7 @@ public class BaseMultiStartMultivariateR
* is {@code null}.
* @throws NotStrictlyPositiveException if {@code starts < 1}.
*/
- protected BaseMultiStartMultivariateRealOptimizer(final
BaseMultivariateRealOptimizer<FUNC> optimizer,
+ protected BaseMultivariateMultiStartOptimizer(final
BaseMultivariateRealOptimizer<FUNC> optimizer,
final int starts,
final
RandomVectorGenerator generator) {
if (optimizer == null ||
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
(from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java&r1=1212327&r2=1212344&rev=1212344&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java
Fri Dec 9 11:59:23 2011
@@ -31,8 +31,8 @@ import org.apache.commons.math.random.Ra
* @version $Id$
* @since 2.0
*/
-public class MultiStartDifferentiableMultivariateRealOptimizer
- extends
BaseMultiStartMultivariateRealOptimizer<DifferentiableMultivariateFunction>
+public class DifferentiableMultivariateMultiStartOptimizer
+ extends
BaseMultivariateMultiStartOptimizer<DifferentiableMultivariateFunction>
implements DifferentiableMultivariateRealOptimizer {
/**
* Create a multi-start optimizer from a single-start optimizer.
@@ -43,7 +43,7 @@ public class MultiStartDifferentiableMul
* equal to 1.
* @param generator Random vector generator to use for restarts.
*/
- public MultiStartDifferentiableMultivariateRealOptimizer(final
DifferentiableMultivariateRealOptimizer optimizer,
+ public DifferentiableMultivariateMultiStartOptimizer(final
DifferentiableMultivariateRealOptimizer optimizer,
final int starts,
final
RandomVectorGenerator generator) {
super(optimizer, starts, generator);
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
(from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java&r1=1212327&r2=1212344&rev=1212344&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java
Fri Dec 9 11:59:23 2011
@@ -31,8 +31,8 @@ import org.apache.commons.math.random.Ra
* @version $Id$
* @since 2.0
*/
-public class MultiStartMultivariateRealOptimizer
- extends BaseMultiStartMultivariateRealOptimizer<MultivariateFunction>
+public class MultivariateMultiStartOptimizer
+ extends BaseMultivariateMultiStartOptimizer<MultivariateFunction>
implements MultivariateRealOptimizer {
/**
* Create a multi-start optimizer from a single-start optimizer.
@@ -43,7 +43,7 @@ public class MultiStartMultivariateRealO
* equal to 1.
* @param generator Random vector generator to use for restarts.
*/
- public MultiStartMultivariateRealOptimizer(final MultivariateRealOptimizer
optimizer,
+ public MultivariateMultiStartOptimizer(final MultivariateRealOptimizer
optimizer,
final int starts,
final RandomVectorGenerator
generator) {
super(optimizer, starts, generator);
Copied:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
(from r1212327,
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java?p2=commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java&p1=commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java&r1=1212327&r2=1212344&rev=1212344&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
Fri Dec 9 11:59:23 2011
@@ -33,7 +33,7 @@ import org.apache.commons.math.random.Un
import org.junit.Assert;
import org.junit.Test;
-public class MultiStartDifferentiableMultivariateRealOptimizerTest {
+public class DifferentiableMultivariateMultiStartOptimizerTest {
@Test
public void testCircleFitting() {
@@ -51,8 +51,8 @@ public class MultiStartDifferentiableMul
RandomVectorGenerator generator =
new UncorrelatedRandomVectorGenerator(new double[] { 50.0, 50.0 },
new double[] { 10.0, 10.0 },
new
GaussianRandomGenerator(g));
- MultiStartDifferentiableMultivariateRealOptimizer optimizer =
- new MultiStartDifferentiableMultivariateRealOptimizer(underlying,
10, generator);
+ DifferentiableMultivariateMultiStartOptimizer optimizer =
+ new DifferentiableMultivariateMultiStartOptimizer(underlying, 10,
generator);
RealPointValuePair optimum =
optimizer.optimize(200, circle, GoalType.MINIMIZE, new double[] {
98.680, 47.345 });
Assert.assertEquals(200, optimizer.getMaxEvaluations());
Copied:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java
(from r1212327,
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizerTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java?p2=commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java&p1=commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizerTest.java&r1=1212327&r2=1212344&rev=1212344&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java
Fri Dec 9 11:59:23 2011
@@ -28,7 +28,7 @@ import org.apache.commons.math.random.Un
import org.junit.Assert;
import org.junit.Test;
-public class MultiStartMultivariateRealOptimizerTest {
+public class MultivariateMultiStartOptimizerTest {
@Test
public void testRosenbrock() {
Rosenbrock rosenbrock = new Rosenbrock();
@@ -42,8 +42,8 @@ public class MultiStartMultivariateRealO
g.setSeed(16069223052l);
RandomVectorGenerator generator =
new UncorrelatedRandomVectorGenerator(2, new
GaussianRandomGenerator(g));
- MultiStartMultivariateRealOptimizer optimizer =
- new MultiStartMultivariateRealOptimizer(underlying, 10, generator);
+ MultivariateMultiStartOptimizer optimizer =
+ new MultivariateMultiStartOptimizer(underlying, 10, generator);
RealPointValuePair optimum =
optimizer.optimize(1100, rosenbrock, GoalType.MINIMIZE, new
double[] { -1.2, 1.0 });
