Added a way to retrieve the limited the number of functions evaluations in optimizers

(the limited number of iterations could already be retrieved)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@779284 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java

@@ -37,16 +37,21 @@ public interface MultivariateRealOptimizer {
      */
     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

src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java

@@ -226,14 +226,19 @@ public abstract class DirectSearchOptimizer implements MultivariateRealOptimizer
         this.maxIterations = maxIterations;
     }
 
+    /** {@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} */