commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1212385 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/optimization/univariate/ test/java/org/apache/commons/math/optimization/univariate/
Date Fri, 09 Dec 2011 13:00:12 GMT
Author: erans
Date: Fri Dec  9 13:00:11 2011
New Revision: 1212385

URL: http://svn.apache.org/viewvc?rev=1212385&view=rev
Log:
MATH-707
Class name change:
  "AbstractUnivariateRealOptimizer" -> "BaseAbstractUnivariateOptimizer"
  "MultiStartUnivariateRealOptimizer" -> "UnivariateMultiStartOptimizer"
  "BaseUnivariateRealOptimizer" -> "BaseUnivariateOptimizer"

Added:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java
      - copied, changed from r1212327, commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java
      - copied, changed from r1212327, commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java
      - copied, changed from r1212327, commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java
      - copied, changed from r1212327, commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizerTest.java
Removed:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizerTest.java
Modified:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java

Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java
(from r1212327, commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java&r1=1212327&r2=1212385&rev=1212385&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java
Fri Dec  9 13:00:11 2011
@@ -32,7 +32,7 @@ import org.apache.commons.math.optimizat
  * @version $Id$
  * @since 2.0
  */
-public abstract class AbstractUnivariateRealOptimizer
+public abstract class BaseAbstractUnivariateOptimizer
     implements UnivariateRealOptimizer {
     /** Convergence checker. */
     private final ConvergenceChecker<UnivariateRealPointValuePair> checker;
@@ -52,7 +52,7 @@ public abstract class AbstractUnivariate
     /**
      * @param checker Convergence checking procedure.
      */
-    protected AbstractUnivariateRealOptimizer(ConvergenceChecker<UnivariateRealPointValuePair>
checker) {
+    protected BaseAbstractUnivariateOptimizer(ConvergenceChecker<UnivariateRealPointValuePair>
checker) {
         this.checker = checker;
     }
 

Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java
(from r1212327, commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java&r1=1212327&r2=1212385&rev=1212385&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java
Fri Dec  9 13:00:11 2011
@@ -34,7 +34,7 @@ import org.apache.commons.math.optimizat
  * @version $Id$
  * @since 3.0
  */
-public interface BaseUnivariateRealOptimizer<FUNC extends UnivariateFunction>
+public interface BaseUnivariateOptimizer<FUNC extends UnivariateFunction>
     extends BaseOptimizer<UnivariateRealPointValuePair> {
     /**
      * Find an optimum in the given interval.

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java?rev=1212385&r1=1212384&r2=1212385&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
Fri Dec  9 13:00:11 2011
@@ -35,7 +35,7 @@ import org.apache.commons.math.optimizat
  * @version $Id$
  * @since 2.0
  */
-public class BrentOptimizer extends AbstractUnivariateRealOptimizer {
+public class BrentOptimizer extends BaseAbstractUnivariateOptimizer {
     /**
      * Golden section.
      */

Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java
(from r1212327, commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java&r1=1212327&r2=1212385&rev=1212385&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java
Fri Dec  9 13:00:11 2011
@@ -42,10 +42,10 @@ import org.apache.commons.math.optimizat
  * @version $Id$
  * @since 3.0
  */
-public class MultiStartUnivariateRealOptimizer<FUNC extends UnivariateFunction>
-    implements BaseUnivariateRealOptimizer<FUNC> {
+public class UnivariateMultiStartOptimizer<FUNC extends UnivariateFunction>
+    implements BaseUnivariateOptimizer<FUNC> {
     /** Underlying classical optimizer. */
-    private final BaseUnivariateRealOptimizer<FUNC> optimizer;
+    private final BaseUnivariateOptimizer<FUNC> optimizer;
     /** Maximal number of evaluations allowed. */
     private int maxEvaluations;
     /** Number of evaluations already performed for all starts. */
@@ -69,7 +69,7 @@ public class MultiStartUnivariateRealOpt
      * is {@code null}.
      * @throws NotStrictlyPositiveException if {@code starts < 1}.
      */
-    public MultiStartUnivariateRealOptimizer(final BaseUnivariateRealOptimizer<FUNC>
optimizer,
+    public UnivariateMultiStartOptimizer(final BaseUnivariateOptimizer<FUNC> optimizer,
                                              final int starts,
                                              final RandomGenerator generator) {
         if (optimizer == null ||

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java?rev=1212385&r1=1212384&r2=1212385&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
Fri Dec  9 13:00:11 2011
@@ -25,4 +25,4 @@ import org.apache.commons.math.analysis.
  * @since 3.0
  */
 public interface UnivariateRealOptimizer
-    extends BaseUnivariateRealOptimizer<UnivariateFunction> {}
+    extends BaseUnivariateOptimizer<UnivariateFunction> {}

Copied: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java
(from r1212327, commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizerTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java?p2=commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java&p1=commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizerTest.java&r1=1212327&r2=1212385&rev=1212385&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizerTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java
Fri Dec  9 13:00:11 2011
@@ -27,7 +27,7 @@ import org.apache.commons.math.util.Fast
 import org.junit.Test;
 import org.junit.Assert;
 
-public class MultiStartUnivariateRealOptimizerTest {
+public class UnivariateMultiStartOptimizerTest {
 
     @Test
     public void testSinMin() {
@@ -35,8 +35,8 @@ public class MultiStartUnivariateRealOpt
         UnivariateRealOptimizer underlying = new BrentOptimizer(1e-10, 1e-14);
         JDKRandomGenerator g = new JDKRandomGenerator();
         g.setSeed(44428400075l);
-        MultiStartUnivariateRealOptimizer<UnivariateFunction> optimizer =
-            new MultiStartUnivariateRealOptimizer<UnivariateFunction>(underlying, 10,
g);
+        UnivariateMultiStartOptimizer<UnivariateFunction> optimizer =
+            new UnivariateMultiStartOptimizer<UnivariateFunction>(underlying, 10, g);
         optimizer.optimize(300, f, GoalType.MINIMIZE, -100.0, 100.0);
         UnivariateRealPointValuePair[] optima = optimizer.getOptima();
         for (int i = 1; i < optima.length; ++i) {
@@ -57,8 +57,8 @@ public class MultiStartUnivariateRealOpt
         UnivariateRealOptimizer underlying = new BrentOptimizer(1e-9, 1e-14);
         JDKRandomGenerator g = new JDKRandomGenerator();
         g.setSeed(4312000053L);
-        MultiStartUnivariateRealOptimizer<UnivariateFunction> optimizer =
-            new MultiStartUnivariateRealOptimizer<UnivariateFunction>(underlying, 5,
g);
+        UnivariateMultiStartOptimizer<UnivariateFunction> optimizer =
+            new UnivariateMultiStartOptimizer<UnivariateFunction>(underlying, 5, g);
 
         UnivariateRealPointValuePair optimum
             = optimizer.optimize(300, f, GoalType.MINIMIZE, -0.3, -0.2);
@@ -86,8 +86,8 @@ public class MultiStartUnivariateRealOpt
         UnivariateRealOptimizer underlying = new BrentOptimizer(1e-9, 1e-14);
         JDKRandomGenerator g = new JDKRandomGenerator();
         g.setSeed(4312000053L);
-        MultiStartUnivariateRealOptimizer<UnivariateFunction> optimizer =
-            new MultiStartUnivariateRealOptimizer<UnivariateFunction>(underlying, 5,
g);
+        UnivariateMultiStartOptimizer<UnivariateFunction> optimizer =
+            new UnivariateMultiStartOptimizer<UnivariateFunction>(underlying, 5, g);
  
         try {
             optimizer.optimize(300, f, GoalType.MINIMIZE, -0.3, -0.2);



Mime
View raw message