Author: erans
Date: Fri Dec 9 11:14:06 2011
New Revision: 1212332
URL: http://svn.apache.org/viewvc?rev=1212332&view=rev
Log:
MATH-707
Class name change:
"BaseAbstractScalarOptimizer" -> "BaseAbstractMultivariateOptimizer"
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.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
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
(from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java&r1=1212327&r2=1212332&rev=1212332&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractScalarOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
Fri Dec 9 11:14:06 2011
@@ -38,7 +38,7 @@ import org.apache.commons.math.optimizat
* @version $Id$
* @since 2.2
*/
-public abstract class BaseAbstractScalarOptimizer<FUNC extends
MultivariateFunction>
+public abstract class BaseAbstractMultivariateOptimizer<FUNC extends
MultivariateFunction>
implements BaseMultivariateRealOptimizer<FUNC> {
/** Evaluations counter. */
protected final Incrementor evaluations = new Incrementor();
@@ -56,13 +56,13 @@ public abstract class BaseAbstractScalar
* The convergence check is set to a {@link SimpleScalarValueChecker} and
* the allowed number of evaluations is set to {@link Integer#MAX_VALUE}.
*/
- protected BaseAbstractScalarOptimizer() {
+ protected BaseAbstractMultivariateOptimizer() {
this(new SimpleScalarValueChecker());
}
/**
* @param checker Convergence checker.
*/
- protected
BaseAbstractScalarOptimizer(ConvergenceChecker<RealPointValuePair> checker) {
+ protected
BaseAbstractMultivariateOptimizer(ConvergenceChecker<RealPointValuePair>
checker) {
this.checker = checker;
}
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java?rev=1212332&r1=1212331&r2=1212332&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java
Fri Dec 9 11:14:06 2011
@@ -40,7 +40,7 @@ import org.apache.commons.math.exception
* @since 3.0
*/
public abstract class BaseAbstractSimpleBoundsScalarOptimizer<FUNC extends
MultivariateFunction>
- extends BaseAbstractScalarOptimizer<FUNC>
+ extends BaseAbstractMultivariateOptimizer<FUNC>
implements BaseMultivariateRealOptimizer<FUNC>,
BaseSimpleBoundsMultivariateRealOptimizer<FUNC> {
/** Lower bounds. */
@@ -54,7 +54,7 @@ public abstract class BaseAbstractSimple
* {@link org.apache.commons.math.optimization.SimpleScalarValueChecker}
and
* the allowed number of evaluations is set to {@link Integer#MAX_VALUE}.
*
- * @see BaseAbstractScalarOptimizer#BaseAbstractScalarOptimizer()
+ * @see
BaseAbstractMultivariateOptimizer#BaseAbstractMultivariateOptimizer()
*/
protected BaseAbstractSimpleBoundsScalarOptimizer() {}
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=1212332&r1=1212331&r2=1212332&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 11:14:06 2011
@@ -81,7 +81,7 @@ import org.apache.commons.math.util.Math
*/
public class CMAESOptimizer
- extends BaseAbstractScalarOptimizer<MultivariateFunction>
+ extends BaseAbstractMultivariateOptimizer<MultivariateFunction>
implements MultivariateRealOptimizer {
/** Default value for {@link #checkFeasableCount}: {@value}. */
public static final int DEFAULT_CHECKFEASABLECOUNT = 0;
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=1212332&r1=1212331&r2=1212332&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 11:14:06 2011
@@ -46,7 +46,7 @@ import org.apache.commons.math.optimizat
* @since 2.2
*/
public class PowellOptimizer
- extends BaseAbstractScalarOptimizer<MultivariateFunction>
+ extends BaseAbstractMultivariateOptimizer<MultivariateFunction>
implements MultivariateRealOptimizer {
/**
* 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=1212332&r1=1212331&r2=1212332&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 11:14:06 2011
@@ -84,7 +84,7 @@ import org.apache.commons.math.optimizat
* @since 3.0
*/
public class SimplexOptimizer
- extends BaseAbstractScalarOptimizer<MultivariateFunction>
+ extends BaseAbstractMultivariateOptimizer<MultivariateFunction>
implements MultivariateRealOptimizer {
/** 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=1212332&r1=1212331&r2=1212332&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 11:14:06 2011
@@ -23,7 +23,7 @@ import org.apache.commons.math.optimizat
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.RealPointValuePair;
-import org.apache.commons.math.optimization.direct.BaseAbstractScalarOptimizer;
+import
org.apache.commons.math.optimization.direct.BaseAbstractMultivariateOptimizer;
/**
* Base class for implementing optimizers for multivariate scalar
@@ -34,7 +34,7 @@ import org.apache.commons.math.optimizat
* @since 2.0
*/
public abstract class AbstractScalarDifferentiableOptimizer
- extends BaseAbstractScalarOptimizer<DifferentiableMultivariateFunction>
+ extends
BaseAbstractMultivariateOptimizer<DifferentiableMultivariateFunction>
implements DifferentiableMultivariateRealOptimizer {
/**
* Objective function gradient.
