You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2012/09/28 18:38:59 UTC
svn commit: r1391531 [2/2] - in /commons/sandbox/nabla/trunk/src:
main/java/org/apache/commons/nabla/
main/java/org/apache/commons/nabla/caching/
main/java/org/apache/commons/nabla/core/
main/java/org/apache/commons/nabla/forward/ main/java/org/apache/...
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DRemGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DRemGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DRemGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DRemGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.arithmetic;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class DRemGeneratorTest extends AbstractMathTest {
@@ -25,24 +24,24 @@ public class DRemGeneratorTest extends A
@Test
public void testReference1(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return t % 5; }
- public double fPrime(double t) { return 1.0; }
+ public double value(double t) { return t % 5; }
+ public double firstDerivative(double t) { return 1.0; }
}, 0.1, 10, 30, 0.0);
}
@Test
public void testReference2(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return 5 % t; }
- public double fPrime(double t) { return ((5 % t) - 5) / t; }
+ public double value(double t) { return 5 % t; }
+ public double firstDerivative(double t) { return ((5 % t) - 5) / t; }
}, 0.5, 10, 30, 1e-15);
}
@Test
public void testReference12(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return t % t; }
- public double fPrime(double t) { return 0; }
+ public double value(double t) { return t % t; }
+ public double firstDerivative(double t) { return 0; }
}, 0.1, 10, 30, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DSubGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DSubGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DSubGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/arithmetic/DSubGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.arithmetic;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class DSubGeneratorTest extends AbstractMathTest {
@@ -25,24 +24,24 @@ public class DSubGeneratorTest extends A
@Test
public void testReference1(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return t - 5; }
- public double fPrime(double t) { return 1; }
+ public double value(double t) { return t - 5; }
+ public double firstDerivative(double t) { return 1; }
}, -0.99, 0.99, 30, 0.0);
}
@Test
public void testReference2(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return 5 - t; }
- public double fPrime(double t) { return -1; }
+ public double value(double t) { return 5 - t; }
+ public double firstDerivative(double t) { return -1; }
}, -0.99, 0.99, 30, 0.0);
}
@Test
public void testReference12(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return t - t; }
- public double fPrime(double t) { return 0; }
+ public double value(double t) { return t - t; }
+ public double firstDerivative(double t) { return 0; }
}, -0.99, 0.99, 30, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcosGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcosGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcosGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcosGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
import org.apache.commons.nabla.DifferentiationException;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,23 +30,23 @@ public class AcosGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.acos(t); }
- public double fPrime(double t) { return -1 / Math.sqrt(1 - t * t); }
+ public double value(double t) { return Math.acos(t); }
+ public double firstDerivative(double t) { return -1 / Math.sqrt(1 - t * t); }
}, -0.99, 0.99, 30, 0.0);
}
@Test
public void testSingularityPlus() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.acos(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.acos(t); }
});
- double dPlus = derivative.f(new DifferentialPair(1, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, 1.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus > 0);
- double dMinus = derivative.f(new DifferentialPair(1, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, 1.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus < 0);
@@ -55,16 +54,16 @@ public class AcosGeneratorTest extends A
@Test
public void testSingularityMinus() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.acos(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.acos(t); }
});
- double dPlus = derivative.f(new DifferentialPair(-1, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, -1.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus > 0);
- double dMinus = derivative.f(new DifferentialPair(-1, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, -1.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus < 0);
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcoshGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcoshGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcoshGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AcoshGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class AcoshGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class AcoshGeneratorTest extends
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return MathExtensions.acosh(t); }
- public double fPrime(double t) { return 1 / Math.sqrt(t * t - 1); }
+ public double value(double t) { return MathExtensions.acosh(t); }
+ public double firstDerivative(double t) { return 1 / Math.sqrt(t * t - 1); }
}, 1.01, 5, 30, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.DifferentiationException;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
+import org.apache.commons.nabla.DifferentiationException;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,23 +30,23 @@ public class AsinGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.asin(t); }
- public double fPrime(double t) { return 1 / Math.sqrt(1 - t * t); }
+ public double value(double t) { return Math.asin(t); }
+ public double firstDerivative(double t) { return 1 / Math.sqrt(1 - t * t); }
}, -0.99, 0.99, 30, 0.0);
}
@Test
public void testSingularityPlus() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.asin(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.asin(t); }
});
- double dPlus = derivative.f(new DifferentialPair(1, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, 1.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus < 0);
- double dMinus = derivative.f(new DifferentialPair(1, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, 1.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus > 0);
@@ -55,16 +54,16 @@ public class AsinGeneratorTest extends A
@Test
public void testSingularityMinus() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.asin(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.asin(t); }
});
- double dPlus = derivative.f(new DifferentialPair(-1, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, -1.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus < 0);
- double dMinus = derivative.f(new DifferentialPair(-1, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, -1.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus > 0);
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinhGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinhGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinhGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AsinhGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class AsinhGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class AsinhGeneratorTest extends
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return MathExtensions.asinh(t); }
- public double fPrime(double t) { return 1 / Math.sqrt(t * t + 1); }
+ public double value(double t) { return MathExtensions.asinh(t); }
+ public double firstDerivative(double t) { return 1 / Math.sqrt(t * t + 1); }
}, -5, 5, 30, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Atan2GeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Atan2GeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Atan2GeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Atan2GeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class Atan2GeneratorTest extends AbstractMathTest {
@@ -25,32 +24,32 @@ public class Atan2GeneratorTest extends
@Test
public void testReference1(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.atan2(t, 3.0); }
- public double fPrime(double t) { return 3 / (t * t + 9); }
+ public double value(double t) { return Math.atan2(t, 3.0); }
+ public double firstDerivative(double t) { return 3 / (t * t + 9); }
}, -2, 2, 50, 2e-15);
}
@Test
public void testReference2(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.atan2(3.0, t); }
- public double fPrime(double t) { return -3 / (t * t + 9); }
+ public double value(double t) { return Math.atan2(3.0, t); }
+ public double firstDerivative(double t) { return -3 / (t * t + 9); }
}, -2, 2, 50, 0.0);
}
@Test
public void testReference12Aligned(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.atan2(t, t); }
- public double fPrime(double t) { return 0; }
+ public double value(double t) { return Math.atan2(t, t); }
+ public double firstDerivative(double t) { return 0; }
}, 0.1, 10, 20, 0);
}
@Test
public void testReference12Shifted(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.atan2(t, t + 1); }
- public double fPrime(double t) { return 1 / (2 * t * (t + 1) + 1); }
+ public double value(double t) { return Math.atan2(t, t + 1); }
+ public double firstDerivative(double t) { return 1 / (2 * t * (t + 1) + 1); }
}, 0.1, 10, 20, 2.0e-16);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.DifferentiationException;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
+import org.apache.commons.nabla.DifferentiationException;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,37 +30,37 @@ public class AtanGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.atan(t); }
- public double fPrime(double t) { return 1 / (1 + t * t); }
+ public double value(double t) { return Math.atan(t); }
+ public double firstDerivative(double t) { return 1 / (1 + t * t); }
}, -1.5, 1.5, 30, 0.0);
}
@Test
public void testSingularityPlus() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.atan(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.atan(t); }
});
- double dPlus = derivative.f(new DifferentialPair(Double.POSITIVE_INFINITY, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, Double.POSITIVE_INFINITY, 1.0)).getPartialDerivative(1);
Assert.assertEquals(0, dPlus, 0);
- double dMinus = derivative.f(new DifferentialPair(Double.POSITIVE_INFINITY, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, Double.POSITIVE_INFINITY, -1.0)).getPartialDerivative(1);
Assert.assertEquals(0, dMinus, 0);
}
@Test
public void testSingularityMinus() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.atan(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.atan(t); }
});
- double dPlus = derivative.f(new DifferentialPair(Double.NEGATIVE_INFINITY, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, Double.NEGATIVE_INFINITY, 1.0)).getPartialDerivative(1);
Assert.assertEquals(0, dPlus, 0);
- double dMinus = derivative.f(new DifferentialPair(Double.NEGATIVE_INFINITY, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, Double.NEGATIVE_INFINITY, -1.0)).getPartialDerivative(1);
Assert.assertEquals(0, dMinus, 0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanhGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanhGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanhGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/AtanhGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class AtanhGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class AtanhGeneratorTest extends
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return MathExtensions.atanh(t); }
- public double fPrime(double t) { return 1 / (1 - t * t); }
+ public double value(double t) { return MathExtensions.atanh(t); }
+ public double firstDerivative(double t) { return 1 / (1 - t * t); }
}, -5, 5, 30, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CbrtGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CbrtGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CbrtGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CbrtGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class CbrtGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class CbrtGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.cbrt(t); }
- public double fPrime(double t) { return 1 / (3 * (Math.cbrt(t) * Math.cbrt(t))); }
+ public double value(double t) { return Math.cbrt(t); }
+ public double firstDerivative(double t) { return 1 / (3 * (Math.cbrt(t) * Math.cbrt(t))); }
}, -5, 5, 50, 0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CosGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CosGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CosGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CosGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class CosGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class CosGeneratorTest extends Ab
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.cos(t); }
- public double fPrime(double t) { return -Math.sin(t); }
+ public double value(double t) { return Math.cos(t); }
+ public double firstDerivative(double t) { return -Math.sin(t); }
}, 0, 2 * Math.PI, 20, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CoshGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CoshGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CoshGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/CoshGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class CoshGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class CoshGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.cosh(t); }
- public double fPrime(double t) { return Math.sinh(t); }
+ public double value(double t) { return Math.cosh(t); }
+ public double firstDerivative(double t) { return Math.sinh(t); }
}, -10, 10, 50, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/ExpGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/ExpGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/ExpGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/ExpGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class ExpGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class ExpGeneratorTest extends Ab
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.exp(t); }
- public double fPrime(double t) { return Math.exp(t); }
+ public double value(double t) { return Math.exp(t); }
+ public double firstDerivative(double t) { return Math.exp(t); }
}, -5, 5, 50, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Expm1GeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Expm1GeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Expm1GeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Expm1GeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class Expm1GeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class Expm1GeneratorTest extends
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.expm1(t); }
- public double fPrime(double t) { return 1 + Math.expm1(t); }
+ public double value(double t) { return Math.expm1(t); }
+ public double firstDerivative(double t) { return 1 + Math.expm1(t); }
}, -5, 5, 50, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/HypotGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/HypotGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/HypotGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/HypotGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class HypotGeneratorTest extends AbstractMathTest {
@@ -25,32 +24,32 @@ public class HypotGeneratorTest extends
@Test
public void testReference1(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.hypot(t, 3.0); }
- public double fPrime(double t) { return t / Math.hypot(t, 3.0); }
+ public double value(double t) { return Math.hypot(t, 3.0); }
+ public double firstDerivative(double t) { return t / Math.hypot(t, 3.0); }
}, -2, 2, 50, 2e-15);
}
@Test
public void testReference2(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.hypot(3.0, t); }
- public double fPrime(double t) { return t / Math.hypot(t, 3.0); }
+ public double value(double t) { return Math.hypot(3.0, t); }
+ public double firstDerivative(double t) { return t / Math.hypot(t, 3.0); }
}, -2, 2, 50, 0.0);
}
@Test
public void testReference12Aligned(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.hypot(t, t); }
- public double fPrime(double t) { return Math.sqrt(2); }
+ public double value(double t) { return Math.hypot(t, t); }
+ public double firstDerivative(double t) { return Math.sqrt(2); }
}, 0.1, 10, 20, 3.0e-16);
}
@Test
public void testReference12Shifted(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.hypot(t, t + 1); }
- public double fPrime(double t) { return (2 * t + 1) / Math.hypot(t, t + 1); }
+ public double value(double t) { return Math.hypot(t, t + 1); }
+ public double firstDerivative(double t) { return (2 * t + 1) / Math.hypot(t, t + 1); }
}, 0.1, 10, 20, 3.0e-16);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log10GeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log10GeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log10GeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log10GeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.DifferentiationException;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
+import org.apache.commons.nabla.DifferentiationException;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,23 +30,23 @@ public class Log10GeneratorTest extends
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.log10(t); }
- public double fPrime(double t) { return 1 / (Math.log(10) * t); }
+ public double value(double t) { return Math.log10(t); }
+ public double firstDerivative(double t) { return 1 / (Math.log(10) * t); }
}, 0.1, 10, 50, 0.0);
}
@Test
public void testSingularity() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.log10(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.log10(t); }
});
- double dPlus = derivative.f(new DifferentialPair(0, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, 0.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus > 0);
- double dMinus = derivative.f(new DifferentialPair(0, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, 0.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus < 0);
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log1pGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log1pGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log1pGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/Log1pGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.DifferentiationException;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
+import org.apache.commons.nabla.DifferentiationException;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,23 +30,23 @@ public class Log1pGeneratorTest extends
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.log1p(t); }
- public double fPrime(double t) { return 1 / (1 + t); }
+ public double value(double t) { return Math.log1p(t); }
+ public double firstDerivative(double t) { return 1 / (1 + t); }
}, -0.2, 0.2, 50, 0.0);
}
@Test
public void testSingularity() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.log1p(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.log1p(t); }
});
- double dPlus = derivative.f(new DifferentialPair(-1, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, -1.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus > 0);
- double dMinus = derivative.f(new DifferentialPair(-1, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, -1.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus < 0);
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/LogGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/LogGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/LogGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/LogGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.DifferentiationException;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
+import org.apache.commons.nabla.DifferentiationException;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,23 +30,23 @@ public class LogGeneratorTest extends Ab
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.log(t); }
- public double fPrime(double t) { return 1 / t; }
+ public double value(double t) { return Math.log(t); }
+ public double firstDerivative(double t) { return 1 / t; }
}, 0.1, 10, 50, 0.0);
}
@Test
public void testSingularity() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.log(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.log(t); }
});
- double dPlus = derivative.f(new DifferentialPair(0, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, 0.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus > 0);
- double dMinus = derivative.f(new DifferentialPair(0, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, 0.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus < 0);
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/PowGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/PowGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/PowGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/PowGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class PowGeneratorTest extends AbstractMathTest {
@@ -25,24 +24,24 @@ public class PowGeneratorTest extends Ab
@Test
public void testReference1(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.pow(t, 3.0); }
- public double fPrime(double t) { return 3 * Math.pow(t, 2.0); }
+ public double value(double t) { return Math.pow(t, 3.0); }
+ public double firstDerivative(double t) { return 3 * Math.pow(t, 2.0); }
}, -2, 2, 50, 2e-15);
}
@Test
public void testReference2(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.pow(3.0, t); }
- public double fPrime(double t) { return Math.log(3) * Math.pow(3, t); }
+ public double value(double t) { return Math.pow(3.0, t); }
+ public double firstDerivative(double t) { return Math.log(3) * Math.pow(3, t); }
}, -2, 2, 50, 0.0);
}
@Test
public void testReference12(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.pow(t, t); }
- public double fPrime(double t) { return (1 + Math.log(t)) * Math.pow(t, t); }
+ public double value(double t) { return Math.pow(t, t); }
+ public double firstDerivative(double t) { return (1 + Math.log(t)) * Math.pow(t, t); }
}, 0.1, 10, 20, 0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class SinGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class SinGeneratorTest extends Ab
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.sin(t); }
- public double fPrime(double t) { return Math.cos(t); }
+ public double value(double t) { return Math.sin(t); }
+ public double firstDerivative(double t) { return Math.cos(t); }
}, 0, 2 * Math.PI, 20, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinhGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinhGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinhGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SinhGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class SinhGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class SinhGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.sinh(t); }
- public double fPrime(double t) { return Math.cosh(t); }
+ public double value(double t) { return Math.sinh(t); }
+ public double firstDerivative(double t) { return Math.cosh(t); }
}, -10, 10, 50, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SqrtGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SqrtGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SqrtGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/SqrtGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -16,12 +16,11 @@
*/
package org.apache.commons.nabla.forward.functions;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
-import org.apache.commons.nabla.core.DifferentialPair;
-import org.apache.commons.nabla.core.DifferentiationException;
-import org.apache.commons.nabla.core.UnivariateDerivative;
-import org.apache.commons.nabla.core.UnivariateDifferentiable;
+import org.apache.commons.nabla.DifferentiationException;
import org.apache.commons.nabla.forward.ForwardModeAlgorithmicDifferentiator;
import org.junit.Assert;
import org.junit.Test;
@@ -31,23 +30,23 @@ public class SqrtGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.sqrt(t); }
- public double fPrime(double t) { return 1 / (2 * Math.sqrt(t)); }
+ public double value(double t) { return Math.sqrt(t); }
+ public double firstDerivative(double t) { return 1 / (2 * Math.sqrt(t)); }
}, 0.001, 10, 50, 0.0);
}
@Test
public void testSingularity() throws DifferentiationException {
- UnivariateDerivative derivative =
- new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateDifferentiable() {
- public double f(double t) { return Math.sqrt(t); }
+ UnivariateDifferentiableFunction derivative =
+ new ForwardModeAlgorithmicDifferentiator().differentiate(new UnivariateFunction() {
+ public double value(double t) { return Math.sqrt(t); }
});
- double dPlus = derivative.f(new DifferentialPair(0, 1)).getFirstDerivative();
+ double dPlus = derivative.value(new DerivativeStructure(1, 1, 0.0, 1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dPlus));
Assert.assertTrue(dPlus > 0);
- double dMinus = derivative.f(new DifferentialPair(0, -1)).getFirstDerivative();
+ double dMinus = derivative.value(new DerivativeStructure(1, 1, 0.0, -1.0)).getPartialDerivative(1);
Assert.assertTrue(Double.isInfinite(dMinus));
Assert.assertTrue(dMinus < 0);
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class TanGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class TanGeneratorTest extends Ab
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.tan(t); }
- public double fPrime(double t) { return 1 + Math.tan(t) * Math.tan(t); }
+ public double value(double t) { return Math.tan(t); }
+ public double firstDerivative(double t) { return 1 + Math.tan(t) * Math.tan(t); }
}, 0, 2 * Math.PI, 20, 0.0);
}
Modified: commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanhGeneratorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanhGeneratorTest.java?rev=1391531&r1=1391530&r2=1391531&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanhGeneratorTest.java (original)
+++ commons/sandbox/nabla/trunk/src/test/java/org/apache/commons/nabla/forward/functions/TanhGeneratorTest.java Fri Sep 28 16:38:56 2012
@@ -17,7 +17,6 @@
package org.apache.commons.nabla.forward.functions;
import org.apache.commons.nabla.AbstractMathTest;
-import org.apache.commons.nabla.ReferenceFunction;
import org.junit.Test;
public class TanhGeneratorTest extends AbstractMathTest {
@@ -25,8 +24,8 @@ public class TanhGeneratorTest extends A
@Test
public void testReference(){
checkReference(new ReferenceFunction() {
- public double f(double t) { return Math.tanh(t); }
- public double fPrime(double t) { return 1 - Math.tanh(t) * Math.tanh(t); }
+ public double value(double t) { return Math.tanh(t); }
+ public double firstDerivative(double t) { return 1 - Math.tanh(t) * Math.tanh(t); }
}, -10, 10, 50, 0.0);
}