Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 28630 invoked from network); 15 Jan 2011 19:48:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jan 2011 19:48:00 -0000 Received: (qmail 43831 invoked by uid 500); 15 Jan 2011 19:48:00 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 43772 invoked by uid 500); 15 Jan 2011 19:47:59 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 43765 invoked by uid 99); 15 Jan 2011 19:47:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jan 2011 19:47:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jan 2011 19:47:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 316D323889FD; Sat, 15 Jan 2011 19:47:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1059402 - in /commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/solvers: UnivariateRealSolver.java UnivariateRealSolverImpl.java Date: Sat, 15 Jan 2011 19:47:30 -0000 To: commits@commons.apache.org From: psteitz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110115194730.316D323889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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. - *

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.

- * - * @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. + *

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.

+ * + * @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);