You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2012/01/31 09:56:20 UTC
svn commit: r1238279 - in /commons/proper/math/trunk/src:
main/java/org/apache/commons/math/analysis/interpolation/
test/java/org/apache/commons/math/analysis/interpolation/
Author: erans
Date: Tue Jan 31 08:56:19 2012
New Revision: 1238279
URL: http://svn.apache.org/viewvc?rev=1238279&view=rev
Log:
MATH-707
Renamed classes in package "interpolation".
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java
- copied, changed from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateRealGridInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java
- copied, changed from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateRealInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java
- copied, changed from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateRealGridInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java
- copied, changed from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java
- copied, changed from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
- copied, changed from r1238060, commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateRealGridInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateRealInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateRealGridInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.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/MicrosphereInterpolator.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/interpolation/TricubicSplineInterpolator.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.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/MicrosphereInterpolatorTest.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/SmoothingPolynomialBicubicSplineInterpolatorTest.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/TricubicSplineInterpolatorTest.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java Tue Jan 31 08:56:19 2012
@@ -29,7 +29,7 @@ import org.apache.commons.math.util.Math
* @since 2.2
*/
public class BicubicSplineInterpolator
- implements BivariateRealGridInterpolator {
+ implements BivariateGridInterpolator {
/**
* {@inheritDoc}
*/
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java (from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateRealGridInterpolator.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateRealGridInterpolator.java&r1=1238060&r2=1238279&rev=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateRealGridInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java Tue Jan 31 08:56:19 2012
@@ -24,7 +24,7 @@ import org.apache.commons.math.analysis.
*
* @version $Id$
*/
-public interface BivariateRealGridInterpolator {
+public interface BivariateGridInterpolator {
/**
* Compute an interpolating function for the dataset.
*
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -34,7 +34,7 @@ import org.apache.commons.math.analysis.
* @since 1.2
*/
public class DividedDifferenceInterpolator
- implements UnivariateRealInterpolator, Serializable {
+ implements UnivariateInterpolator, Serializable {
/** serializable version identifier */
private static final long serialVersionUID = 107049519551235069L;
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -27,7 +27,7 @@ import org.apache.commons.math.util.Math
* Implements a linear function for interpolation of real univariate functions.
* @version $Id$
*/
-public class LinearInterpolator implements UnivariateRealInterpolator {
+public class LinearInterpolator implements UnivariateInterpolator {
/**
* Computes a linear interpolating function for the data set.
* @param x the arguments for the interpolation points
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -47,7 +47,7 @@ import org.apache.commons.math.util.Math
* @since 2.0
*/
public class LoessInterpolator
- implements UnivariateRealInterpolator, Serializable {
+ implements UnivariateInterpolator, Serializable {
/** Default value of the bandwidth parameter. */
public static final double DEFAULT_BANDWIDTH = 0.3;
/** Default value of the number of robustness iterations. */
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java Tue Jan 31 08:56:19 2012
@@ -30,7 +30,7 @@ import org.apache.commons.math.random.Un
* @version $Id$
*/
public class MicrosphereInterpolator
- implements MultivariateRealInterpolator {
+ implements MultivariateInterpolator {
/**
* Default number of surface elements that composes the microsphere.
*/
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java (from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateRealInterpolator.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateRealInterpolator.java&r1=1238060&r2=1238279&rev=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateRealInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java Tue Jan 31 08:56:19 2012
@@ -24,7 +24,7 @@ import org.apache.commons.math.analysis.
* @since 2.1
* @version $Id$
*/
-public interface MultivariateRealInterpolator {
+public interface MultivariateInterpolator {
/**
* Computes an interpolating function for the data set.
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -32,7 +32,7 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 1.2
*/
-public class NevilleInterpolator implements UnivariateRealInterpolator,
+public class NevilleInterpolator implements UnivariateInterpolator,
Serializable {
/** serializable version identifier */
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -50,7 +50,7 @@ import org.apache.commons.math.util.Math
* @version $Id$
*
*/
-public class SplineInterpolator implements UnivariateRealInterpolator {
+public class SplineInterpolator implements UnivariateInterpolator {
/**
* Computes an interpolating function for the data set.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java Tue Jan 31 08:56:19 2012
@@ -27,7 +27,7 @@ import org.apache.commons.math.util.Math
* @since 2.2
*/
public class TricubicSplineInterpolator
- implements TrivariateRealGridInterpolator {
+ implements TrivariateGridInterpolator {
/**
* {@inheritDoc}
*/
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java (from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateRealGridInterpolator.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateRealGridInterpolator.java&r1=1238060&r2=1238279&rev=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateRealGridInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java Tue Jan 31 08:56:19 2012
@@ -25,7 +25,7 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 2.2
*/
-public interface TrivariateRealGridInterpolator {
+public interface TrivariateGridInterpolator {
/**
* Compute an interpolating function for the dataset.
*
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java (from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java&r1=1238060&r2=1238279&rev=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java Tue Jan 31 08:56:19 2012
@@ -23,7 +23,7 @@ import org.apache.commons.math.analysis.
*
* @version $Id$
*/
-public interface UnivariateRealInterpolator {
+public interface UnivariateInterpolator {
/**
* Compute an interpolating function for the dataset.
*
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java (from r1238060, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java&r1=1238060&r2=1238279&rev=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java Tue Jan 31 08:56:19 2012
@@ -22,7 +22,7 @@ import org.apache.commons.math.util.Math
import org.apache.commons.math.exception.NumberIsTooSmallException;
/**
- * Adapter for classes implementing the {@link UnivariateRealInterpolator}
+ * Adapter for classes implementing the {@link UnivariateInterpolator}
* interface.
* The data to be interpolated is assumed to be periodic. Thus values that are
* outside of the range can be passed to the interpolation function: They will
@@ -31,12 +31,12 @@ import org.apache.commons.math.exception
*
* @version $Id$
*/
-public class UnivariateRealPeriodicInterpolator
- implements UnivariateRealInterpolator {
+public class UnivariatePeriodicInterpolator
+ implements UnivariateInterpolator {
/** Default number of extension points of the samples array. */
public static final int DEFAULT_EXTEND = 5;
/** Interpolator. */
- private final UnivariateRealInterpolator interpolator;
+ private final UnivariateInterpolator interpolator;
/** Period. */
private final double period;
/** Number of extension points. */
@@ -53,7 +53,7 @@ public class UnivariateRealPeriodicInter
* number of sample points which the original {@code interpolator} needs
* on each side of the interpolated point.
*/
- public UnivariateRealPeriodicInterpolator(UnivariateRealInterpolator interpolator,
+ public UnivariatePeriodicInterpolator(UnivariateInterpolator interpolator,
double period,
int extend) {
this.interpolator = interpolator;
@@ -69,7 +69,7 @@ public class UnivariateRealPeriodicInter
* @param interpolator Interpolator.
* @param period Period.
*/
- public UnivariateRealPeriodicInterpolator(UnivariateRealInterpolator interpolator,
+ public UnivariatePeriodicInterpolator(UnivariateInterpolator interpolator,
double period) {
this(interpolator, period, DEFAULT_EXTEND);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java Tue Jan 31 08:56:19 2012
@@ -37,7 +37,7 @@ public final class BicubicSplineInterpol
double[] yval = new double[] {-4, -3, -1, 2.5};
double[][] zval = new double[xval.length][yval.length];
- BivariateRealGridInterpolator interpolator = new BicubicSplineInterpolator();
+ BivariateGridInterpolator interpolator = new BicubicSplineInterpolator();
@SuppressWarnings("unused")
BivariateFunction p = interpolator.interpolate(xval, yval, zval);
@@ -87,7 +87,7 @@ public final class BicubicSplineInterpol
}
};
- BivariateRealGridInterpolator interpolator = new BicubicSplineInterpolator();
+ BivariateGridInterpolator interpolator = new BicubicSplineInterpolator();
double[] xval = new double[] {3, 4, 5, 6.5};
double[] yval = new double[] {-4, -3, -1, 2, 2.5};
@@ -134,7 +134,7 @@ public final class BicubicSplineInterpol
}
};
- BivariateRealGridInterpolator interpolator = new BicubicSplineInterpolator();
+ BivariateGridInterpolator interpolator = new BicubicSplineInterpolator();
double[] xval = new double[] {3, 4, 5, 6.5};
double[] yval = new double[] {-4, -3, -2, -1, 0.5, 2.5};
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -49,7 +49,7 @@ public final class DividedDifferenceInte
@Test
public void testSinFunction() {
UnivariateFunction f = new SinFunction();
- UnivariateRealInterpolator interpolator = new DividedDifferenceInterpolator();
+ UnivariateInterpolator interpolator = new DividedDifferenceInterpolator();
double x[], y[], z, expected, result, tolerance;
// 6 interpolating points on interval [0, 2*PI]
@@ -81,7 +81,7 @@ public final class DividedDifferenceInte
@Test
public void testExpm1Function() {
UnivariateFunction f = new Expm1Function();
- UnivariateRealInterpolator interpolator = new DividedDifferenceInterpolator();
+ UnivariateInterpolator interpolator = new DividedDifferenceInterpolator();
double x[], y[], z, expected, result, tolerance;
// 5 interpolating points on interval [-1, 1]
@@ -114,7 +114,7 @@ public final class DividedDifferenceInte
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealInterpolator interpolator = new DividedDifferenceInterpolator();
+ UnivariateInterpolator interpolator = new DividedDifferenceInterpolator();
try {
// bad abscissas array
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -45,7 +45,7 @@ public class LinearInterpolatorTest {
throws Exception {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 1.0 };
- UnivariateRealInterpolator i = new LinearInterpolator();
+ UnivariateInterpolator i = new LinearInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
@@ -67,7 +67,7 @@ public class LinearInterpolatorTest {
throws Exception {
double x[] = { 0.0, 0.5, 1.0, 1.5 };
double y[] = { 0.0, 0.5, 1.0, 1.5 };
- UnivariateRealInterpolator i = new LinearInterpolator();
+ UnivariateInterpolator i = new LinearInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
@@ -90,7 +90,7 @@ public class LinearInterpolatorTest {
public void testInterpolateLinear() throws Exception {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 0.0 };
- UnivariateRealInterpolator i = new LinearInterpolator();
+ UnivariateInterpolator i = new LinearInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
@@ -105,7 +105,7 @@ public class LinearInterpolatorTest {
@Test
public void testIllegalArguments() {
// Data set arrays of different size.
- UnivariateRealInterpolator i = new LinearInterpolator();
+ UnivariateInterpolator i = new LinearInterpolator();
try {
double xval[] = { 0.0, 1.0 };
double yval[] = { 0.0, 1.0, 2.0 };
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java Tue Jan 31 08:56:19 2012
@@ -43,7 +43,7 @@ public final class MicrosphereInterpolat
}
};
- MultivariateRealInterpolator interpolator = new MicrosphereInterpolator();
+ MultivariateInterpolator interpolator = new MicrosphereInterpolator();
// Interpolating points in [-1, 1][-1, 1] by steps of 1.
final int n = 9;
@@ -95,7 +95,7 @@ public final class MicrosphereInterpolat
}
};
- MultivariateRealInterpolator interpolator = new MicrosphereInterpolator();
+ MultivariateInterpolator interpolator = new MicrosphereInterpolator();
// Interpolating points in [-10, 10][-10, 10] by steps of 2.
final int n = 121;
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -49,7 +49,7 @@ public final class NevilleInterpolatorTe
@Test
public void testSinFunction() {
UnivariateFunction f = new SinFunction();
- UnivariateRealInterpolator interpolator = new NevilleInterpolator();
+ UnivariateInterpolator interpolator = new NevilleInterpolator();
double x[], y[], z, expected, result, tolerance;
// 6 interpolating points on interval [0, 2*PI]
@@ -81,7 +81,7 @@ public final class NevilleInterpolatorTe
@Test
public void testExpm1Function() {
UnivariateFunction f = new Expm1Function();
- UnivariateRealInterpolator interpolator = new NevilleInterpolator();
+ UnivariateInterpolator interpolator = new NevilleInterpolator();
double x[], y[], z, expected, result, tolerance;
// 5 interpolating points on interval [-1, 1]
@@ -114,7 +114,7 @@ public final class NevilleInterpolatorTe
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealInterpolator interpolator = new NevilleInterpolator();
+ UnivariateInterpolator interpolator = new NevilleInterpolator();
try {
// bad abscissas array
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java Tue Jan 31 08:56:19 2012
@@ -38,7 +38,7 @@ public final class SmoothingPolynomialBi
double[] yval = new double[] {-4, -3, -1, 2.5};
double[][] zval = new double[xval.length][yval.length];
- BivariateRealGridInterpolator interpolator = new SmoothingPolynomialBicubicSplineInterpolator(0);
+ BivariateGridInterpolator interpolator = new SmoothingPolynomialBicubicSplineInterpolator(0);
@SuppressWarnings("unused")
BivariateFunction p = interpolator.interpolate(xval, yval, zval);
@@ -96,7 +96,7 @@ public final class SmoothingPolynomialBi
}
};
- BivariateRealGridInterpolator interpolator = new SmoothingPolynomialBicubicSplineInterpolator(1);
+ BivariateGridInterpolator interpolator = new SmoothingPolynomialBicubicSplineInterpolator(1);
double[] xval = new double[] {3, 4, 5, 6.5};
double[] yval = new double[] {-4, -3, -1, 2, 2.5};
@@ -144,7 +144,7 @@ public final class SmoothingPolynomialBi
}
};
- BivariateRealGridInterpolator interpolator = new SmoothingPolynomialBicubicSplineInterpolator(4);
+ BivariateGridInterpolator interpolator = new SmoothingPolynomialBicubicSplineInterpolator(4);
double[] xval = new double[] {3, 4, 5, 6.5};
double[] yval = new double[] {-4, -3, -2, -1, 0.5, 2.5};
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=1238279&r1=1238278&r2=1238279&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 Tue Jan 31 08:56:19 2012
@@ -48,7 +48,7 @@ public class SplineInterpolatorTest {
throws Exception {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 1.0 };
- UnivariateRealInterpolator i = new SplineInterpolator();
+ UnivariateInterpolator i = new SplineInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
verifyConsistency((PolynomialSplineFunction) f, x);
@@ -71,7 +71,7 @@ public class SplineInterpolatorTest {
throws Exception {
double x[] = { 0.0, 0.5, 1.0, 1.5 };
double y[] = { 0.0, 0.5, 1.0, 1.5 };
- UnivariateRealInterpolator i = new SplineInterpolator();
+ UnivariateInterpolator i = new SplineInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
@@ -94,7 +94,7 @@ public class SplineInterpolatorTest {
public void testInterpolateLinear() throws Exception {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 0.0 };
- UnivariateRealInterpolator i = new SplineInterpolator();
+ UnivariateInterpolator i = new SplineInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
verifyConsistency((PolynomialSplineFunction) f, x);
@@ -121,7 +121,7 @@ public class SplineInterpolatorTest {
11d * FastMath.PI / 6d,
2.d * FastMath.PI };
double y[] = { 0d, 0.5d, 1d, 0.5d, 0d, -0.5d, -1d, -0.5d, 0d };
- UnivariateRealInterpolator i = new SplineInterpolator();
+ UnivariateInterpolator i = new SplineInterpolator();
UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
verifyConsistency((PolynomialSplineFunction) f, x);
@@ -161,7 +161,7 @@ public class SplineInterpolatorTest {
@Test
public void testIllegalArguments() {
// Data set arrays of different size.
- UnivariateRealInterpolator i = new SplineInterpolator();
+ UnivariateInterpolator i = new SplineInterpolator();
try {
double xval[] = { 0.0, 1.0 };
double yval[] = { 0.0, 1.0, 2.0 };
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java?rev=1238279&r1=1238278&r2=1238279&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java Tue Jan 31 08:56:19 2012
@@ -39,7 +39,7 @@ public final class TricubicSplineInterpo
double[] zval = new double[] {-12, -8, -5.5, -3, 0, 2.5};
double[][][] fval = new double[xval.length][yval.length][zval.length];
- TrivariateRealGridInterpolator interpolator = new TricubicSplineInterpolator();
+ TrivariateGridInterpolator interpolator = new TricubicSplineInterpolator();
@SuppressWarnings("unused")
TrivariateFunction p = interpolator.interpolate(xval, yval, zval, fval);
@@ -104,7 +104,7 @@ public final class TricubicSplineInterpo
}
};
- TrivariateRealGridInterpolator interpolator = new TricubicSplineInterpolator();
+ TrivariateGridInterpolator interpolator = new TricubicSplineInterpolator();
double[] xval = new double[] {3, 4, 5, 6.5};
double[] yval = new double[] {-4, -3, -1, 2, 2.5};
@@ -179,7 +179,7 @@ public final class TricubicSplineInterpo
}
}
- TrivariateRealGridInterpolator interpolator = new TricubicSplineInterpolator();
+ TrivariateGridInterpolator interpolator = new TricubicSplineInterpolator();
TrivariateFunction p = interpolator.interpolate(xval, yval, zval, fval);
double x, y, z;
Copied: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java (from r1238060, 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/UnivariatePeriodicInterpolatorTest.java?p2=commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java&p1=commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java&r1=1238060&r2=1238279&rev=1238279&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/UnivariatePeriodicInterpolatorTest.java Tue Jan 31 08:56:19 2012
@@ -27,9 +27,9 @@ import org.junit.Test;
/**
- * Test for {@link UnivariateRealPeriodicInterpolator}.
+ * Test for {@link UnivariatePeriodicInterpolator}.
*/
-public class UnivariateRealPeriodicInterpolatorTest {
+public class UnivariatePeriodicInterpolatorTest {
private final Random rng = new Random(1224465L);
@Test
@@ -47,11 +47,11 @@ public class UnivariateRealPeriodicInter
yval[i] = FastMath.sin(xval[i]);
}
- final UnivariateRealInterpolator inter = new LinearInterpolator();
+ final UnivariateInterpolator inter = new LinearInterpolator();
final UnivariateFunction f = inter.interpolate(xval, yval);
- final UnivariateRealInterpolator interP
- = new UnivariateRealPeriodicInterpolator(new LinearInterpolator(),
+ final UnivariateInterpolator interP
+ = new UnivariatePeriodicInterpolator(new LinearInterpolator(),
period, 1);
final UnivariateFunction fP = interP.interpolate(xval, yval);
@@ -92,8 +92,8 @@ public class UnivariateRealPeriodicInter
yval[i] = FastMath.sin(xval[i]);
}
- final UnivariateRealInterpolator interP
- = new UnivariateRealPeriodicInterpolator(new LinearInterpolator(),
+ final UnivariateInterpolator interP
+ = new UnivariatePeriodicInterpolator(new LinearInterpolator(),
period, 1);
final UnivariateFunction fP = interP.interpolate(xval, yval);
@@ -123,8 +123,8 @@ public class UnivariateRealPeriodicInter
yval[i] = FastMath.sin(xval[i]);
}
- final UnivariateRealInterpolator interP
- = new UnivariateRealPeriodicInterpolator(new LinearInterpolator(),
+ final UnivariateInterpolator interP
+ = new UnivariatePeriodicInterpolator(new LinearInterpolator(),
period, 1);
final UnivariateFunction fP = interP.interpolate(xval, yval);
@@ -145,8 +145,8 @@ public class UnivariateRealPeriodicInter
final double[] yval = { 1, 6, 5 };
final double period = 10;
- final UnivariateRealInterpolator interpolator
- = new UnivariateRealPeriodicInterpolator(new LinearInterpolator(), period);
+ final UnivariateInterpolator interpolator
+ = new UnivariatePeriodicInterpolator(new LinearInterpolator(), period);
interpolator.interpolate(xval, yval);
}
@@ -156,8 +156,8 @@ public class UnivariateRealPeriodicInter
final double[] yval = { 1, 6, 5, -1, -2 };
final double period = 10;
- final UnivariateRealInterpolator interpolator
- = new UnivariateRealPeriodicInterpolator(new LinearInterpolator(), period);
+ final UnivariateInterpolator interpolator
+ = new UnivariatePeriodicInterpolator(new LinearInterpolator(), period);
interpolator.interpolate(xval, yval);
}
}