Author: luc
Date: Sat Oct 2 20:52:39 2010
New Revision: 1003881
URL: http://svn.apache.org/viewvc?rev=1003881&view=rev
Log:
backported part of r999948 from trunk to branch 2.X
moved PowellOptimizer to the optimization.direct package
Added:
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
- copied, changed from r1003879,
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
- copied, changed from r1003879,
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java
Removed:
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java
Copied:
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
(from r1003879,
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java?p2=commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java&p1=commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java&r1=1003879&r2=1003881&rev=1003881&view=diff
==============================================================================
---
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/PowellOptimizer.java
(original)
+++
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
Sat Oct 2 20:52:39 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math.optimization.direct;
import java.util.Arrays;
@@ -25,6 +25,7 @@ import org.apache.commons.math.analysis.
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.OptimizationException;
import org.apache.commons.math.optimization.RealPointValuePair;
+import org.apache.commons.math.optimization.general.AbstractScalarOptimizer;
import
org.apache.commons.math.optimization.univariate.AbstractUnivariateRealOptimizer;
import org.apache.commons.math.optimization.univariate.BracketFinder;
import org.apache.commons.math.optimization.univariate.BrentOptimizer;
Copied:
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
(from r1003879,
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java?p2=commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java&p1=commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java&r1=1003879&r2=1003881&rev=1003881&view=diff
==============================================================================
---
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/general/PowellOptimizerTest.java
(original)
+++
commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
Sat Oct 2 20:52:39 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math.optimization.direct;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MathException;
@@ -24,6 +24,7 @@ import org.apache.commons.math.optimizat
import org.apache.commons.math.optimization.MultivariateRealOptimizer;
import org.apache.commons.math.optimization.RealPointValuePair;
import org.apache.commons.math.optimization.SimpleScalarValueChecker;
+import org.apache.commons.math.optimization.direct.PowellOptimizer;
import org.junit.Assert;
import org.junit.Test;