From cafc39cb940e2f13b0760f5cf70cf3767707f00e Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 10 Jul 2012 17:53:34 +0000 Subject: [PATCH] Pull LinearInterpolator.main() into a JUnit test. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@880 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../openrocket/util/LinearInterpolator.java | 12 ------- .../util/LinearInterpolatorTest.java | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 core/test/net/sf/openrocket/util/LinearInterpolatorTest.java diff --git a/core/src/net/sf/openrocket/util/LinearInterpolator.java b/core/src/net/sf/openrocket/util/LinearInterpolator.java index e94a3976..db422d52 100644 --- a/core/src/net/sf/openrocket/util/LinearInterpolator.java +++ b/core/src/net/sf/openrocket/util/LinearInterpolator.java @@ -113,16 +113,4 @@ public class LinearInterpolator implements Cloneable { } } - - public static void main(String[] args) { - LinearInterpolator interpolator = new LinearInterpolator( - new double[] {1, 1.5, 2, 4, 5}, - new double[] {0, 1, 0, 2, 2} - ); - - for (double x=0; x < 6; x+=0.1) { - System.out.printf("%.1f: %.2f\n", x, interpolator.getValue(x)); - } - } - } diff --git a/core/test/net/sf/openrocket/util/LinearInterpolatorTest.java b/core/test/net/sf/openrocket/util/LinearInterpolatorTest.java new file mode 100644 index 00000000..600f82b1 --- /dev/null +++ b/core/test/net/sf/openrocket/util/LinearInterpolatorTest.java @@ -0,0 +1,32 @@ +package net.sf.openrocket.util; + +import static org.junit.Assert.*; +import org.junit.Test; + +public class LinearInterpolatorTest { + + @Test + public void oldMainTest() { + LinearInterpolator interpolator = new LinearInterpolator( + new double[] {1, 1.5, 2, 4, 5}, + new double[] {0, 1, 0, 2, 2} + ); + + double[] answer = new double[] { + /* x=0 */ 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, + /* x=1 */ 0.00, 0.20, 0.40, 0.60, 0.80, 1.00, 0.80, 0.60, 0.40, 0.20, + /* x=2 */ 0.00, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80, 0.90, + /* x=3 */ 1.00, 1.10, 1.20, 1.30, 1.40, 1.50, 1.60, 1.70, 1.80, 1.90, + /* x=4 */ 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, + /* x=5 */ 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, 2.00, + /* x=6 */ 2.00 + }; + + double x = 0; + for (int i=0; i < answer.length; i++) { + assertEquals( "Answer wrong for x = " + x , answer[i], interpolator.getValue(x), 0.01 ); + x+= 0.1; + } + + } +} -- 2.47.2