commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1083167 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/ContinuedFraction.java
Date Sat, 19 Mar 2011 12:04:31 GMT
Author: erans
Date: Sat Mar 19 12:04:31 2011
New Revision: 1083167

URL: http://svn.apache.org/viewvc?rev=1083167&view=rev
Log:
MATH-487
Removed checked exceptions.

Modified:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/ContinuedFraction.java

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/ContinuedFraction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/ContinuedFraction.java?rev=1083167&r1=1083166&r2=1083167&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/ContinuedFraction.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/ContinuedFraction.java
Sat Mar 19 12:04:31 2011
@@ -16,8 +16,7 @@
  */
 package org.apache.commons.math.util;
 
-import org.apache.commons.math.ConvergenceException;
-import org.apache.commons.math.MathException;
+import org.apache.commons.math.exception.ConvergenceException;
 import org.apache.commons.math.exception.MaxCountExceededException;
 import org.apache.commons.math.exception.util.LocalizedFormats;
 
@@ -36,7 +35,6 @@ import org.apache.commons.math.exception
  * @version $Revision$ $Date$
  */
 public abstract class ContinuedFraction {
-
     /** Maximum allowed numerical error. */
     private static final double DEFAULT_EPSILON = 10e-9;
 
@@ -69,9 +67,9 @@ public abstract class ContinuedFraction 
      * Evaluates the continued fraction at the value x.
      * @param x the evaluation point.
      * @return the value of the continued fraction evaluated at x.
-     * @throws MathException if the algorithm fails to converge.
+     * @throws ConvergenceException if the algorithm fails to converge.
      */
-    public double evaluate(double x) throws MathException {
+    public double evaluate(double x) {
         return evaluate(x, DEFAULT_EPSILON, Integer.MAX_VALUE);
     }
 
@@ -80,9 +78,9 @@ public abstract class ContinuedFraction 
      * @param x the evaluation point.
      * @param epsilon maximum error allowed.
      * @return the value of the continued fraction evaluated at x.
-     * @throws MathException if the algorithm fails to converge.
+     * @throws ConvergenceException if the algorithm fails to converge.
      */
-    public double evaluate(double x, double epsilon) throws MathException {
+    public double evaluate(double x, double epsilon) {
         return evaluate(x, epsilon, Integer.MAX_VALUE);
     }
 
@@ -91,9 +89,9 @@ public abstract class ContinuedFraction 
      * @param x the evaluation point.
      * @param maxIterations maximum number of convergents
      * @return the value of the continued fraction evaluated at x.
-     * @throws MathException if the algorithm fails to converge.
+     * @throws ConvergenceException if the algorithm fails to converge.
      */
-    public double evaluate(double x, int maxIterations) throws MathException {
+    public double evaluate(double x, int maxIterations) {
         return evaluate(x, DEFAULT_EPSILON, maxIterations);
     }
 
@@ -121,11 +119,9 @@ public abstract class ContinuedFraction 
      * @param epsilon maximum error allowed.
      * @param maxIterations maximum number of convergents
      * @return the value of the continued fraction evaluated at x.
-     * @throws MathException if the algorithm fails to converge.
+     * @throws ConvergenceException if the algorithm fails to converge.
      */
-    public double evaluate(double x, double epsilon, int maxIterations)
-        throws MathException
-    {
+    public double evaluate(double x, double epsilon, int maxIterations) {
         double p0 = 1.0;
         double p1 = getA(0, x);
         double q0 = 0.0;
@@ -151,9 +147,8 @@ public abstract class ContinuedFraction 
                 final int maxPower = 5;
                 final double scale = FastMath.max(a,b);
                 if (scale <= 0) {  // Can't scale
-                    throw new ConvergenceException(
-                            LocalizedFormats.CONTINUED_FRACTION_INFINITY_DIVERGENCE,
-                             x);
+                    throw new ConvergenceException(LocalizedFormats.CONTINUED_FRACTION_INFINITY_DIVERGENCE,
+                                                   x);
                 }
                 infinite = true;
                 for (int i = 0; i < maxPower; i++) {
@@ -175,17 +170,15 @@ public abstract class ContinuedFraction 
 
             if (infinite) {
                // Scaling failed
-               throw new ConvergenceException(
-                 LocalizedFormats.CONTINUED_FRACTION_INFINITY_DIVERGENCE,
-                  x);
+               throw new ConvergenceException(LocalizedFormats.CONTINUED_FRACTION_INFINITY_DIVERGENCE,
+                                              x);
             }
 
             double r = p2 / q2;
 
             if (Double.isNaN(r)) {
-                throw new ConvergenceException(
-                  LocalizedFormats.CONTINUED_FRACTION_NAN_DIVERGENCE,
-                  x);
+                throw new ConvergenceException(LocalizedFormats.CONTINUED_FRACTION_NAN_DIVERGENCE,
+                                               x);
             }
             relativeError = FastMath.abs(r / c - 1.0);
 
@@ -199,7 +192,7 @@ public abstract class ContinuedFraction 
 
         if (n >= maxIterations) {
             throw new MaxCountExceededException(LocalizedFormats.NON_CONVERGENT_CONTINUED_FRACTION,
-                    maxIterations, x);
+                                                maxIterations, x);
         }
 
         return c;



Mime
View raw message