commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1174731 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/analysis/function/ main/java/org/apache/commons/math/analysis/interpolation/ main/java/org/apache/commons/math/analysis/polynomials/ main/java/org/apache/common...
Date Fri, 23 Sep 2011 13:08:59 GMT
Author: erans
Date: Fri Sep 23 13:08:58 2011
New Revision: 1174731

URL: http://svn.apache.org/viewvc?rev=1174731&view=rev
Log:
Name change: "NonMonotonousSequenceException" to "NonMonotonicSequenceException".

Added:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java
      - copied, changed from r1174674, commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java
      - copied, changed from r1174674, commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonousSequenceExceptionTest.java
Removed:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonousSequenceExceptionTest.java
Modified:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/MathUtilsTest.java

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java
Fri Sep 23 13:08:58 2011
@@ -43,7 +43,7 @@ public class StepFunction implements Uni
      *
      * @param x Abscissae.
      * @param y Ordinates.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if the {@code x} array is not sorted in strictly increasing order.
      * @throws NullArgumentException if {@code x} or {@code y} are {@code null}.
      * @throws NoDataException if {@code x} or {@code y} are zero-length.

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java
Fri Sep 23 13:08:58 2011
@@ -84,7 +84,7 @@ public class BicubicSplineInterpolatingF
      * every grid point.
      * @throws DimensionMismatchException if the various arrays do not contain
      * the expected number of elements.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} or {@code y} are not strictly increasing.
      * @throws NoDataException if any of the arrays has zero length.
      */

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java
Fri Sep 23 13:08:58 2011
@@ -48,7 +48,7 @@ public class DividedDifferenceInterpolat
      * if the array lengths are different.
      * @throws org.apache.commons.math.exception.NumberIsTooSmallException
      * if the number of points is less than 2.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strictly increasing order.
      */
     public PolynomialFunctionNewtonForm interpolate(double x[], double y[]) {
@@ -91,7 +91,7 @@ public class DividedDifferenceInterpolat
      * if the array lengths are different.
      * @throws org.apache.commons.math.exception.NumberIsTooSmallException
      * if the number of points is less than 2.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strictly increasing order.
      */
     protected static double[] computeDividedDifference(final double x[], final double y[])
{

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java
Fri Sep 23 13:08:58 2011
@@ -35,7 +35,7 @@ public class LinearInterpolator implemen
      * @return a function which interpolates the data set
      * @throws DimensionMismatchException if {@code x} and {@code y}
      * have different sizes.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strict increasing order.
      * @throws NumberIsTooSmallException if the size of {@code x} is smaller
      * than 2.

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java
Fri Sep 23 13:08:58 2011
@@ -165,7 +165,7 @@ public class LoessInterpolator
      * @param xval the arguments for the interpolation points
      * @param yval the values for the interpolation points
      * @return A cubic spline built upon a loess fit to the data at the original abscissae
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code xval} not sorted in strictly increasing order.
      * @throws DimensionMismatchException if {@code xval} and {@code yval} have
      * different sizes.
@@ -188,7 +188,7 @@ public class LoessInterpolator
      * @param weights point weights: coefficients by which the robustness weight
      * of a point is multiplied.
      * @return the values of the loess fit at corresponding original abscissae.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code xval} not sorted in strictly increasing order.
      * @throws DimensionMismatchException if {@code xval} and {@code yval} have
      * different sizes.
@@ -352,7 +352,7 @@ public class LoessInterpolator
      * @param xval the arguments for the interpolation points
      * @param yval the values for the interpolation points
      * @return values of the loess fit at corresponding original abscissae
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code xval} not sorted in strictly increasing order.
      * @throws DimensionMismatchException if {@code xval} and {@code yval} have
      * different sizes.

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java
Fri Sep 23 13:08:58 2011
@@ -48,7 +48,7 @@ public class NevilleInterpolator impleme
      * the array lengths are different.
      * @throws org.apache.commons.math.exception.NumberIsTooSmallException if
      * the number of points is less than 2.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if two abscissae have the same value.
      */
     public PolynomialFunctionLagrangeForm interpolate(double x[], double y[]) {

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java
Fri Sep 23 13:08:58 2011
@@ -59,7 +59,7 @@ public class SplineInterpolator implemen
      * @return a function which interpolates the data set
      * @throws DimensionMismatchException if {@code x} and {@code y}
      * have different sizes.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strict increasing order.
      * @throws NumberIsTooSmallException if the size of {@code x} is smaller
      * than 3.

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
Fri Sep 23 13:08:58 2011
@@ -65,7 +65,7 @@ public class PolynomialFunctionLagrangeF
      * @param y function values at interpolating points
      * @throws DimensionMismatchException if the array lengths are different.
      * @throws NumberIsTooSmallException if the number of points is less than 2.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if two abscissae have the same value.
      */
     public PolynomialFunctionLagrangeForm(double x[], double y[]) {
@@ -89,7 +89,7 @@ public class PolynomialFunctionLagrangeF
      * @return the function value.
      * @throws DimensionMismatchException if {@code x} and {@code y} have
      * different lengths.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strictly increasing order.
      * @throws NumberIsTooSmallException if the size of {@code x} is less
      * than 2.
@@ -163,7 +163,7 @@ public class PolynomialFunctionLagrangeF
      * @return the function value.
      * @throws DimensionMismatchException if {@code x} and {@code y} have
      * different lengths.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strictly increasing order.
      * @throws NumberIsTooSmallException if the size of {@code x} is less
      * than 2.
@@ -196,7 +196,7 @@ public class PolynomialFunctionLagrangeF
      * @return the function value.
      * @throws DimensionMismatchException if {@code x} and {@code y} have
      * different lengths.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strictly increasing order.
      * @throws NumberIsTooSmallException if the size of {@code x} is less
      * than 2.
@@ -302,7 +302,7 @@ public class PolynomialFunctionLagrangeF
      * @param abort Whether to throw an exception if {@code x} is not sorted.
      * @throws DimensionMismatchException if the array lengths are different.
      * @throws NumberIsTooSmallException if the number of points is less than 2.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
      * if {@code x} is not sorted in strictly increasing order and {@code abort}
      * is {@code true}.
      * @return {@code false} if the {@code x} is not sorted in increasing order,

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
Fri Sep 23 13:08:58 2011
@@ -93,7 +93,7 @@ public class PolynomialSplineFunction im
      * @throws NullArgumentException if either of the input arrays is {@code null}.
      * @throws NumberIsTooSmallException if knots has length less than 2.
      * @throws DimensionMismatchException if {@code polynomials.length != knots.length -
1}.
-     * @throws org.apache.commons.math.exception.NonMonotonousSequenceException if
+     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException if
      * the {@code knots} array is not strictly increasing.
      *
      */

Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java
(from r1174674, commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java&r1=1174674&r2=1174731&rev=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java
Fri Sep 23 13:08:58 2011
@@ -20,13 +20,13 @@ import org.apache.commons.math.util.Math
 import org.apache.commons.math.exception.util.LocalizedFormats;
 
 /**
- * Exception to be thrown when the a sequence of values is not monotonously
+ * Exception to be thrown when the a sequence of values is not monotonically
  * increasing or decreasing.
  *
- * @since 2.2
+ * @since 2.2 (name changed to "NonMonotonicSequenceException" in 3.0)
  * @version $Id$
  */
-public class NonMonotonousSequenceException extends MathIllegalNumberException {
+public class NonMonotonicSequenceException extends MathIllegalNumberException {
     /** Serializable version Id. */
     private static final long serialVersionUID = 3596849179428944575L;
     /**
@@ -55,9 +55,9 @@ public class NonMonotonousSequenceExcept
      * @param previous Previous value in the sequence.
      * @param index Index of the value that did not match the requirements.
      */
-    public NonMonotonousSequenceException(Number wrong,
-                                          Number previous,
-                                          int index) {
+    public NonMonotonicSequenceException(Number wrong,
+                                         Number previous,
+                                         int index) {
         this(wrong, previous, index, MathUtils.OrderDirection.INCREASING, true);
     }
 
@@ -72,11 +72,11 @@ public class NonMonotonousSequenceExcept
      * @param strict Whether the sequence must be strictly increasing or
      * decreasing.
      */
-    public NonMonotonousSequenceException(Number wrong,
-                                          Number previous,
-                                          int index,
-                                          MathUtils.OrderDirection direction,
-                                          boolean strict) {
+    public NonMonotonicSequenceException(Number wrong,
+                                         Number previous,
+                                         int index,
+                                         MathUtils.OrderDirection direction,
+                                         boolean strict) {
         super(direction == MathUtils.OrderDirection.INCREASING ?
               (strict ?
                LocalizedFormats.NOT_STRICTLY_INCREASING_SEQUENCE :
@@ -99,7 +99,7 @@ public class NonMonotonousSequenceExcept
         return direction;
     }
     /**
-     * @return {@code true} is the sequence should be strictly monotonous.
+     * @return {@code true} is the sequence should be strictly monotonic.
      **/
     public boolean getStrict() {
         return strict;

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java Fri
Sep 23 13:08:58 2011
@@ -29,7 +29,7 @@ import org.apache.commons.math.exception
 import org.apache.commons.math.exception.MathArithmeticException;
 import org.apache.commons.math.exception.MathIllegalArgumentException;
 import org.apache.commons.math.exception.MathInternalError;
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.exception.NotFiniteNumberException;
 import org.apache.commons.math.exception.NotPositiveException;
 import org.apache.commons.math.exception.NullArgumentException;
@@ -2056,7 +2056,7 @@ public final class MathUtils {
      * @param strict Whether the order should be strict.
      * @param abort Whether to throw an exception if the check fails.
      * @return {@code true} if the array is sorted.
-     * @throws NonMonotonousSequenceException if the array is not sorted
+     * @throws NonMonotonicSequenceException if the array is not sorted
      * and {@code abort} is {@code true}.
      */
     public static boolean checkOrder(double[] val, OrderDirection dir,
@@ -2104,7 +2104,7 @@ public final class MathUtils {
 
         // Loop early exit means wrong ordering.
         if (abort) {
-            throw new NonMonotonousSequenceException(val[index], previous, index, dir, strict);
+            throw new NonMonotonicSequenceException(val[index], previous, index, dir, strict);
         } else {
             return false;
         }
@@ -2116,7 +2116,7 @@ public final class MathUtils {
      * @param val Values.
      * @param dir Ordering direction.
      * @param strict Whether the order should be strict.
-     * @throws NonMonotonousSequenceException if the array is not sorted.
+     * @throws NonMonotonicSequenceException if the array is not sorted.
      * @since 2.2
      */
     public static void checkOrder(double[] val, OrderDirection dir,
@@ -2128,7 +2128,7 @@ public final class MathUtils {
      * Check that the given array is sorted in strictly increasing order.
      *
      * @param val Values.
-     * @throws NonMonotonousSequenceException if the array is not sorted.
+     * @throws NonMonotonicSequenceException if the array is not sorted.
      * @since 2.2
      */
     public static void checkOrder(double[] val) {

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
Fri Sep 23 13:08:58 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
 
 import org.apache.commons.math.analysis.UnivariateRealFunction;
 import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.exception.NullArgumentException;
 import org.apache.commons.math.exception.NoDataException;
 
@@ -57,7 +57,7 @@ public class StepFunctionTest {
         new StepFunction(new double[] {0, 1}, new double[] {0, -1, -2});
     }
 
-    @Test(expected=NonMonotonousSequenceException.class)
+    @Test(expected=NonMonotonicSequenceException.class)
     public void testPreconditions6() {
         new StepFunction(new double[] {1, 0, 1}, new double[] {0, -1, -2});
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
Fri Sep 23 13:08:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.analysis.Expm1Function;
 import org.apache.commons.math.analysis.SinFunction;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
@@ -122,8 +122,8 @@ public final class DividedDifferenceInte
             double y[] = { 0.0, 4.0, 4.0, 2.5 };
             UnivariateRealFunction p = interpolator.interpolate(x, y);
             p.value(0.0);
-            Assert.fail("Expecting NonMonotonousSequenceException - bad abscissas array");
-        } catch (NonMonotonousSequenceException ex) {
+            Assert.fail("Expecting NonMonotonicSequenceException - bad abscissas array");
+        } catch (NonMonotonicSequenceException ex) {
             // expected
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
Fri Sep 23 13:08:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.exception.DimensionMismatchException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
 import org.apache.commons.math.TestUtils;
@@ -120,7 +120,7 @@ public class LinearInterpolatorTest {
             double yval[] = { 0.0, 1.0, 2.0 };
             i.interpolate(xval, yval);
             Assert.fail("Failed to detect unsorted arguments.");
-        } catch (NonMonotonousSequenceException iae) {
+        } catch (NonMonotonicSequenceException iae) {
             // Expected.
         }
         // Not enough data to interpolate.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java
Fri Sep 23 13:08:58 2011
@@ -20,7 +20,7 @@ import org.apache.commons.math.util.Fast
 import org.apache.commons.math.exception.OutOfRangeException;
 import org.apache.commons.math.exception.DimensionMismatchException;
 import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.exception.NotFiniteNumberException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
 
@@ -169,12 +169,12 @@ public class LoessInterpolatorTest {
         new LoessInterpolator().smooth(new double[] {}, new double[] {});
     }
 
-    @Test(expected=NonMonotonousSequenceException.class)
+    @Test(expected=NonMonotonicSequenceException.class)
     public void testNonStrictlyIncreasing1() {
         new LoessInterpolator().smooth(new double[] {4,3,1,2}, new double[] {3,4,5,6});
     }
 
-    @Test(expected=NonMonotonousSequenceException.class)
+    @Test(expected=NonMonotonicSequenceException.class)
     public void testNonStrictlyIncreasing2() {
         new LoessInterpolator().smooth(new double[] {1,2,2,3}, new double[] {3,4,5,6});
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
Fri Sep 23 13:08:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.analysis.Expm1Function;
 import org.apache.commons.math.analysis.SinFunction;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
@@ -122,8 +122,8 @@ public final class NevilleInterpolatorTe
             double y[] = { 0.0, 4.0, 4.0, 2.5 };
             UnivariateRealFunction p = interpolator.interpolate(x, y);
             p.value(0.0);
-            Assert.fail("Expecting NonMonotonousSequenceException - bad abscissas array");
-        } catch (NonMonotonousSequenceException ex) {
+            Assert.fail("Expecting NonMonotonicSequenceException - bad abscissas array");
+        } catch (NonMonotonicSequenceException ex) {
             // expected
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
Fri Sep 23 13:08:58 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.math.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.exception.DimensionMismatchException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
 import org.apache.commons.math.util.FastMath;
@@ -176,7 +176,7 @@ public class SplineInterpolatorTest {
             double yval[] = { 0.0, 1.0, 2.0 };
             i.interpolate(xval, yval);
             Assert.fail("Failed to detect unsorted arguments.");
-        } catch (NonMonotonousSequenceException iae) {
+        } catch (NonMonotonicSequenceException iae) {
             // Expected.
         }
         // Not enough data to interpolate.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
Fri Sep 23 13:08:58 2011
@@ -20,7 +20,7 @@ import java.util.Random;
 import org.apache.commons.math.analysis.UnivariateRealFunction;
 import org.apache.commons.math.util.FastMath;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -150,7 +150,7 @@ public class UnivariateRealPeriodicInter
         interpolator.interpolate(xval, yval);
     }
 
-    @Test(expected=NonMonotonousSequenceException.class)
+    @Test(expected=NonMonotonicSequenceException.class)
     public void testUnsortedSamples() {
         final double[] xval = { 2, 3, 7, 4, 6 };
         final double[] yval = { 1, 6, 5, -1, -2 };

Copied: commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java
(from r1174674, commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonousSequenceExceptionTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java?p2=commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java&p1=commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonousSequenceExceptionTest.java&r1=1174674&r2=1174731&rev=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonousSequenceExceptionTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java
Fri Sep 23 13:08:58 2011
@@ -22,22 +22,22 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * Test for {@link NonMonotonousSequenceException}.
+ * Test for {@link NonMonotonicSequenceException}.
  * 
  * @version $Id$
  */
-public class NonMonotonousSequenceExceptionTest {
+public class NonMonotonicSequenceExceptionTest {
     @Test
     public void testAccessors() {
-        NonMonotonousSequenceException e
-            = new NonMonotonousSequenceException(0, -1, 1, MathUtils.OrderDirection.DECREASING,
false);
+        NonMonotonicSequenceException e
+            = new NonMonotonicSequenceException(0, -1, 1, MathUtils.OrderDirection.DECREASING,
false);
         Assert.assertEquals(0, e.getArgument());
         Assert.assertEquals(-1, e.getPrevious());
         Assert.assertEquals(1, e.getIndex());
         Assert.assertTrue(e.getDirection() == MathUtils.OrderDirection.DECREASING);
         Assert.assertFalse(e.getStrict());
 
-        e = new NonMonotonousSequenceException(-1, 0, 1);
+        e = new NonMonotonicSequenceException(-1, 0, 1);
         Assert.assertEquals(-1, e.getArgument());
         Assert.assertEquals(0, e.getPrevious());
         Assert.assertEquals(1, e.getIndex());

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/MathUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/MathUtilsTest.java?rev=1174731&r1=1174730&r2=1174731&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/MathUtilsTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/util/MathUtilsTest.java
Fri Sep 23 13:08:58 2011
@@ -22,7 +22,7 @@ import java.util.Map;
 
 
 import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.NonMonotonousSequenceException;
+import org.apache.commons.math.exception.NonMonotonicSequenceException;
 import org.apache.commons.math.exception.MathIllegalArgumentException;
 import org.apache.commons.math.exception.MathArithmeticException;
 import org.apache.commons.math.exception.NotFiniteNumberException;
@@ -1624,28 +1624,28 @@ public final class MathUtilsTest {
             MathUtils.checkOrder(new double[] {-15, -5.5, -1, -1, 2, 15},
                                  MathUtils.OrderDirection.INCREASING, true);
             Assert.fail("an exception should have been thrown");
-        } catch (NonMonotonousSequenceException e) {
+        } catch (NonMonotonicSequenceException e) {
             // Expected
         }
         try {
             MathUtils.checkOrder(new double[] {-15, -5.5, -1, -2, 2},
                                  MathUtils.OrderDirection.INCREASING, false);
             Assert.fail("an exception should have been thrown");
-        } catch (NonMonotonousSequenceException e) {
+        } catch (NonMonotonicSequenceException e) {
             // Expected
         }
         try {
             MathUtils.checkOrder(new double[] {3, 3, -5.5, -11, -27.5},
                                  MathUtils.OrderDirection.DECREASING, true);
             Assert.fail("an exception should have been thrown");
-        } catch (NonMonotonousSequenceException e) {
+        } catch (NonMonotonicSequenceException e) {
             // Expected
         }
         try {
             MathUtils.checkOrder(new double[] {3, -1, 0, -5.5, -11, -27.5},
                                  MathUtils.OrderDirection.DECREASING, false);
             Assert.fail("an exception should have been thrown");
-        } catch (NonMonotonousSequenceException e) {
+        } catch (NonMonotonicSequenceException e) {
             // Expected
         }
     }



Mime
View raw message