Author: erans
Date: Fri Dec 9 12:35:37 2011
New Revision: 1212373
URL: http://svn.apache.org/viewvc?rev=1212373&view=rev
Log:
MATH-707
Class name change:
"BaseMultivariateRealOptimizer" -> "BaseMultivariateOptimizer"
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.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/DifferentiableMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java?rev=1212373&r1=1212372&r2=1212373&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
Fri Dec 9 12:35:37 2011
@@ -41,9 +41,9 @@ import org.apache.commons.math.random.Ra
* @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 BaseMultivariateMultiStartO
* 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 ||
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
(from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java&r1=1212327&r2=1212373&rev=1212373&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
Fri Dec 9 12:35:37 2011
@@ -33,7 +33,7 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public interface BaseMultivariateRealOptimizer<FUNC extends
MultivariateFunction>
+public interface BaseMultivariateOptimizer<FUNC extends MultivariateFunction>
extends BaseOptimizer<RealPointValuePair> {
/**
* Optimize an objective function.
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=1212373&r1=1212372&r2=1212373&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:35:37 2011
@@ -34,7 +34,7 @@ import org.apache.commons.math.analysis.
* @since 3.0
*/
public interface BaseMultivariateSimpleBoundsOptimizer<FUNC extends
MultivariateFunction>
- extends BaseMultivariateRealOptimizer<FUNC> {
+ extends BaseMultivariateOptimizer<FUNC> {
/**
* Optimize an objective function.
*
Modified:
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/DifferentiableMultivariateRealOptimizer.java?rev=1212373&r1=1212372&r2=1212373&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/DifferentiableMultivariateRealOptimizer.java
Fri Dec 9 12:35:37 2011
@@ -33,4 +33,4 @@ import org.apache.commons.math.analysis.
* @since 2.0
*/
public interface DifferentiableMultivariateRealOptimizer
- extends BaseMultivariateRealOptimizer<DifferentiableMultivariateFunction>
{}
+ extends BaseMultivariateOptimizer<DifferentiableMultivariateFunction> {}
Modified:
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/MultivariateRealOptimizer.java?rev=1212373&r1=1212372&r2=1212373&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/MultivariateRealOptimizer.java
Fri Dec 9 12:35:37 2011
@@ -31,4 +31,4 @@ import org.apache.commons.math.analysis.
* @since 2.0
*/
public interface MultivariateRealOptimizer
- extends BaseMultivariateRealOptimizer<MultivariateFunction> {}
+ extends BaseMultivariateOptimizer<MultivariateFunction> {}
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java?rev=1212373&r1=1212372&r2=1212373&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
Fri Dec 9 12:35:37 2011
@@ -22,7 +22,7 @@ import org.apache.commons.math.exception
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.optimizat
* @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. */
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java?rev=1212373&r1=1212372&r2=1212373&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
Fri Dec 9 12:35:37 2011
@@ -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
*/
public abstract class BaseAbstractMultivariateSimpleBoundsOptimizer<FUNC
extends MultivariateFunction>
extends BaseAbstractMultivariateOptimizer<FUNC>
- implements BaseMultivariateRealOptimizer<FUNC>,
+ implements BaseMultivariateOptimizer<FUNC>,
BaseMultivariateSimpleBoundsOptimizer<FUNC> {
/** Lower bounds. */
private double[] lowerBound;
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java?rev=1212373&r1=1212372&r2=1212373&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
Fri Dec 9 12:35:37 2011
@@ -54,7 +54,7 @@ import org.apache.commons.math.util.Math
* 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>
