Author: erans
Date: Fri Dec 9 11:32:40 2011
New Revision: 1212336
URL: http://svn.apache.org/viewvc?rev=1212336&view=rev
Log:
MATH-707
Class name change:
"BaseAbstractSimpleBoundsScalarOptimizer" ->
"BaseAbstractMultivariateSimpleBoundsOptimizer"
"BaseSimpleBoundsMultivariateRealOptimizer" ->
"BaseMultivariateSimpleBoundsOptimizer"
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
- copied, changed from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseSimpleBoundsMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
- copied, changed from r1212332,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseSimpleBoundsMultivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
(from r1212327,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseSimpleBoundsMultivariateRealOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseSimpleBoundsMultivariateRealOptimizer.java&r1=1212327&r2=1212336&rev=1212336&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseSimpleBoundsMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
Fri Dec 9 11:32:40 2011
@@ -33,7 +33,7 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public interface BaseSimpleBoundsMultivariateRealOptimizer<FUNC extends
MultivariateFunction>
+public interface BaseMultivariateSimpleBoundsOptimizer<FUNC extends
MultivariateFunction>
extends BaseMultivariateRealOptimizer<FUNC> {
/**
* Optimize an objective function.
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=1212336&r1=1212335&r2=1212336&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 11:32:40 2011
@@ -50,7 +50,7 @@ import org.apache.commons.math.optimizat
* @since 3.0
*/
public class BOBYQAOptimizer
- extends BaseAbstractSimpleBoundsScalarOptimizer<MultivariateFunction>
+ extends BaseAbstractMultivariateSimpleBoundsOptimizer<MultivariateFunction>
implements MultivariateRealOptimizer {
/** Minimum dimension of the problem: {@value} */
public static final int MINIMUM_PROBLEM_DIMENSION = 2;
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
(from r1212332,
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/BaseAbstractMultivariateSimpleBoundsOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractSimpleBoundsScalarOptimizer.java&r1=1212332&r2=1212336&rev=1212336&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/BaseAbstractMultivariateSimpleBoundsOptimizer.java
Fri Dec 9 11:32:40 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.optimiza
import org.apache.commons.math.analysis.MultivariateFunction;
import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
-import
org.apache.commons.math.optimization.BaseSimpleBoundsMultivariateRealOptimizer;
+import
org.apache.commons.math.optimization.BaseMultivariateSimpleBoundsOptimizer;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.apache.commons.math.optimization.ConvergenceChecker;
@@ -39,10 +39,10 @@ import org.apache.commons.math.exception
* @version $Id$
* @since 3.0
*/
-public abstract class BaseAbstractSimpleBoundsScalarOptimizer<FUNC extends
MultivariateFunction>
+public abstract class BaseAbstractMultivariateSimpleBoundsOptimizer<FUNC
extends MultivariateFunction>
extends BaseAbstractMultivariateOptimizer<FUNC>
implements BaseMultivariateRealOptimizer<FUNC>,
- BaseSimpleBoundsMultivariateRealOptimizer<FUNC> {
+ BaseMultivariateSimpleBoundsOptimizer<FUNC> {
/** Lower bounds. */
private double[] lowerBound;
/** Upper bounds. */
@@ -56,12 +56,12 @@ public abstract class BaseAbstractSimple
*
* @see
BaseAbstractMultivariateOptimizer#BaseAbstractMultivariateOptimizer()
*/
- protected BaseAbstractSimpleBoundsScalarOptimizer() {}
+ protected BaseAbstractMultivariateSimpleBoundsOptimizer() {}
/**
* @param checker Convergence checker.
*/
- protected
BaseAbstractSimpleBoundsScalarOptimizer(ConvergenceChecker<RealPointValuePair>
checker) {
+ protected
BaseAbstractMultivariateSimpleBoundsOptimizer(ConvergenceChecker<RealPointValuePair>
checker) {
super(checker);
}