Author: luc
Date: Fri Jul 1 11:39:28 2011
New Revision: 1141905
URL: http://svn.apache.org/viewvc?rev=1141905&view=rev
Log:
renamed BracketedSolution into BracketedUnivariateRealSolver and make it extend
UnivariateRealSolver.
This will allow specifying directly a sub-category of solvers when needed. It
will be used for example by the ODE events detection mechanism, as it will
ensure the integrator can automatically go past the event time.
JIRA: MATH-605
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java
- copied, changed from r1141849,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedSolution.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedSolution.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolutions.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseBracketedSecantSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolutions.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolutions.java?rev=1141905&r1=1141904&r2=1141905&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolutions.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolutions.java
Fri Jul 1 11:39:28 2011
@@ -33,7 +33,7 @@ package org.apache.commons.math.analysis
* may be necessary to guarantee that a solution is returned that does not
* under-approximate the solution.</p>
*
- * @see BracketedSolution
+ * @see BracketedUnivariateRealSolver
* @since 3.0
* @version $Id$
*/
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseBracketedSecantSolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseBracketedSecantSolver.java?rev=1141905&r1=1141904&r2=1141905&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseBracketedSecantSolver.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseBracketedSecantSolver.java
Fri Jul 1 11:39:28 2011
@@ -19,13 +19,13 @@ package org.apache.commons.math.analysis
/**
* Base class for <em>Secant</em> methods that guarantee convergence
- * by maintaining a {@link BracketedSolution bracketed solution}.
+ * by maintaining a {@link BracketedUnivariateRealSolver bracketed solution}.
*
* @since 3.0
* @version $Id$
*/
public class BaseBracketedSecantSolver extends BaseSecantSolver
- implements BracketedSolution {
+ implements BracketedUnivariateRealSolver {
/**
* Construct a solver with default accuracy (1e-6).
*
Copied:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java
(from r1141849,
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedSolution.java)
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedSolution.java&r1=1141849&r2=1141905&rev=1141905&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedSolution.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java
Fri Jul 1 11:39:28 2011
@@ -41,7 +41,7 @@ package org.apache.commons.math.analysis
* @since 3.0
* @version $Id$
*/
-public interface BracketedSolution {
+public interface BracketedUnivariateRealSolver extends UnivariateRealSolver {
/** Returns the kind of solutions that the root-finding algorithm may
* accept as solutions.
*
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java?rev=1141905&r1=1141904&r2=1141905&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java
Fri Jul 1 11:39:28 2011
@@ -22,7 +22,7 @@ package org.apache.commons.math.analysis
* root-finding (approximating a zero of a univariate real function). It is a
* modified {@link SecantSolver <em>Secant</em>} method. Unlike the
* <em>Secant</em> method, convergence is guaranteed by maintaining a
- * {@link BracketedSolution bracketed solution}.
+ * bracketed solution.
*
* <p>The <em>Regula Falsi</em> method assumes that the function is continuous,
* but not necessarily smooth.</p>
