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 2011/11/27 23:19:09 UTC
svn commit: r1206867 [3/4] - in /commons/proper/math/trunk/src:
main/java/org/apache/commons/math/analysis/
main/java/org/apache/commons/math/analysis/function/
main/java/org/apache/commons/math/analysis/integration/
main/java/org/apache/commons/math/a...
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.function.Identity;
import org.apache.commons.math.analysis.function.Constant;
import org.apache.commons.math.analysis.function.Minus;
@@ -48,44 +48,44 @@ public class FunctionUtilsTest {
@Test
public void testCompose() {
- UnivariateRealFunction id = new Identity();
+ UnivariateFunction id = new Identity();
Assert.assertEquals(3, FunctionUtils.compose(id, id, id).value(3), EPS);
- UnivariateRealFunction c = new Constant(4);
+ UnivariateFunction c = new Constant(4);
Assert.assertEquals(4, FunctionUtils.compose(id, c).value(3), EPS);
Assert.assertEquals(4, FunctionUtils.compose(c, id).value(3), EPS);
- UnivariateRealFunction m = new Minus();
+ UnivariateFunction m = new Minus();
Assert.assertEquals(-3, FunctionUtils.compose(m).value(3), EPS);
Assert.assertEquals(3, FunctionUtils.compose(m, m).value(3), EPS);
- UnivariateRealFunction inv = new Inverse();
+ UnivariateFunction inv = new Inverse();
Assert.assertEquals(-0.25, FunctionUtils.compose(inv, m, c, id).value(3), EPS);
- UnivariateRealFunction pow = new Power(2);
+ UnivariateFunction pow = new Power(2);
Assert.assertEquals(81, FunctionUtils.compose(pow, pow).value(3), EPS);
}
@Test
public void testComposeDifferentiable() {
- DifferentiableUnivariateRealFunction id = new Identity();
+ DifferentiableUnivariateFunction id = new Identity();
Assert.assertEquals(1, FunctionUtils.compose(id, id, id).derivative().value(3), EPS);
- DifferentiableUnivariateRealFunction c = new Constant(4);
+ DifferentiableUnivariateFunction c = new Constant(4);
Assert.assertEquals(0, FunctionUtils.compose(id, c).derivative().value(3), EPS);
Assert.assertEquals(0, FunctionUtils.compose(c, id).derivative().value(3), EPS);
- DifferentiableUnivariateRealFunction m = new Minus();
+ DifferentiableUnivariateFunction m = new Minus();
Assert.assertEquals(-1, FunctionUtils.compose(m).derivative().value(3), EPS);
Assert.assertEquals(1, FunctionUtils.compose(m, m).derivative().value(3), EPS);
- DifferentiableUnivariateRealFunction inv = new Inverse();
+ DifferentiableUnivariateFunction inv = new Inverse();
Assert.assertEquals(0.25, FunctionUtils.compose(inv, m, id).derivative().value(2), EPS);
- DifferentiableUnivariateRealFunction pow = new Power(2);
+ DifferentiableUnivariateFunction pow = new Power(2);
Assert.assertEquals(108, FunctionUtils.compose(pow, pow).derivative().value(3), EPS);
- DifferentiableUnivariateRealFunction log = new Log();
+ DifferentiableUnivariateFunction log = new Log();
double a = 9876.54321;
Assert.assertEquals(pow.derivative().value(a) / pow.value(a),
FunctionUtils.compose(log, pow).derivative().value(a), EPS);
@@ -93,10 +93,10 @@ public class FunctionUtilsTest {
@Test
public void testAdd() {
- UnivariateRealFunction id = new Identity();
- UnivariateRealFunction c = new Constant(4);
- UnivariateRealFunction m = new Minus();
- UnivariateRealFunction inv = new Inverse();
+ UnivariateFunction id = new Identity();
+ UnivariateFunction c = new Constant(4);
+ UnivariateFunction m = new Minus();
+ UnivariateFunction inv = new Inverse();
Assert.assertEquals(4.5, FunctionUtils.add(inv, m, c, id).value(2), EPS);
Assert.assertEquals(4 + 2, FunctionUtils.add(c, id).value(2), EPS);
@@ -105,10 +105,10 @@ public class FunctionUtilsTest {
@Test
public void testAddDifferentiable() {
- DifferentiableUnivariateRealFunction sin = new Sin();
- DifferentiableUnivariateRealFunction c = new Constant(4);
- DifferentiableUnivariateRealFunction m = new Minus();
- DifferentiableUnivariateRealFunction inv = new Inverse();
+ DifferentiableUnivariateFunction sin = new Sin();
+ DifferentiableUnivariateFunction c = new Constant(4);
+ DifferentiableUnivariateFunction m = new Minus();
+ DifferentiableUnivariateFunction inv = new Inverse();
final double a = 123.456;
Assert.assertEquals(- 1 / (a * a) -1 + Math.cos(a),
@@ -118,28 +118,28 @@ public class FunctionUtilsTest {
@Test
public void testMultiply() {
- UnivariateRealFunction c = new Constant(4);
+ UnivariateFunction c = new Constant(4);
Assert.assertEquals(16, FunctionUtils.multiply(c, c).value(12345), EPS);
- UnivariateRealFunction inv = new Inverse();
- UnivariateRealFunction pow = new Power(2);
+ UnivariateFunction inv = new Inverse();
+ UnivariateFunction pow = new Power(2);
Assert.assertEquals(1, FunctionUtils.multiply(FunctionUtils.compose(inv, pow), pow).value(3.5), EPS);
}
@Test
public void testMultiplyDifferentiable() {
- DifferentiableUnivariateRealFunction c = new Constant(4);
- DifferentiableUnivariateRealFunction id = new Identity();
+ DifferentiableUnivariateFunction c = new Constant(4);
+ DifferentiableUnivariateFunction id = new Identity();
final double a = 1.2345678;
Assert.assertEquals(8 * a, FunctionUtils.multiply(c, id, id).derivative().value(a), EPS);
- DifferentiableUnivariateRealFunction inv = new Inverse();
- DifferentiableUnivariateRealFunction pow = new Power(2.5);
- DifferentiableUnivariateRealFunction cos = new Cos();
+ DifferentiableUnivariateFunction inv = new Inverse();
+ DifferentiableUnivariateFunction pow = new Power(2.5);
+ DifferentiableUnivariateFunction cos = new Cos();
Assert.assertEquals(1.5 * Math.sqrt(a) * Math.cos(a) - Math.pow(a, 1.5) * Math.sin(a),
FunctionUtils.multiply(inv, pow, cos).derivative().value(a), EPS);
- DifferentiableUnivariateRealFunction cosh = new Cosh();
+ DifferentiableUnivariateFunction cosh = new Cosh();
Assert.assertEquals(1.5 * Math.sqrt(a) * Math.cosh(a) + Math.pow(a, 1.5) * Math.sinh(a),
FunctionUtils.multiply(inv, pow, cosh).derivative().value(a), 8 * EPS);
}
@@ -147,13 +147,13 @@ public class FunctionUtilsTest {
@Test
public void testCombine() {
BivariateRealFunction bi = new Add();
- UnivariateRealFunction id = new Identity();
- UnivariateRealFunction m = new Minus();
- UnivariateRealFunction c = FunctionUtils.combine(bi, id, m);
+ UnivariateFunction id = new Identity();
+ UnivariateFunction m = new Minus();
+ UnivariateFunction c = FunctionUtils.combine(bi, id, m);
Assert.assertEquals(0, c.value(2.3456), EPS);
bi = new Multiply();
- UnivariateRealFunction inv = new Inverse();
+ UnivariateFunction inv = new Inverse();
c = FunctionUtils.combine(bi, id, inv);
Assert.assertEquals(1, c.value(2.3456), EPS);
}
@@ -180,10 +180,10 @@ public class FunctionUtilsTest {
@Test
public void testSinc() {
BivariateRealFunction div = new Divide();
- UnivariateRealFunction sin = new Sin();
- UnivariateRealFunction id = new Identity();
- UnivariateRealFunction sinc1 = FunctionUtils.combine(div, sin, id);
- UnivariateRealFunction sinc2 = new Sinc();
+ UnivariateFunction sin = new Sin();
+ UnivariateFunction id = new Identity();
+ UnivariateFunction sinc1 = FunctionUtils.combine(div, sin, id);
+ UnivariateFunction sinc2 = new Sinc();
for (int i = 0; i < 10; i++) {
double x = Math.random();
@@ -193,11 +193,11 @@ public class FunctionUtilsTest {
@Test
public void testFixingArguments() {
- UnivariateRealFunction scaler = FunctionUtils.fix1stArgument(new Multiply(), 10);
+ UnivariateFunction scaler = FunctionUtils.fix1stArgument(new Multiply(), 10);
Assert.assertEquals(1.23456, scaler.value(0.123456), EPS);
- UnivariateRealFunction pow1 = new Power(2);
- UnivariateRealFunction pow2 = FunctionUtils.fix2ndArgument(new Pow(), 2);
+ UnivariateFunction pow1 = new Power(2);
+ UnivariateFunction pow2 = FunctionUtils.fix2ndArgument(new Pow(), 2);
for (int i = 0; i < 10; i++) {
double x = Math.random() * 10;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java Sun Nov 27 22:18:30 2011
@@ -21,9 +21,9 @@ package org.apache.commons.math.analysis
*
* @version $Id$
*/
-public class MonitoredFunction implements UnivariateRealFunction {
+public class MonitoredFunction implements UnivariateFunction {
- public MonitoredFunction(UnivariateRealFunction f) {
+ public MonitoredFunction(UnivariateFunction f) {
callsCount = 0;
this.f = f;
}
@@ -42,6 +42,6 @@ public class MonitoredFunction implement
}
private int callsCount;
- private UnivariateRealFunction f;
+ private UnivariateFunction f;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java Sun Nov 27 22:18:30 2011
@@ -21,17 +21,17 @@ package org.apache.commons.math.analysis
*
* @version $Id$
*/
-public class QuinticFunction implements DifferentiableUnivariateRealFunction {
+public class QuinticFunction implements DifferentiableUnivariateFunction {
/* Evaluate quintic.
- * @see org.apache.commons.math.UnivariateRealFunction#value(double)
+ * @see org.apache.commons.math.UnivariateFunction#value(double)
*/
public double value(double x) {
return (x-1)*(x-0.5)*x*(x+0.5)*(x+1);
}
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
public double value(double x) {
return (5*x*x-3.75)*x*x+0.25;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SinFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SinFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SinFunction.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SinFunction.java Sun Nov 27 22:18:30 2011
@@ -28,10 +28,10 @@ import org.apache.commons.math.util.Fast
*
* @version $Id$
*/
-public class SinFunction implements DifferentiableUnivariateRealFunction {
+public class SinFunction implements DifferentiableUnivariateFunction {
/* Evaluate sinus fuction.
- * @see org.apache.commons.math.UnivariateRealFunction#value(double)
+ * @see org.apache.commons.math.UnivariateFunction#value(double)
*/
public double value(double x) {
return FastMath.sin(x);
@@ -39,8 +39,8 @@ public class SinFunction implements Diff
/* First derivative of sinus function
*/
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
public double value(double x) {
return FastMath.cos(x);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SincFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SincFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SincFunction.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SincFunction.java Sun Nov 27 22:18:30 2011
@@ -22,7 +22,7 @@ package org.apache.commons.math.analysis
*
* @version $Id$
*/
-public class SincFunction implements DifferentiableUnivariateRealFunction {
+public class SincFunction implements DifferentiableUnivariateFunction {
private static final double EPS = 1e-12;
/**
@@ -38,8 +38,8 @@ public class SincFunction implements Dif
/**
* {@inheritDoc}
*/
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
public double value(double x) {
return (Math.abs(x) < EPS ?
0 :
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java Sun Nov 27 22:18:30 2011
@@ -22,8 +22,8 @@ package org.apache.commons.math.analysis
* @version $Id$
*/
public class SumSincFunction implements DifferentiableMultivariateRealFunction {
- private static final DifferentiableUnivariateRealFunction sinc = new SincFunction();
- private static final UnivariateRealFunction sincDeriv = sinc.derivative();
+ private static final DifferentiableUnivariateFunction sinc = new SincFunction();
+ private static final UnivariateFunction sincDeriv = sinc.derivative();
/**
* Factor that will multiply each term of the sum.
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java Sun Nov 27 22:18:30 2011
@@ -21,10 +21,10 @@ package org.apache.commons.math.analysis
*
* @version $Id$
*/
-public class XMinus5Function implements DifferentiableUnivariateRealFunction {
+public class XMinus5Function implements DifferentiableUnivariateFunction {
/* Evaluate x - 5 fuction.
- * @see org.apache.commons.math.UnivariateRealFunction#value(double)
+ * @see org.apache.commons.math.UnivariateFunction#value(double)
*/
public double value(double x) {
return x - 5;
@@ -32,8 +32,8 @@ public class XMinus5Function implements
/* First derivative of x - 5 function
*/
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
public double value(double x) {
return 1.0;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -39,14 +39,14 @@ public class GaussianTest {
@Test
public void testSomeValues() {
- final UnivariateRealFunction f = new Gaussian();
+ final UnivariateFunction f = new Gaussian();
Assert.assertEquals(1 / FastMath.sqrt(2 * Math.PI), f.value(0), EPS);
}
@Test
public void testLargeArguments() {
- final UnivariateRealFunction f = new Gaussian();
+ final UnivariateFunction f = new Gaussian();
Assert.assertEquals(0, f.value(Double.NEGATIVE_INFINITY), 0);
Assert.assertEquals(0, f.value(-Double.MAX_VALUE), 0);
@@ -59,7 +59,7 @@ public class GaussianTest {
@Test
public void testDerivative() {
final Gaussian f = new Gaussian();
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertEquals(0, dfdx.value(0), 0);
}
@@ -67,7 +67,7 @@ public class GaussianTest {
@Test
public void testDerivativeLargeArguments() {
final Gaussian f = new Gaussian(0, 1e-50);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertEquals(0, dfdx.value(Double.NEGATIVE_INFINITY), 0);
Assert.assertEquals(0, dfdx.value(-Double.MAX_VALUE), 0);
@@ -82,7 +82,7 @@ public class GaussianTest {
@Test
public void testDerivativeNaN() {
final Gaussian f = new Gaussian(0, 1e-50);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertTrue(Double.isNaN(dfdx.value(Double.NaN)));
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.util.FastMath;
@@ -36,7 +36,7 @@ public class HarmonicOscillatorTest {
final double a = -1.2;
final double w = 0.34;
final double p = 5.6;
- final UnivariateRealFunction f = new HarmonicOscillator(a, w, p);
+ final UnivariateFunction f = new HarmonicOscillator(a, w, p);
final double d = 0.12345;
for (int i = 0; i < 10; i++) {
@@ -51,7 +51,7 @@ public class HarmonicOscillatorTest {
final double w = 0.34;
final double p = 5.6;
final HarmonicOscillator f = new HarmonicOscillator(a, w, p);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
final double d = 0.12345;
for (int i = 0; i < 10; i++) {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -44,8 +44,8 @@ public class LogisticTest {
@Test
public void testCompareSigmoid() {
- final UnivariateRealFunction sig = new Sigmoid();
- final UnivariateRealFunction sigL = new Logistic(1, 0, 1, 1, 0, 1);
+ final UnivariateFunction sig = new Sigmoid();
+ final UnivariateFunction sigL = new Logistic(1, 0, 1, 1, 0, 1);
final double min = -2;
final double max = 2;
@@ -66,7 +66,7 @@ public class LogisticTest {
final double a = -1;
final double n = 2;
- final UnivariateRealFunction f = new Logistic(k, m, b, q, a, n);
+ final UnivariateFunction f = new Logistic(k, m, b, q, a, n);
double x;
x = m;
@@ -87,8 +87,8 @@ public class LogisticTest {
final Logistic f = new Logistic(k, 0, 1, 1, a, 1);
final Sigmoid g = new Sigmoid(a, k);
- final UnivariateRealFunction dfdx = f.derivative();
- final UnivariateRealFunction dgdx = g.derivative();
+ final UnivariateFunction dfdx = f.derivative();
+ final UnivariateFunction dgdx = g.derivative();
final double min = -10;
final double max = 10;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.FunctionUtils;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -36,7 +36,7 @@ public class LogitTest {
public void testPreconditions1() {
final double lo = -1;
final double hi = 2;
- final UnivariateRealFunction f = new Logit(lo, hi);
+ final UnivariateFunction f = new Logit(lo, hi);
f.value(lo - 1);
}
@@ -44,7 +44,7 @@ public class LogitTest {
public void testPreconditions2() {
final double lo = -1;
final double hi = 2;
- final UnivariateRealFunction f = new Logit(lo, hi);
+ final UnivariateFunction f = new Logit(lo, hi);
f.value(hi + 1);
}
@@ -53,7 +53,7 @@ public class LogitTest {
public void testSomeValues() {
final double lo = 1;
final double hi = 2;
- final UnivariateRealFunction f = new Logit(lo, hi);
+ final UnivariateFunction f = new Logit(lo, hi);
Assert.assertEquals(Double.NEGATIVE_INFINITY, f.value(1), EPS);
Assert.assertEquals(Double.POSITIVE_INFINITY, f.value(2), EPS);
@@ -65,7 +65,7 @@ public class LogitTest {
final double lo = 1;
final double hi = 2;
final Logit f = new Logit(lo, hi);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertEquals(4, dfdx.value(1.5), EPS);
}
@@ -73,7 +73,7 @@ public class LogitTest {
@Test
public void testDerivativeLargeArguments() {
final Logit f = new Logit(1, 2);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertEquals(0, dfdx.value(Double.NEGATIVE_INFINITY), 0);
Assert.assertEquals(0, dfdx.value(-Double.MAX_VALUE), 0);
@@ -137,7 +137,7 @@ public class LogitTest {
final double hi = 3;
final Logit f = new Logit(lo, hi);
final Sigmoid g = new Sigmoid(lo, hi);
- final UnivariateRealFunction id = FunctionUtils.compose(g, f);
+ final UnivariateFunction id = FunctionUtils.compose(g, f);
for (int i = 0; i < 10; i++) {
final double x = lo + Math.random() * (hi - lo);
@@ -153,10 +153,10 @@ public class LogitTest {
final double lo = 2;
final double hi = 3;
final Logit f = new Logit(lo, hi);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
final Sigmoid g = new Sigmoid(lo, hi);
- final UnivariateRealFunction dgdx = g.derivative();
- final UnivariateRealFunction chain
+ final UnivariateFunction dgdx = g.derivative();
+ final UnivariateFunction chain
= FunctionUtils.compose(new Inverse(), FunctionUtils.compose(dgdx, f));
for (int i = 0; i < 10; i++) {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -32,7 +32,7 @@ public class SigmoidTest {
@Test
public void testSomeValues() {
- final UnivariateRealFunction f = new Sigmoid();
+ final UnivariateFunction f = new Sigmoid();
Assert.assertEquals(0.5, f.value(0), EPS);
Assert.assertEquals(0, f.value(Double.NEGATIVE_INFINITY), EPS);
@@ -42,7 +42,7 @@ public class SigmoidTest {
@Test
public void testDerivative() {
final Sigmoid f = new Sigmoid();
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertEquals(0.25, dfdx.value(0), 0);
}
@@ -50,7 +50,7 @@ public class SigmoidTest {
@Test
public void testDerivativeLargeArguments() {
final Sigmoid f = new Sigmoid(1, 2);
- final UnivariateRealFunction dfdx = f.derivative();
+ final UnivariateFunction dfdx = f.derivative();
Assert.assertEquals(0, dfdx.value(Double.NEGATIVE_INFINITY), 0);
Assert.assertEquals(0, dfdx.value(-Double.MAX_VALUE), 0);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SincTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SincTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SincTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SincTest.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.junit.Test;
import org.junit.Assert;
@@ -26,7 +26,7 @@ public class SincTest {
@Test
public void testShortcut() {
final Sinc s = new Sinc();
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction f = new UnivariateFunction() {
public double value(double x) {
return FastMath.sin(x) / x;
}
@@ -70,15 +70,15 @@ public class SincTest {
@Test
public void testDerivativeZero() {
- final UnivariateRealFunction sPrime = (new Sinc(true)).derivative();
+ final UnivariateFunction sPrime = (new Sinc(true)).derivative();
Assert.assertEquals(0, sPrime.value(0), 0);
}
@Test
public void testDerivativeShortcut() {
- final UnivariateRealFunction sPrime = (new Sinc()).derivative();
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction sPrime = (new Sinc()).derivative();
+ final UnivariateFunction f = new UnivariateFunction() {
public double value(double x) {
return (FastMath.cos(x) - FastMath.sin(x) / x) / x;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.junit.Test;
import org.junit.Assert;
@@ -25,7 +25,7 @@ public class SqrtTest {
@Test
public void testComparison() {
final Sqrt s = new Sqrt();
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction f = new UnivariateFunction() {
public double value(double x) {
return Math.sqrt(x);
}
@@ -40,8 +40,8 @@ public class SqrtTest {
@Test
public void testDerivativeComparison() {
- final UnivariateRealFunction sPrime = (new Sqrt()).derivative();
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction sPrime = (new Sqrt()).derivative();
+ final UnivariateFunction f = new UnivariateFunction() {
public double value(double x) {
return 1 / (2 * Math.sqrt(x));
}
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.NonMonotonicSequenceException;
import org.apache.commons.math.exception.NullArgumentException;
@@ -67,7 +67,7 @@ public class StepFunctionTest {
final double[] x = { -2, -0.5, 0, 1.9, 7.4, 21.3 };
final double[] y = { 4, -1, -5.5, 0.4, 5.8, 51.2 };
- final UnivariateRealFunction f = new StepFunction(x, y);
+ final UnivariateFunction f = new StepFunction(x, y);
Assert.assertEquals(4, f.value(Double.NEGATIVE_INFINITY), EPS);
Assert.assertEquals(4, f.value(-10), EPS);
@@ -84,8 +84,8 @@ public class StepFunctionTest {
final double[] x = {0, 1, 2, 3};
final double[] xp = {-8, 1, 2, 3};
final double[] y = {1, 2, 3, 4};
- final UnivariateRealFunction f = new StepFunction(x, y);
- final UnivariateRealFunction fp = new StepFunction(xp, y);
+ final UnivariateFunction f = new StepFunction(x, y);
+ final UnivariateFunction fp = new StepFunction(xp, y);
Assert.assertEquals(f.value(-8), fp.value(-8), EPS);
Assert.assertEquals(f.value(-10), fp.value(-10), EPS);
Assert.assertEquals(f.value(0), fp.value(0), EPS);
@@ -102,7 +102,7 @@ public class StepFunctionTest {
@Test
public void testHeaviside() {
- final UnivariateRealFunction h = new StepFunction(new double[] {-1, 0},
+ final UnivariateFunction h = new StepFunction(new double[] {-1, 0},
new double[] {0, 1});
Assert.assertEquals(0, h.value(Double.NEGATIVE_INFINITY), 0);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java Sun Nov 27 22:18:30 2011
@@ -20,7 +20,7 @@ import java.util.Random;
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.util.FastMath;
@@ -32,7 +32,7 @@ public class LegendreGaussIntegratorTest
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealIntegratorImpl integrator = new LegendreGaussIntegrator(5, 1.0e-14, 1.0e-10, 2, 15);
double min, max, expected, result, tolerance;
@@ -51,7 +51,7 @@ public class LegendreGaussIntegratorTest
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealIntegrator integrator =
new LegendreGaussIntegrator(3,
UnivariateRealIntegratorImpl.DEFAULT_RELATIVE_ACCURACY,
@@ -104,7 +104,7 @@ public class LegendreGaussIntegratorTest
@Test
public void testIssue464() {
final double value = 0.2;
- UnivariateRealFunction f = new UnivariateRealFunction() {
+ UnivariateFunction f = new UnivariateFunction() {
public double value(double x) {
return (x >= 0 && x <= 5) ? value : 0.0;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.util.FastMath;
@@ -42,7 +42,7 @@ public final class RombergIntegratorTest
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealIntegrator integrator = new RombergIntegrator();
double min, max, expected, result, tolerance;
@@ -66,7 +66,7 @@ public final class RombergIntegratorTest
*/
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealIntegrator integrator = new RombergIntegrator();
double min, max, expected, result, tolerance;
@@ -97,7 +97,7 @@ public final class RombergIntegratorTest
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
try {
// bad interval
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.util.FastMath;
@@ -41,7 +41,7 @@ public final class SimpsonIntegratorTest
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealIntegrator integrator = new SimpsonIntegrator();
double min, max, expected, result, tolerance;
@@ -65,7 +65,7 @@ public final class SimpsonIntegratorTest
*/
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealIntegrator integrator = new SimpsonIntegrator();
double min, max, expected, result, tolerance;
@@ -96,7 +96,7 @@ public final class SimpsonIntegratorTest
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
try {
// bad interval
new SimpsonIntegrator().integrate(1000, f, 1, -1);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.util.FastMath;
@@ -41,7 +41,7 @@ public final class TrapezoidIntegratorTe
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealIntegrator integrator = new TrapezoidIntegrator();
double min, max, expected, result, tolerance;
@@ -65,7 +65,7 @@ public final class TrapezoidIntegratorTe
*/
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealIntegrator integrator = new TrapezoidIntegrator();
double min, max, expected, result, tolerance;
@@ -97,7 +97,7 @@ public final class TrapezoidIntegratorTe
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
try {
// bad interval
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
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;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
@@ -48,7 +48,7 @@ public final class DividedDifferenceInte
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealInterpolator interpolator = new DividedDifferenceInterpolator();
double x[], y[], z, expected, result, tolerance;
@@ -62,7 +62,7 @@ public final class DividedDifferenceInte
y[i] = f.value(x[i]);
}
double derivativebound = 1.0;
- UnivariateRealFunction p = interpolator.interpolate(x, y);
+ UnivariateFunction p = interpolator.interpolate(x, y);
z = FastMath.PI / 4; expected = f.value(z); result = p.value(z);
tolerance = FastMath.abs(derivativebound * partialerror(x, z));
@@ -80,7 +80,7 @@ public final class DividedDifferenceInte
*/
@Test
public void testExpm1Function() {
- UnivariateRealFunction f = new Expm1Function();
+ UnivariateFunction f = new Expm1Function();
UnivariateRealInterpolator interpolator = new DividedDifferenceInterpolator();
double x[], y[], z, expected, result, tolerance;
@@ -94,7 +94,7 @@ public final class DividedDifferenceInte
y[i] = f.value(x[i]);
}
double derivativebound = FastMath.E;
- UnivariateRealFunction p = interpolator.interpolate(x, y);
+ UnivariateFunction p = interpolator.interpolate(x, y);
z = 0.0; expected = f.value(z); result = p.value(z);
tolerance = FastMath.abs(derivativebound * partialerror(x, z));
@@ -120,7 +120,7 @@ public final class DividedDifferenceInte
// bad abscissas array
double x[] = { 1.0, 2.0, 2.0, 4.0 };
double y[] = { 0.0, 4.0, 4.0, 2.5 };
- UnivariateRealFunction p = interpolator.interpolate(x, y);
+ UnivariateFunction p = interpolator.interpolate(x, y);
p.value(0.0);
Assert.fail("Expecting NonMonotonicSequenceException - bad abscissas array");
} catch (NonMonotonicSequenceException ex) {
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -20,7 +20,7 @@ import org.apache.commons.math.exception
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
import org.junit.Assert;
@@ -46,7 +46,7 @@ public class LinearInterpolatorTest {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 1.0 };
UnivariateRealInterpolator i = new LinearInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
// Verify coefficients using analytical values
@@ -68,7 +68,7 @@ public class LinearInterpolatorTest {
double x[] = { 0.0, 0.5, 1.0, 1.5 };
double y[] = { 0.0, 0.5, 1.0, 1.5 };
UnivariateRealInterpolator i = new LinearInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
// Verify coefficients using analytical values
@@ -91,7 +91,7 @@ public class LinearInterpolatorTest {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 0.0 };
UnivariateRealInterpolator i = new LinearInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
// Verify coefficients using analytical values
@@ -137,7 +137,7 @@ public class LinearInterpolatorTest {
/**
* verifies that f(x[i]) = y[i] for i = 0..n-1 where n is common length.
*/
- protected void verifyInterpolation(UnivariateRealFunction f, double x[], double y[])
+ protected void verifyInterpolation(UnivariateFunction f, double x[], double y[])
throws Exception{
for (int i = 0; i < x.length; i++) {
Assert.assertEquals(f.value(x[i]), y[i], knotTolerance);
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
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;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
@@ -48,7 +48,7 @@ public final class NevilleInterpolatorTe
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealInterpolator interpolator = new NevilleInterpolator();
double x[], y[], z, expected, result, tolerance;
@@ -62,7 +62,7 @@ public final class NevilleInterpolatorTe
y[i] = f.value(x[i]);
}
double derivativebound = 1.0;
- UnivariateRealFunction p = interpolator.interpolate(x, y);
+ UnivariateFunction p = interpolator.interpolate(x, y);
z = FastMath.PI / 4; expected = f.value(z); result = p.value(z);
tolerance = FastMath.abs(derivativebound * partialerror(x, z));
@@ -80,7 +80,7 @@ public final class NevilleInterpolatorTe
*/
@Test
public void testExpm1Function() {
- UnivariateRealFunction f = new Expm1Function();
+ UnivariateFunction f = new Expm1Function();
UnivariateRealInterpolator interpolator = new NevilleInterpolator();
double x[], y[], z, expected, result, tolerance;
@@ -94,7 +94,7 @@ public final class NevilleInterpolatorTe
y[i] = f.value(x[i]);
}
double derivativebound = FastMath.E;
- UnivariateRealFunction p = interpolator.interpolate(x, y);
+ UnivariateFunction p = interpolator.interpolate(x, y);
z = 0.0; expected = f.value(z); result = p.value(z);
tolerance = FastMath.abs(derivativebound * partialerror(x, z));
@@ -120,7 +120,7 @@ public final class NevilleInterpolatorTe
// bad abscissas array
double x[] = { 1.0, 2.0, 2.0, 4.0 };
double y[] = { 0.0, 4.0, 4.0, 2.5 };
- UnivariateRealFunction p = interpolator.interpolate(x, y);
+ UnivariateFunction p = interpolator.interpolate(x, y);
p.value(0.0);
Assert.fail("Expecting NonMonotonicSequenceException - bad abscissas array");
} catch (NonMonotonicSequenceException ex) {
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -21,7 +21,7 @@ import org.apache.commons.math.exception
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
import org.junit.Assert;
@@ -49,7 +49,7 @@ public class SplineInterpolatorTest {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 1.0 };
UnivariateRealInterpolator i = new SplineInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
verifyConsistency((PolynomialSplineFunction) f, x);
@@ -72,7 +72,7 @@ public class SplineInterpolatorTest {
double x[] = { 0.0, 0.5, 1.0, 1.5 };
double y[] = { 0.0, 0.5, 1.0, 1.5 };
UnivariateRealInterpolator i = new SplineInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
// Verify coefficients using analytical values
@@ -95,7 +95,7 @@ public class SplineInterpolatorTest {
double x[] = { 0.0, 0.5, 1.0 };
double y[] = { 0.0, 0.5, 0.0 };
UnivariateRealInterpolator i = new SplineInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
verifyConsistency((PolynomialSplineFunction) f, x);
@@ -122,7 +122,7 @@ public class SplineInterpolatorTest {
2.d * FastMath.PI };
double y[] = { 0d, 0.5d, 1d, 0.5d, 0d, -0.5d, -1d, -0.5d, 0d };
UnivariateRealInterpolator i = new SplineInterpolator();
- UnivariateRealFunction f = i.interpolate(x, y);
+ UnivariateFunction f = i.interpolate(x, y);
verifyInterpolation(f, x, y);
verifyConsistency((PolynomialSplineFunction) f, x);
@@ -193,7 +193,7 @@ public class SplineInterpolatorTest {
/**
* verifies that f(x[i]) = y[i] for i = 0..n-1 where n is common length.
*/
- protected void verifyInterpolation(UnivariateRealFunction f, double x[], double y[])
+ protected void verifyInterpolation(UnivariateFunction f, double x[], double y[])
throws Exception{
for (int i = 0; i < x.length; i++) {
Assert.assertEquals(f.value(x[i]), y[i], knotTolerance);
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.interpolation;
import java.util.Random;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.NonMonotonicSequenceException;
@@ -48,12 +48,12 @@ public class UnivariateRealPeriodicInter
}
final UnivariateRealInterpolator inter = new LinearInterpolator();
- final UnivariateRealFunction f = inter.interpolate(xval, yval);
+ final UnivariateFunction f = inter.interpolate(xval, yval);
final UnivariateRealInterpolator interP
= new UnivariateRealPeriodicInterpolator(new LinearInterpolator(),
period, 1);
- final UnivariateRealFunction fP = interP.interpolate(xval, yval);
+ final UnivariateFunction fP = interP.interpolate(xval, yval);
// Comparing with original interpolation algorithm.
final double xMin = xval[0];
@@ -95,7 +95,7 @@ public class UnivariateRealPeriodicInter
final UnivariateRealInterpolator interP
= new UnivariateRealPeriodicInterpolator(new LinearInterpolator(),
period, 1);
- final UnivariateRealFunction fP = interP.interpolate(xval, yval);
+ final UnivariateFunction fP = interP.interpolate(xval, yval);
// Test interpolation outside the sample data interval.
for (int i = 0; i < n; i++) {
@@ -126,7 +126,7 @@ public class UnivariateRealPeriodicInter
final UnivariateRealInterpolator interP
= new UnivariateRealPeriodicInterpolator(new LinearInterpolator(),
period, 1);
- final UnivariateRealFunction fP = interP.interpolate(xval, yval);
+ final UnivariateFunction fP = interP.interpolate(xval, yval);
// Test interpolation outside the sample data interval.
for (int i = 0; i < n; i++) {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java Sun Nov 27 22:18:30 2011
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.junit.Assert;
/**
- * Tests the PolynomialFunction implementation of a UnivariateRealFunction.
+ * Tests the PolynomialFunction implementation of a UnivariateFunction.
*
* @version $Id$
*/
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
import java.util.Arrays;
import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.MathIllegalArgumentException;
import org.apache.commons.math.exception.MathIllegalStateException;
import org.junit.Assert;
@@ -93,7 +93,7 @@ public class PolynomialSplineFunctionTes
public void testValues() throws Exception {
PolynomialSplineFunction spline =
new PolynomialSplineFunction(knots, polynomials);
- UnivariateRealFunction dSpline = spline.derivative();
+ UnivariateFunction dSpline = spline.derivative();
/**
* interior points -- spline value at x should equal p(x - knot)
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.polynomials;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.integration.LegendreGaussIntegrator;
import org.apache.commons.math.util.ArithmeticUtils;
import org.apache.commons.math.util.FastMath;
@@ -78,7 +78,7 @@ public class PolynomialsUtilsTest {
@Test
public void testChebyshevOrthogonality() {
- UnivariateRealFunction weight = new UnivariateRealFunction() {
+ UnivariateFunction weight = new UnivariateFunction() {
public double value(double x) {
return 1 / FastMath.sqrt(1 - x * x);
}
@@ -129,7 +129,7 @@ public class PolynomialsUtilsTest {
@Test
public void testHermiteOrthogonality() {
- UnivariateRealFunction weight = new UnivariateRealFunction() {
+ UnivariateFunction weight = new UnivariateFunction() {
public double value(double x) {
return FastMath.exp(-x * x);
}
@@ -186,7 +186,7 @@ public class PolynomialsUtilsTest {
@Test
public void testLaguerreOrthogonality() {
- UnivariateRealFunction weight = new UnivariateRealFunction() {
+ UnivariateFunction weight = new UnivariateFunction() {
public double value(double x) {
return FastMath.exp(-x);
}
@@ -237,7 +237,7 @@ public class PolynomialsUtilsTest {
@Test
public void testLegendreOrthogonality() {
- UnivariateRealFunction weight = new UnivariateRealFunction() {
+ UnivariateFunction weight = new UnivariateFunction() {
public double value(double x) {
return 1;
}
@@ -302,7 +302,7 @@ public class PolynomialsUtilsTest {
for (int w = v; w < 5; ++w) {
final int vv = v;
final int ww = w;
- UnivariateRealFunction weight = new UnivariateRealFunction() {
+ UnivariateFunction weight = new UnivariateFunction() {
public double value(double x) {
return FastMath.pow(1 - x, vv) * FastMath.pow(1 + x, ww);
}
@@ -365,11 +365,11 @@ public class PolynomialsUtilsTest {
private void checkOrthogonality(final PolynomialFunction p1,
final PolynomialFunction p2,
- final UnivariateRealFunction weight,
+ final UnivariateFunction weight,
final double a, final double b,
final double nonZeroThreshold,
final double zeroThreshold) {
- UnivariateRealFunction f = new UnivariateRealFunction() {
+ UnivariateFunction f = new UnivariateFunction() {
public double value(double x) {
return weight.value(x) * p1.value(x) * p2.value(x);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.XMinus5Function;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NoBracketingException;
@@ -51,7 +51,7 @@ public abstract class BaseSecantSolverAb
// The sinus function is behaved well around the root at pi. The second
// order derivative is zero, which means linear approximating methods
// still converge quadratically.
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
double result;
UnivariateRealSolver solver = getSolver();
@@ -77,7 +77,7 @@ public abstract class BaseSecantSolverAb
// The function has extrema (first derivative is zero) at 0.27195613
// and 0.82221643, intervals containing these values are harder for
// the solvers.
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
double result;
UnivariateRealSolver solver = getSolver();
double atol = solver.getAbsoluteAccuracy();
@@ -116,7 +116,7 @@ public abstract class BaseSecantSolverAb
@Test
public void testRootEndpoints() {
- UnivariateRealFunction f = new XMinus5Function();
+ UnivariateFunction f = new XMinus5Function();
UnivariateRealSolver solver = getSolver();
// End-point is root. This should be a special case in the solver, and
@@ -136,7 +136,7 @@ public abstract class BaseSecantSolverAb
@Test
public void testBadEndpoints() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = getSolver();
try { // bad interval
solver.solve(100, f, 1, -1);
@@ -160,7 +160,7 @@ public abstract class BaseSecantSolverAb
@Test
public void testSolutionLeftSide() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = getSolver();
double left = -1.5;
double right = 0.05;
@@ -179,7 +179,7 @@ public abstract class BaseSecantSolverAb
@Test
public void testSolutionRightSide() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = getSolver();
double left = -1.5;
double right = 0.05;
@@ -197,7 +197,7 @@ public abstract class BaseSecantSolverAb
}
@Test
public void testSolutionBelowSide() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = getSolver();
double left = -1.5;
double right = 0.05;
@@ -216,7 +216,7 @@ public abstract class BaseSecantSolverAb
@Test
public void testSolutionAboveSide() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = getSolver();
double left = -1.5;
double right = 0.05;
@@ -233,12 +233,12 @@ public abstract class BaseSecantSolverAb
}
}
- private double getSolution(UnivariateRealSolver solver, int maxEval, UnivariateRealFunction f,
+ private double getSolution(UnivariateRealSolver solver, int maxEval, UnivariateFunction f,
double left, double right, AllowedSolution allowedSolution) {
try {
@SuppressWarnings("unchecked")
- BracketedUnivariateRealSolver<UnivariateRealFunction> bracketing =
- (BracketedUnivariateRealSolver<UnivariateRealFunction>) solver;
+ BracketedUnivariateRealSolver<UnivariateFunction> bracketing =
+ (BracketedUnivariateRealSolver<UnivariateFunction>) solver;
return bracketing.solve(100, f, left, right, allowedSolution);
} catch (ClassCastException cce) {
double baseRoot = solver.solve(maxEval, f, left, right);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
@@ -29,7 +29,7 @@ import org.junit.Test;
public final class BisectionSolverTest {
@Test
public void testSinZero() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
double result;
BisectionSolver solver = new BisectionSolver();
@@ -42,7 +42,7 @@ public final class BisectionSolverTest {
@Test
public void testQuinticZero() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
double result;
BisectionSolver solver = new BisectionSolver();
@@ -84,7 +84,7 @@ public final class BisectionSolverTest {
@Test
public void testMath369() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
BisectionSolver solver = new BisectionSolver();
Assert.assertEquals(FastMath.PI, solver.solve(100, f, 3.0, 3.2, 3.1), solver.getAbsoluteAccuracy());
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java Sun Nov 27 22:18:30 2011
@@ -17,9 +17,9 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.util.FastMath;
@@ -132,7 +132,7 @@ public final class BracketingNthOrderBre
compare(f, f.getRoot(), f.getMin(), f.getMax());
}
- private void compare(DifferentiableUnivariateRealFunction f,
+ private void compare(DifferentiableUnivariateFunction f,
double root, double min, double max) {
NewtonSolver newton = new NewtonSolver(1.0e-12);
BracketingNthOrderBrentSolver bracketing =
@@ -154,7 +154,7 @@ public final class BracketingNthOrderBre
Assert.assertTrue(bracketing.getEvaluations() < newton.getEvaluations());
}
- private static abstract class TestFunction implements DifferentiableUnivariateRealFunction {
+ private static abstract class TestFunction implements DifferentiableUnivariateFunction {
private final double root;
private final double min;
@@ -182,8 +182,8 @@ public final class BracketingNthOrderBre
public abstract double derivative(double x);
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
public double value(double x) {
return derivative(x);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.MonitoredFunction;
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NoBracketingException;
@@ -44,7 +44,7 @@ public final class BrentSolverTest {
// The sinus function is behaved well around the root at pi. The second
// order derivative is zero, which means linar approximating methods will
// still converge quadratically.
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
double result;
UnivariateRealSolver solver = new BrentSolver();
// Somewhat benign interval. The function is monotone.
@@ -70,7 +70,7 @@ public final class BrentSolverTest {
// the function grows fast for x>1.
// The function has extrema (first derivative is zero) at 0.27195613 and 0.82221643,
// intervals containing these values are harder for the solvers.
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
double result;
// Brent-Dekker solver.
UnivariateRealSolver solver = new BrentSolver();
@@ -157,7 +157,7 @@ public final class BrentSolverTest {
@Test
public void testRootEndpoints() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
BrentSolver solver = new BrentSolver();
// endpoint is root
@@ -176,7 +176,7 @@ public final class BrentSolverTest {
@Test
public void testBadEndpoints() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
BrentSolver solver = new BrentSolver();
try { // bad interval
solver.solve(100, f, 1, -1);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.Expm1Function;
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NoBracketingException;
import org.apache.commons.math.util.FastMath;
@@ -45,7 +45,7 @@ public final class MullerSolver2Test {
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = new MullerSolver2();
double min, max, expected, result, tolerance;
@@ -67,7 +67,7 @@ public final class MullerSolver2Test {
*/
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealSolver solver = new MullerSolver2();
double min, max, expected, result, tolerance;
@@ -97,7 +97,7 @@ public final class MullerSolver2Test {
*/
@Test
public void testExpm1Function() {
- UnivariateRealFunction f = new Expm1Function();
+ UnivariateFunction f = new Expm1Function();
UnivariateRealSolver solver = new MullerSolver2();
double min, max, expected, result, tolerance;
@@ -125,7 +125,7 @@ public final class MullerSolver2Test {
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = new MullerSolver2();
try {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.Expm1Function;
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NumberIsTooLargeException;
import org.apache.commons.math.exception.NoBracketingException;
import org.apache.commons.math.util.FastMath;
@@ -45,7 +45,7 @@ public final class MullerSolverTest {
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = new MullerSolver();
double min, max, expected, result, tolerance;
@@ -67,7 +67,7 @@ public final class MullerSolverTest {
*/
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealSolver solver = new MullerSolver();
double min, max, expected, result, tolerance;
@@ -99,7 +99,7 @@ public final class MullerSolverTest {
*/
@Test
public void testExpm1Function() {
- UnivariateRealFunction f = new Expm1Function();
+ UnivariateFunction f = new Expm1Function();
UnivariateRealSolver solver = new MullerSolver();
double min, max, expected, result, tolerance;
@@ -127,7 +127,7 @@ public final class MullerSolverTest {
*/
@Test
public void testParameters() throws Exception {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = new MullerSolver();
try {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
import org.apache.commons.math.util.FastMath;
@@ -33,7 +33,7 @@ public final class NewtonSolverTest {
*/
@Test
public void testSinZero() {
- DifferentiableUnivariateRealFunction f = new SinFunction();
+ DifferentiableUnivariateFunction f = new SinFunction();
double result;
NewtonSolver solver = new NewtonSolver();
@@ -51,7 +51,7 @@ public final class NewtonSolverTest {
*/
@Test
public void testQuinticZero() {
- DifferentiableUnivariateRealFunction f = new QuinticFunction();
+ DifferentiableUnivariateFunction f = new QuinticFunction();
double result;
NewtonSolver solver = new NewtonSolver();
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.ConvergenceException;
import org.junit.Test;
import org.junit.Assert;
@@ -45,7 +45,7 @@ public final class RegulaFalsiSolverTest
@Test(expected=ConvergenceException.class)
public void testIssue631() {
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction f = new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return Math.exp(x) - Math.pow(Math.PI, 3.0);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.analysis.Expm1Function;
import org.apache.commons.math.analysis.QuinticFunction;
import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.exception.NoBracketingException;
import org.apache.commons.math.exception.NumberIsTooLargeException;
@@ -43,7 +43,7 @@ public final class RiddersSolverTest {
*/
@Test
public void testSinFunction() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = new RiddersSolver();
double min, max, expected, result, tolerance;
@@ -65,7 +65,7 @@ public final class RiddersSolverTest {
*/
@Test
public void testQuinticFunction() {
- UnivariateRealFunction f = new QuinticFunction();
+ UnivariateFunction f = new QuinticFunction();
UnivariateRealSolver solver = new RiddersSolver();
double min, max, expected, result, tolerance;
@@ -93,7 +93,7 @@ public final class RiddersSolverTest {
*/
@Test
public void testExpm1Function() {
- UnivariateRealFunction f = new Expm1Function();
+ UnivariateFunction f = new Expm1Function();
UnivariateRealSolver solver = new RiddersSolver();
double min, max, expected, result, tolerance;
@@ -121,7 +121,7 @@ public final class RiddersSolverTest {
*/
@Test
public void testParameters() {
- UnivariateRealFunction f = new SinFunction();
+ UnivariateFunction f = new SinFunction();
UnivariateRealSolver solver = new RiddersSolver();
try {