Author: psteitz
Date: Sat Jan 15 19:47:29 2011
New Revision: 1059402
URL: http://svn.apache.org/viewvc?rev=1059402&view=rev
Log:
Moved new method from interface to impl, fixing compatability break.
Modified:
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java
Modified:
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java?rev=1059402&r1=1059401&r2=1059402&view=diff
==============================================================================
---
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java
(original)
+++
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java
Sat Jan 15 19:47:29 2011
@@ -87,27 +87,6 @@ public interface UnivariateRealSolver ex
* @param f the function to solve.
* @param min the lower bound for the interval.
* @param max the upper bound for the interval.
- * @param maxEval Maximum number of evaluations.
- * @return a value where the function is zero
- * @throws ConvergenceException if the maximum iteration count is exceeded
- * or the solver detects convergence problems otherwise.
- * @throws MathUserException if an error occurs evaluating the function
- * @throws IllegalArgumentException if min > max or the endpoints do not
- * satisfy the requirements specified by the solver
- * @since 2.2
- */
- double solve(int maxEval, UnivariateRealFunction f, double min, double max)
- throws ConvergenceException, MathUserException;
-
- /**
- * Solve for a zero root in the given interval.
- * <p>A solver may require that the interval brackets a single zero root.
- * Solvers that do require bracketing should be able to handle the case
- * where one of the endpoints is itself a root.</p>
- *
- * @param f the function to solve.
- * @param min the lower bound for the interval.
- * @param max the upper bound for the interval.
* @return a value where the function is zero
* @throws ConvergenceException if the maximum iteration count is exceeded
* or the solver detects convergence problems otherwise.
Modified:
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java?rev=1059402&r1=1059401&r2=1059402&view=diff
==============================================================================
---
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java
(original)
+++
commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java
Sat Jan 15 19:47:29 2011
@@ -136,7 +136,24 @@ public abstract class UnivariateRealSolv
functionValueAccuracy = defaultFunctionValueAccuracy;
}
- /** {@inheritDoc} */
+ /**
+ * Solve for a zero root in the given interval.
+ * <p>A solver may require that the interval brackets a single zero root.
+ * Solvers that do require bracketing should be able to handle the case
+ * where one of the endpoints is itself a root.</p>
+ *
+ * @param f the function to solve.
+ * @param min the lower bound for the interval.
+ * @param max the upper bound for the interval.
+ * @param maxEval Maximum number of evaluations.
+ * @return a value where the function is zero
+ * @throws ConvergenceException if the maximum iteration count is exceeded
+ * or the solver detects convergence problems otherwise.
+ * @throws MathUserException if an error occurs evaluating the function
+ * @throws IllegalArgumentException if min > max or the endpoints do not
+ * satisfy the requirements specified by the solver
+ * @since 2.2
+ */
public double solve(int maxEval, UnivariateRealFunction function, double
min, double max)
throws ConvergenceException, MathUserException {
throw
MathRuntimeException.createUnsupportedOperationException(LocalizedFormats.NOT_OVERRIDEN);
