psteitz 2004/02/15 22:30:21
Modified: math/src/test/org/apache/commons/math/analysis
InterpolatorTest.java RealSolverTest.java
math/src/test/org/apache/commons/math/stat
DescriptiveStatisticsTest.java
Log:
Commented out sysouts.
Revision Changes Path
1.11 +19 -52
jakarta-commons/math/src/test/org/apache/commons/math/analysis/InterpolatorTest.java
Index: InterpolatorTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/test/org/apache/commons/math/analysis/InterpolatorTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- InterpolatorTest.java 29 Jan 2004 16:48:49 -0000 1.10
+++ InterpolatorTest.java 16 Feb 2004 06:30:21 -0000 1.11
@@ -42,18 +42,19 @@
public void testInterpolateLinearDegenerateTwoSegment()
throws MathException {
- System.out.println(" deg 2 seg");
+ //System.out.println(" deg 2 seg");
double xval[] = { 0.0, 0.5, 1.0 };
double yval[] = { 0.0, 0.5, 1.0 };
UnivariateRealInterpolator i = new SplineInterpolator();
UnivariateRealFunction f = i.interpolate(xval, yval);
+ /* todo: rewrite using assertions
double x;
x = 0.0;
System.out.println(
"x="
- + x
- + " y="
- + f.value(x));
+ + x
+ + " y="
+ + f.value(x));
x = 0.5;
System.out.println(
@@ -68,66 +69,26 @@
+ x
+ " y="
+ f.value(x));
+ */
}
public void testInterpolateLinearDegenerateThreeSegment()
throws MathException {
- System.out.println(" deg 3 seg");
+// System.out.println(" deg 3 seg");
double xval[] = { 0.0, 0.5, 1.0, 1.5 };
double yval[] = { 0.0, 0.5, 1.0, 1.5 };
UnivariateRealInterpolator i = new SplineInterpolator();
UnivariateRealFunction f = i.interpolate(xval, yval);
- double x;
- x = 0.0;
- System.out.println(
- "x="
- + x
- + " y="
- + f.value(x));
-
- x = 0.5 - 1E-6;
- System.out.println(
- "x="
- + x
- + " y="
- + f.value(x));
-
- x = 0.5;
- System.out.println(
- "x="
- + x
- + " y="
- + f.value(x));
-
- x = 1 - 1E-6;
- System.out.println(
- "x="
- + x
- + " y="
- + f.value(x));
-
- x = 1;
- System.out.println(
- "x="
- + x
- + " y="
- + f.value(x));
-
- x = 1.5 - 1E-6;
- System.out.println(
- "x="
- + x
- + " y="
- + f.value(x));
}
public void testInterpolateLinear() throws MathException {
- System.out.println(" triang 2 seg");
+ // System.out.println(" triang 2 seg");
double xval[] = { 0.0, 0.5, 1.0 };
double yval[] = { 0.0, 0.5, 0.0 };
UnivariateRealInterpolator i = new SplineInterpolator();
UnivariateRealFunction f = i.interpolate(xval, yval);
+ /* todo: rewrite with assertions
double x;
x = 0.0;
System.out.println(
@@ -156,10 +117,11 @@
+ x
+ " y="
+ f.value(x));
+*/
}
-
+
public void testInterpolateSin() throws MathException {
- System.out.println(" sin");
+ //System.out.println(" sin");
double xval[] =
{
0.0,
@@ -173,9 +135,12 @@
2.0 * Math.PI };
double yval[] = { 0.0, 0.5, 1.0, 0.5, 0.0, -0.5, -1.0, -0.5, 0.0 };
- System.out.println("n=" + xval.length);
+ //System.out.println("n=" + xval.length);
UnivariateRealInterpolator i = new SplineInterpolator();
UnivariateRealFunction f = i.interpolate(xval, yval);
+
+ /* todo: rewrite using assertions
+
double x;
x = 0.0;
System.out.println(
@@ -234,6 +199,8 @@
+ f.value(x));
//assertEquals(0.5,f.value(Math.PI/6.0),)
+
+ */
}
public void testIllegalArguments() throws MathException {
1.10 +65 -66
jakarta-commons/math/src/test/org/apache/commons/math/analysis/RealSolverTest.java
Index: RealSolverTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/test/org/apache/commons/math/analysis/RealSolverTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RealSolverTest.java 29 Jan 2004 00:48:57 -0000 1.9
+++ RealSolverTest.java 16 Feb 2004 06:30:21 -0000 1.10
@@ -55,7 +55,6 @@
import org.apache.commons.math.MathException;
-import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -69,7 +68,7 @@
* default absolute accuracy of 10E-8 for sinus and the quintic function around
* zero, and 5..10 iterations for the other zeros.
*
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date$
*/
public final class RealSolverTest extends TestCase {
@@ -90,37 +89,37 @@
UnivariateRealFunction f = new SinFunction();
double result;
UnivariateRealSolver solver = new BrentSolver(f);
- // Somewhat benign interval. The function is monotonous.
+ // Somewhat benign interval. The function is monotone.
result = solver.solve(3, 4);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, Math.PI, solver.getAbsoluteAccuracy());
// 4 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 5);
// Larger and somewhat less benign interval. The function is grows first.
result = solver.solve(1, 4);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, Math.PI, solver.getAbsoluteAccuracy());
// 5 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 6);
solver = new SecantSolver(f);
result = solver.solve(3, 4);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, Math.PI, solver.getAbsoluteAccuracy());
// 4 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 5);
result = solver.solve(1, 4);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, Math.PI, solver.getAbsoluteAccuracy());
// 5 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 6);
}
public void testQuinticZero() throws MathException {
- // The quintic function has zeroes at 0, +-0.5 and +-1.
+ // The quintic function has zeros at 0, +-0.5 and +-1.
// Around the root of 0 the function is well behaved, with a second
derivative
// of zero a 0.
// The other roots are less well to find, in particular the root at 1,
because
@@ -134,149 +133,149 @@
// Symmetric bracket around 0. Test whether solvers can handle hitting
// the root in the first iteration.
result = solver.solve(-0.2, 0.2);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0, solver.getAbsoluteAccuracy());
assertTrue(solver.getIterationCount() <= 2);
// 1 iterations on i586 JDK 1.4.1.
// Asymmetric bracket around 0, just for fun. Contains extremum.
result = solver.solve(-0.1, 0.3);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0, solver.getAbsoluteAccuracy());
// 5 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 6);
// Large bracket around 0. Contains two extrema.
result = solver.solve(-0.3, 0.45);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0, solver.getAbsoluteAccuracy());
// 6 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 7);
// Benign bracket around 0.5, function is monotonous.
result = solver.solve(0.3, 0.7);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0.5, solver.getAbsoluteAccuracy());
// 6 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 7);
// Less benign bracket around 0.5, contains one extremum.
result = solver.solve(0.2, 0.6);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0.5, solver.getAbsoluteAccuracy());
// 6 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 7);
// Large, less benign bracket around 0.5, contains both extrema.
result = solver.solve(0.05, 0.95);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0.5, solver.getAbsoluteAccuracy());
// 8 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 9);
// Relatively benign bracket around 1, function is monotonous. Fast growth
for x>1
// is still a problem.
result = solver.solve(0.85, 1.25);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 8 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 9);
// Less benign bracket around 1 with extremum.
result = solver.solve(0.8, 1.2);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 8 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 9);
// Large bracket around 1. Monotonous.
result = solver.solve(0.85, 1.75);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 10 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 11);
// Large bracket around 1. Interval contains extremum.
result = solver.solve(0.55, 1.45);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 7 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 8);
// Very large bracket around 1 for testing fast growth behaviour.
result = solver.solve(0.85, 5);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 12 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 13);
// Secant solver.
solver = new SecantSolver(f);
result = solver.solve(-0.2, 0.2);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0, solver.getAbsoluteAccuracy());
// 1 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 2);
result = solver.solve(-0.1, 0.3);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0, solver.getAbsoluteAccuracy());
// 5 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 6);
result = solver.solve(-0.3, 0.45);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0, solver.getAbsoluteAccuracy());
// 6 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 7);
result = solver.solve(0.3, 0.7);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0.5, solver.getAbsoluteAccuracy());
// 7 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 8);
result = solver.solve(0.2, 0.6);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0.5, solver.getAbsoluteAccuracy());
// 6 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 7);
result = solver.solve(0.05, 0.95);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 0.5, solver.getAbsoluteAccuracy());
// 8 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 9);
result = solver.solve(0.85, 1.25);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 10 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 11);
result = solver.solve(0.8, 1.2);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 8 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 9);
result = solver.solve(0.85, 1.75);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 14 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 15);
// The followig is especially slow because the solver first has to reduce
// the bracket to exclude the extremum. After that, convergence is rapide.
result = solver.solve(0.55, 1.45);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 7 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 8);
result = solver.solve(0.85, 5);
- System.out.println(
- "Root: " + result + " Iterations: " + solver.getIterationCount());
+ //System.out.println(
+ // "Root: " + result + " Iterations: " + solver.getIterationCount());
assertEquals(result, 1.0, solver.getAbsoluteAccuracy());
// 14 iterations on i586 JDK 1.4.1.
assertTrue(solver.getIterationCount() <= 15);
@@ -284,24 +283,24 @@
result = UnivariateRealSolverUtils.solve(f, -0.2, 0.2);
assertEquals(result, 0, solver.getAbsoluteAccuracy());
result = UnivariateRealSolverUtils.solve(f, -0.1, 0.3);
- Assert.assertEquals(result, 0, 1E-8);
+ assertEquals(result, 0, 1E-8);
result = UnivariateRealSolverUtils.solve(f, -0.3, 0.45);
- Assert.assertEquals(result, 0, 1E-6);
+ assertEquals(result, 0, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.3, 0.7);
- Assert.assertEquals(result, 0.5, 1E-6);
+ assertEquals(result, 0.5, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.2, 0.6);
- Assert.assertEquals(result, 0.5, 1E-6);
+ assertEquals(result, 0.5, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.05, 0.95);
- Assert.assertEquals(result, 0.5, 1E-6);
+ assertEquals(result, 0.5, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.85, 1.25);
- Assert.assertEquals(result, 1.0, 1E-6);
+ assertEquals(result, 1.0, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.8, 1.2);
- Assert.assertEquals(result, 1.0, 1E-6);
+ assertEquals(result, 1.0, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.85, 1.75);
- Assert.assertEquals(result, 1.0, 1E-6);
+ assertEquals(result, 1.0, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.55, 1.45);
- Assert.assertEquals(result, 1.0, 1E-6);
+ assertEquals(result, 1.0, 1E-6);
result = UnivariateRealSolverUtils.solve(f, 0.85, 5);
- Assert.assertEquals(result, 1.0, 1E-6);
+ assertEquals(result, 1.0, 1E-6);
}
}
1.4 +5 -5
jakarta-commons/math/src/test/org/apache/commons/math/stat/DescriptiveStatisticsTest.java
Index: DescriptiveStatisticsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/test/org/apache/commons/math/stat/DescriptiveStatisticsTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DescriptiveStatisticsTest.java 29 Jan 2004 00:49:00 -0000 1.3
+++ DescriptiveStatisticsTest.java 16 Feb 2004 06:30:21 -0000 1.4
@@ -196,7 +196,7 @@
for(int i = 0; i < 6; i++){
assertEquals( "Added value ["+i+"] not equal",
test3[i], test1[i],0.0);
- System.out.println(test3[i] + " "+test1[i]);
+ //System.out.println(test3[i] + " "+test1[i]);
}
for(int i = 0; i < test2.length; i++){
@@ -208,7 +208,7 @@
for(int i = 6; i < 12; i++){
assertEquals( "Added value ["+i+"] not equal",
test3[i], test2[i-6],0.0);
- System.out.println(test3[i] + " "+test2[i-6]);
+ //System.out.println(test3[i] + " "+test2[i-6]);
}
for(int i = 0; i < test2.length; i++){
@@ -220,13 +220,13 @@
for(int i = 0; i < 6; i++){
assertEquals( "Added value ["+i+"] not equal",
test3[i], test2[i],0.0);
- System.out.println(test3[i] + " "+test2[i]);
+ //System.out.println(test3[i] + " "+test2[i]);
}
for(int i = 6; i < 12; i++){
assertEquals( "Added value ["+i+"] not equal",
test3[i], test2[i-6],0.0);
- System.out.println(test3[i] + " "+test2[i-6]);
+ //System.out.println(test3[i] + " "+test2[i-6]);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
