svn commit: r779284 - in /commons/proper/math/trunk/src/java/org/apache/commons/math/optimization: MultivariateRealOptimizer.java direct/DirectSearchOptimizer.java

[luc]

Author: luc
Date: Wed May 27 19:47:27 2009
New Revision: 779284

URL: http://svn.apache.org/viewvc?rev=779284&view=rev
Log:
Added a way to retrieve the limited the number of functions evaluations in 
optimizers
(the limited number of iterations could already be retrieved)

Modified:
    
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
    
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java

Modified: 
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java?rev=779284&r1=779283&r2=779284&view=diff
==============================================================================
--- 
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
 (original)
+++ 
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
 Wed May 27 19:47:27 2009
@@ -37,16 +37,21 @@
      */
     void setMaxIterations(int maxIterations);
 
-    /** Set the maximal number of evaluations of the algorithm.
-     * @param maxEvaluations maximal number of function calls
-     */
-    void setMaxEvaluations(int maxEvaluations);
-
     /** Get the maximal number of iterations of the algorithm.
      * @return maximal number of iterations
      */
     int getMaxIterations();
 
+    /** Set the maximal number of functions evaluations.
+     * @param maxEvaluations maximal number of function evaluations
+     */
+    void setMaxEvaluations(int maxEvaluations);
+
+    /** Get the maximal number of functions evaluations.
+     * @return maximal number of functions evaluations
+     */
+    int getMaxEvaluations();
+
     /** Get the number of iterations realized by the algorithm.
      * <p>
      * The number of evaluations corresponds to the last call to the

Modified: 
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java?rev=779284&r1=779283&r2=779284&view=diff
==============================================================================
--- 
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
 (original)
+++ 
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
 Wed May 27 19:47:27 2009
@@ -227,13 +227,18 @@
     }
 
     /** {...@inheritdoc} */
+    public int getMaxIterations() {
+        return maxIterations;
+    }
+
+    /** {...@inheritdoc} */
     public void setMaxEvaluations(int maxEvaluations) {
         this.maxEvaluations = maxEvaluations;
     }
 
     /** {...@inheritdoc} */
-    public int getMaxIterations() {
-        return maxIterations;
+    public int getMaxEvaluations() {
+        return maxEvaluations;
     }
 
     /** {...@inheritdoc} */