Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem3.java Tue Dec 19 14:11:07 2006 @@ -72,8 +72,7 @@ public TestProblem3(TestProblem3 problem) { super(problem); e = problem.e; - y = new double[problem.y.length]; - System.arraycopy(problem.y, 0, y, 0, problem.y.length); + y = (double[]) problem.y.clone(); } /**
Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblem4.java Tue Dec 19 14:11:07 2006 @@ -60,8 +60,7 @@ public TestProblem4(TestProblem4 problem) { super(problem); a = problem.a; - y = new double[problem.y.length]; - System.arraycopy(problem.y, 0, y, 0, problem.y.length); + y = (double[]) problem.y.clone(); } /** @@ -91,6 +90,7 @@ private static class Bounce implements SwitchingFunction { + private static final long serialVersionUID = 1356097180027801200L; private int sign; public Bounce() { @@ -114,6 +114,8 @@ } private static class Stop implements SwitchingFunction { + + private static final long serialVersionUID = 6975050568227951931L; public Stop() { } Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/TestProblemAbstract.java Tue Dec 19 14:11:07 2006 @@ -65,15 +65,12 @@ if (problem.y0 == null) { y0 = null; } else { - y0 = new double[problem.y0.length]; - System.arraycopy(problem.y0, 0, y0, 0, problem.y0.length); + y0 = (double[]) problem.y0.clone(); } if (problem.errorScale == null) { errorScale = null; } else { - errorScale = new double[problem.errorScale.length]; - System.arraycopy(problem.errorScale, 0, errorScale, 0, - problem.errorScale.length); + errorScale = (double[]) problem.errorScale.clone(); } t1 = problem.t1; } @@ -93,8 +90,7 @@ calls = 0; n = y0.length; this.t0 = t0; - this.y0 = new double[y0.length]; - System.arraycopy(y0, 0, this.y0, 0, y0.length); + this.y0 = (double[]) y0.clone(); } /** @@ -110,9 +106,7 @@ * @param errorScale error scale */ protected void setErrorScale(double[] errorScale) { - this.errorScale = new double[errorScale.length]; - System.arraycopy(errorScale, 0, this.errorScale, 0, - errorScale.length); + this.errorScale = (double[]) errorScale.clone(); } public int getDimension() { @@ -156,7 +150,7 @@ * @return switching functions */ public SwitchingFunction[] getSwitchingFunctions() { - return null; + return new SwitchingFunction[0]; } /** Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/ode/ThreeEighthesIntegratorTest.java Tue Dec 19 14:11:07 2006 @@ -20,6 +20,7 @@ import junit.framework.*; import org.spaceroots.mantissa.estimation.EstimationException; +import org.spaceroots.mantissa.estimation.LevenbergMarquardtEstimator; import org.spaceroots.mantissa.fitting.PolynomialFitter; public class ThreeEighthesIntegratorTest @@ -59,11 +60,9 @@ TestProblemHandler handler = new TestProblemHandler(pb); integ.setStepHandler(handler); SwitchingFunction[] functions = pb.getSwitchingFunctions(); - if (functions != null) { - for (int l = 0; l < functions.length; ++l) { - integ.addSwitchingFunction(functions[l], - Double.POSITIVE_INFINITY, 1.0e-6 * step); - } + for (int l = 0; l < functions.length; ++l) { + integ.addSwitchingFunction(functions[l], + Double.POSITIVE_INFINITY, 1.0e-6 * step); } integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(), pb.getFinalTime(), new double[pb.getDimension()]); @@ -82,9 +81,8 @@ public void testOrder() throws EstimationException, DerivativeException, IntegratorException { - PolynomialFitter fitter = new PolynomialFitter(1, - 10, 1.0e-7, 1.0e-10, - 1.0e-10); + PolynomialFitter fitter = + new PolynomialFitter(1, new LevenbergMarquardtEstimator()); TestProblemAbstract[] problems = TestProblemFactory.getProblems(); for (int k = 0; k < problems.length; ++k) { @@ -99,11 +97,9 @@ TestProblemHandler handler = new TestProblemHandler(pb); integ.setStepHandler(handler); SwitchingFunction[] functions = pb.getSwitchingFunctions(); - if (functions != null) { - for (int l = 0; l < functions.length; ++l) { - integ.addSwitchingFunction(functions[l], - Double.POSITIVE_INFINITY, 1.0e-6 * step); - } + for (int l = 0; l < functions.length; ++l) { + integ.addSwitchingFunction(functions[l], + Double.POSITIVE_INFINITY, 1.0e-6 * step); } integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(), pb.getFinalTime(), new double[pb.getDimension()]); @@ -164,36 +160,49 @@ double step = (pb.getFinalTime() - pb.getInitialTime()) * 0.0003; FirstOrderIntegrator integ = new ThreeEighthesIntegrator(step); - integ.setStepHandler(new StepHandler() { - private double maxError = 0; - public boolean requiresDenseOutput() { - return false; - } - public void reset() { - maxError = 0; - } - public void handleStep(StepInterpolator interpolator, - boolean isLast) { - - double[] interpolatedY = interpolator.getInterpolatedState (); - double[] theoreticalY = pb.computeTheoreticalState(interpolator.getCurrentTime()); - double dx = interpolatedY[0] - theoreticalY[0]; - double dy = interpolatedY[1] - theoreticalY[1]; - double error = dx * dx + dy * dy; - if (error > maxError) { - maxError = error; - } - if (isLast) { - // even with more than 1000 evaluations per period, - // RK4 is not able to integrate such an eccentric - // orbit with a good accuracy - assertTrue(maxError > 0.005); - } - } - }); + integ.setStepHandler(new KeplerHandler(pb)); integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(), pb.getFinalTime(), new double[pb.getDimension()]); + } + + private static class KeplerHandler implements StepHandler { + + public KeplerHandler(TestProblem3 pb) { + this.pb = pb; + maxError = 0; + } + + public boolean requiresDenseOutput() { + return false; + } + + public void reset() { + maxError = 0; + } + + public void handleStep(StepInterpolator interpolator, + boolean isLast) { + + double[] interpolatedY = interpolator.getInterpolatedState (); + double[] theoreticalY = pb.computeTheoreticalState(interpolator.getCurrentTime()); + double dx = interpolatedY[0] - theoreticalY[0]; + double dy = interpolatedY[1] - theoreticalY[1]; + double error = dx * dx + dy * dy; + if (error > maxError) { + maxError = error; + } + if (isLast) { + // even with more than 1000 evaluations per period, + // RK4 is not able to integrate such an eccentric + // orbit with a good accuracy + assertTrue(maxError > 0.005); + } + } + + private TestProblem3 pb; + private double maxError = 0; + } public static Test suite() { Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/MultiDirectionalTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/MultiDirectionalTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/MultiDirectionalTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/MultiDirectionalTest.java Tue Dec 19 14:11:07 2006 @@ -46,7 +46,7 @@ new double[] { 3.5, -2.3 }); assertTrue(count > 60); - assertTrue(optimum.getCost() > 0.02); + assertTrue(optimum.cost > 0.02); } @@ -71,11 +71,11 @@ new double[] { 3.0, -1.0, 0.0, 1.0 }, new double[] { 4.0, 0.0, 1.0, 2.0 }); assertTrue(count > 850); - assertTrue(optimum.getCost() > 0.015); + assertTrue(optimum.cost > 0.015); } - private class ValueChecker implements ConvergenceChecker { + private static class ValueChecker implements ConvergenceChecker { public ValueChecker(double threshold) { this.threshold = threshold; @@ -84,7 +84,7 @@ public boolean converged(PointCostPair[] simplex) { PointCostPair smallest = simplex[0]; PointCostPair largest = simplex[simplex.length - 1]; - return (largest.getCost() - smallest.getCost()) < threshold; + return (largest.cost - smallest.cost) < threshold; } private double threshold; Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/NelderMeadTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/NelderMeadTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/NelderMeadTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/optimization/NelderMeadTest.java Tue Dec 19 14:11:07 2006 @@ -46,9 +46,9 @@ new double[] { 3.5, -2.3 }); assertTrue(count < 50); - assertEquals(0.0, optimum.getCost(), 6.0e-4); - assertEquals(1.0, optimum.getPoint()[0], 0.05); - assertEquals(1.0, optimum.getPoint()[1], 0.05); + assertEquals(0.0, optimum.cost, 6.0e-4); + assertEquals(1.0, optimum.point[0], 0.05); + assertEquals(1.0, optimum.point[1], 0.05); } @@ -73,15 +73,15 @@ new double[] { 3.0, -1.0, 0.0, 1.0 }, new double[] { 4.0, 0.0, 1.0, 2.0 }); assertTrue(count < 150); - assertEquals(0.0, optimum.getCost(), 6.0e-4); - assertEquals(0.0, optimum.getPoint()[0], 0.07); - assertEquals(0.0, optimum.getPoint()[1], 0.07); - assertEquals(0.0, optimum.getPoint()[2], 0.07); - assertEquals(0.0, optimum.getPoint()[3], 0.07); + assertEquals(0.0, optimum.cost, 6.0e-4); + assertEquals(0.0, optimum.point[0], 0.07); + assertEquals(0.0, optimum.point[1], 0.07); + assertEquals(0.0, optimum.point[2], 0.07); + assertEquals(0.0, optimum.point[3], 0.07); } - private class ValueChecker implements ConvergenceChecker { + private static class ValueChecker implements ConvergenceChecker { public ValueChecker(double threshold) { this.threshold = threshold; @@ -90,7 +90,7 @@ public boolean converged(PointCostPair[] simplex) { PointCostPair smallest = simplex[0]; PointCostPair largest = simplex[simplex.length - 1]; - return (largest.getCost() - smallest.getCost()) < threshold; + return (largest.cost - smallest.cost) < threshold; } private double threshold; Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/scalar/GaussLegendreIntegratorTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/scalar/GaussLegendreIntegratorTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/scalar/GaussLegendreIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/scalar/GaussLegendreIntegratorTest.java Tue Dec 19 14:11:07 2006 @@ -64,7 +64,8 @@ return new TestSuite(GaussLegendreIntegratorTest.class); } - private class Polynom implements ComputableFunction { + private static class Polynom implements ComputableFunction { + public Polynom(int degree, Random random, double max) { coeffs = new double[degree + 1]; for (int i = 0; i <= degree; ++i) { @@ -93,6 +94,8 @@ } private double[] coeffs; + + private static final long serialVersionUID = -7304282612679254557L; } Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/vectorial/GaussLegendreIntegratorTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/vectorial/GaussLegendreIntegratorTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/vectorial/GaussLegendreIntegratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/quadrature/vectorial/GaussLegendreIntegratorTest.java Tue Dec 19 14:11:07 2006 @@ -66,7 +66,7 @@ return new TestSuite(GaussLegendreIntegratorTest.class); } - private class Polynom implements ComputableFunction { + private static class Polynom implements ComputableFunction { public Polynom (int degree, Random random, double max) { coeffs0 = new double[degree + 1]; coeffs1 = new double[degree + 1]; @@ -116,6 +116,8 @@ private double[] coeffs0; private double[] coeffs1; + + private static final long serialVersionUID = -8032020368915042278L; } Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/CorrelatedRandomVectorGeneratorTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/CorrelatedRandomVectorGeneratorTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/CorrelatedRandomVectorGeneratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/CorrelatedRandomVectorGeneratorTest.java Tue Dec 19 14:11:07 2006 @@ -28,6 +28,9 @@ public CorrelatedRandomVectorGeneratorTest(String name) { super(name); + mean = null; + covariance = null; + generator = null; } public void testRank() { @@ -53,7 +56,7 @@ sample.add(generator.nextVector()); } - double[] estimatedMean = sample.getMean(null); + double[] estimatedMean = sample.getMean(); SymetricalMatrix estimatedCovariance = sample.getCovarianceMatrix(null); for (int i = 0; i < estimatedMean.length; ++i) { assertEquals(mean[i], estimatedMean[i], 0.07); Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/ScalarSampleStatisticsTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/ScalarSampleStatisticsTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/ScalarSampleStatisticsTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/ScalarSampleStatisticsTest.java Tue Dec 19 14:11:07 2006 @@ -24,6 +24,7 @@ public ScalarSampleStatisticsTest(String name) { super(name); + points = null; } public void testBasicStats() { Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/UncorrelatedRandomVectorGeneratorTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/UncorrelatedRandomVectorGeneratorTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/UncorrelatedRandomVectorGeneratorTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/UncorrelatedRandomVectorGeneratorTest.java Tue Dec 19 14:11:07 2006 @@ -26,6 +26,9 @@ public UncorrelatedRandomVectorGeneratorTest(String name) { super(name); + mean = null; + standardDeviation = null; + generator = null; } public void testMeanAndCorrelation() { @@ -35,7 +38,7 @@ sample.add(generator.nextVector()); } - double[] estimatedMean = sample.getMean(null); + double[] estimatedMean = sample.getMean(); double scale; SymetricalMatrix estimatedCorrelation = sample.getCovarianceMatrix(null); for (int i = 0; i < estimatedMean.length; ++i) { Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/VectorialSampleStatisticsTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/VectorialSampleStatisticsTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/VectorialSampleStatisticsTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/random/VectorialSampleStatisticsTest.java Tue Dec 19 14:11:07 2006 @@ -26,6 +26,7 @@ public VectorialSampleStatisticsTest(String name) { super(name); + points = null; } public void testSimplistic() { @@ -49,7 +50,7 @@ double[] min = sample.getMin(); double[] max = sample.getMax(); - double[] mean = sample.getMean(null); + double[] mean = sample.getMean(); SymetricalMatrix c = sample.getCovarianceMatrix(null); double[] refMin = new double[] {-0.70, 0.00, -3.10}; @@ -92,12 +93,12 @@ double[] min = even.getMin(); double[] max = even.getMax(); - double[] mean = even.getMean(null); + double[] mean = even.getMean(); SymetricalMatrix c = even.getCovarianceMatrix(null); double[] refMin = all.getMin(); double[] refMax = all.getMax(); - double[] refMean = all.getMean(null); + double[] refMean = all.getMean(); SymetricalMatrix refC = all.getCovarianceMatrix(null); for (int i = 0; i < min.length; ++i) { @@ -124,12 +125,12 @@ double[] min = direct.getMin(); double[] max = direct.getMax(); - double[] mean = direct.getMean(null); + double[] mean = direct.getMean(); SymetricalMatrix c = direct.getCovarianceMatrix(null); double[] refMin = loop.getMin(); double[] refMax = loop.getMax(); - double[] refMean = loop.getMean(null); + double[] refMean = loop.getMean(); SymetricalMatrix refC = loop.getCovarianceMatrix(null); for (int i = 0; i < min.length; ++i) { Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/BrentSolverTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/BrentSolverTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/BrentSolverTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/BrentSolverTest.java Tue Dec 19 14:11:07 2006 @@ -45,7 +45,7 @@ } - private class Checker implements ConvergenceChecker { + private static class Checker implements ConvergenceChecker { private double tolerance; Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/TestProblem.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/TestProblem.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/TestProblem.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/roots/TestProblem.java Tue Dec 19 14:11:07 2006 @@ -204,11 +204,12 @@ problems.add(new APSProblem28(n28[k], -10000.0, 10000.0, roots28[k])); } - return (TestProblem[]) problems.toArray(new TestProblem[0]); + return (TestProblem[]) problems.toArray(new TestProblem[problems.size()]); } private static class APSProblem1 extends TestProblem { + private static final long serialVersionUID = -186095948802525864L; public APSProblem1(double a, double b, double expectedRoot) { super(a, b, expectedRoot); } @@ -218,6 +219,7 @@ } private static class APSProblems2To11 extends TestProblem { + private static final long serialVersionUID = -1284328672006328516L; public APSProblems2To11(double a, double b, double expectedRoot) { super(a, b, expectedRoot); } @@ -233,6 +235,7 @@ } private static class APSProblems12To14 extends TestProblem { + private static final long serialVersionUID = 3371996034561221313L; private int n; public APSProblems12To14(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); @@ -244,6 +247,7 @@ } private static class APSProblems15To17 extends TestProblem { + private static final long serialVersionUID = -5460543876513796612L; private int n; private double u; public APSProblems15To17(int n, double u, @@ -258,6 +262,7 @@ } private static class APSProblem18 extends TestProblem { + private static final long serialVersionUID = 6762799934117390438L; public APSProblem18(double a, double b, double expectedRoot) { super(a, b, expectedRoot); } @@ -267,6 +272,7 @@ } private static class APSProblem19 extends TestProblem { + private static final long serialVersionUID = 4962041891152128524L; private int n; public APSProblem19(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); @@ -278,6 +284,7 @@ } private static class APSProblem20 extends TestProblem { + private static final long serialVersionUID = -7391954140799812791L; private int n; private int oPoMn2; public APSProblem20(int n, double a, double b, double expectedRoot) { @@ -293,6 +300,7 @@ } private static class APSProblem21 extends TestProblem { + private static final long serialVersionUID = -4160028543895639114L; private int n; public APSProblem21(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); @@ -304,6 +312,7 @@ } private static class APSProblem22 extends TestProblem { + private static final long serialVersionUID = 3807046732154081146L; private int n; private int oPoMn4; public APSProblem22(int n, double a, double b, double expectedRoot) { @@ -321,6 +330,7 @@ } private static class APSProblem23 extends TestProblem { + private static final long serialVersionUID = -486669213837396921L; private int n; public APSProblem23(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); @@ -332,6 +342,7 @@ } private static class APSProblem24 extends TestProblem { + private static final long serialVersionUID = -628275471717968182L; private int n; public APSProblem24(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); @@ -343,6 +354,7 @@ } private static class APSProblem25 extends TestProblem { + private static final long serialVersionUID = 5207170686914959073L; private double u; private double v;; public APSProblem25(int n, double a, double b, double expectedRoot) { @@ -356,6 +368,8 @@ } private static class APSProblem26 extends TestProblem { + private static final long serialVersionUID = 1063884352586457076L; + public APSProblem26(double a, double b, double expectedRoot) { super(a, b, expectedRoot); } @@ -381,6 +395,7 @@ } private static class APSProblem27 extends TestProblem { + private static final long serialVersionUID = -3549158218723499035L; private double u; public APSProblem27(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); @@ -395,13 +410,13 @@ } private static class APSProblem28 extends TestProblem { + private static final long serialVersionUID = -8198306839874267863L; private double threshold; - private double yHigh; + private static final double yHigh= Math.exp(1.0) - 1.859; private int u; public APSProblem28(int n, double a, double b, double expectedRoot) { super(a, b, expectedRoot); threshold = 0.002 / (1 + n); - yHigh = Math.exp(1.0) - 1.859; u = (n + 1) * 500; } public double valueAt(double x) { Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/ArrayMapperTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/ArrayMapperTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/ArrayMapperTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/ArrayMapperTest.java Tue Dec 19 14:11:07 2006 @@ -25,13 +25,16 @@ public ArrayMapperTest(String name) { super(name); mapper = null; + b1 = null; + b2 = null; + b3 = null; } public void testDimensionCheck() { int size = b1.getStateDimension(); size += b2.getStateDimension(); size += b3.getStateDimension(); - assertTrue(mapper.getInternalDataArray().length == size); + assertTrue(mapper.getDataArray().length == size); } public void testUpdateObjects() { @@ -69,7 +72,7 @@ mapper.updateArray(); - double[] data = mapper.getInternalDataArray(); + double[] data = mapper.getDataArray(); for (int i = 0; i < 7; ++i) { assertTrue(Math.abs(data [i] - i * 10.0) < 1.0e-10); } @@ -103,7 +106,7 @@ return new TestSuite(ArrayMapperTest.class); } - private class DomainObject implements ArraySliceMappable { + private static class DomainObject implements ArraySliceMappable { private double[] data; Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableArrayTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableArrayTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableArrayTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableArrayTest.java Tue Dec 19 14:11:07 2006 @@ -24,81 +24,39 @@ public MappableArrayTest(String name) { super(name); + array1 = null; + array2 = null; + array3 = null; + mapper = null; } public void testDimensionCheck() { - assertTrue(mapper.getInternalDataArray().length == 9); + assertTrue(mapper.getDataArray().length == 9); } - public void testRealloc() { - - for (int i = 0; i < reusedArray.length; ++i) { - reusedArray[i] = -1.0; - } - - for (int i = 0; i < clonedArray.length; ++i) { - clonedArray[i] = -1.0; - } - - double[] data = new double [mapper.getInternalDataArray().length]; - for (int i = 0; i < data.length; ++i) { - data [i] = i * 0.1; - } - - mapper.updateObjects(data); - - assertTrue(Math.abs(reusedArray[0] - 0.4) < 1.0e-10); - assertTrue(Math.abs(reusedArray[1] - 0.5) < 1.0e-10); - - assertTrue(Math.abs(clonedArray[0] + 1.0) < 1.0e-10); - assertTrue(Math.abs(clonedArray[1] + 1.0) < 1.0e-10); - assertTrue(Math.abs(clonedArray[2] + 1.0) < 1.0e-10); - - } - public void testUpdateObjects() { - double[] data = new double [mapper.getInternalDataArray().length]; + double[] data = new double [mapper.getDataArray().length]; for (int i = 0; i < data.length; ++i) { data [i] = i * 0.1; } mapper.updateObjects(data); - assertTrue(Math.abs(array1.getArray()[0] - 0.0) < 1.0e-10); - assertTrue(Math.abs(array1.getArray()[1] - 0.1) < 1.0e-10); - assertTrue(Math.abs(array1.getArray()[2] - 0.2) < 1.0e-10); - assertTrue(Math.abs(array1.getArray()[3] - 0.3) < 1.0e-10); - - assertTrue(Math.abs(array2.getArray()[0] - 0.4) < 1.0e-10); - assertTrue(Math.abs(array2.getArray()[1] - 0.5) < 1.0e-10); - - assertTrue(Math.abs(array3.getArray()[0] - 0.6) < 1.0e-10); - assertTrue(Math.abs(array3.getArray()[1] - 0.7) < 1.0e-10); - assertTrue(Math.abs(array3.getArray()[2] - 0.8) < 1.0e-10); - - } - - public void testUpdateArray() { - - array1.getArray()[0] = 00.0; - array1.getArray()[1] = 10.0; - array1.getArray()[2] = 20.0; - array1.getArray()[3] = 30.0; - - array2.getArray()[0] = 40.0; - array2.getArray()[1] = 50.0; - - array3.getArray()[0] = 60.0; - array3.getArray()[1] = 70.0; - array3.getArray()[2] = 80.0; - - mapper.updateArray(); - - double[] data = mapper.getInternalDataArray(); - for (int i = 0; i < data.length; ++i) { - assertTrue(Math.abs(data [i] - i * 10.0) < 1.0e-10); - } + double[] a1 = array1.getArray(); + assertTrue(Math.abs(a1[0] - 0.0) < 1.0e-10); + assertTrue(Math.abs(a1[1] - 0.1) < 1.0e-10); + assertTrue(Math.abs(a1[2] - 0.2) < 1.0e-10); + assertTrue(Math.abs(a1[3] - 0.3) < 1.0e-10); + + double[] a2 = array2.getArray(); + assertTrue(Math.abs(a2[0] - 0.4) < 1.0e-10); + assertTrue(Math.abs(a2[1] - 0.5) < 1.0e-10); + + double[] a3 = array3.getArray(); + assertTrue(Math.abs(a3[0] - 0.6) < 1.0e-10); + assertTrue(Math.abs(a3[1] - 0.7) < 1.0e-10); + assertTrue(Math.abs(a3[2] - 0.8) < 1.0e-10); } @@ -108,12 +66,9 @@ public void setUp() { - reusedArray = new double[2]; - clonedArray = new double[3]; - array1 = new MappableArray(4); - array2 = new MappableArray(reusedArray, false); - array3 = new MappableArray(clonedArray, true); + array2 = new MappableArray(new double[2]); + array3 = new MappableArray(new double[3]); mapper = new ArrayMapper(); mapper.manageMappable(array1); @@ -123,24 +78,15 @@ } public void tearDown() { - reusedArray = null; - clonedArray = null; - array1 = null; array2 = null; array3 = null; - mapper = null; - } - private double[] reusedArray; - private double[] clonedArray; - private MappableArray array1; private MappableArray array2; private MappableArray array3; - - private ArrayMapper mapper; + private ArrayMapper mapper; } Modified: jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableScalarTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableScalarTest.java?view=diff&rev=488828&r1=488827&r2=488828 ============================================================================== --- jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableScalarTest.java (original) +++ jakarta/commons/proper/math/trunk/src/mantissa/tests-src/org/spaceroots/mantissa/utilities/MappableScalarTest.java Tue Dec 19 14:11:07 2006 @@ -24,15 +24,19 @@ public MappableScalarTest(String name) { super(name); + mapper = null; + scalar1 = null; + scalar2 = null; + scalar3 = null; } public void testDimensionCheck() { - assertTrue(mapper.getInternalDataArray().length == 3); + assertTrue(mapper.getDataArray().length == 3); } public void testUpdateObjects() { - double[] data = new double [mapper.getInternalDataArray().length]; + double[] data = new double [mapper.getDataArray().length]; for (int i = 0; i < data.length; ++i) { data [i] = i * 0.1; } @@ -53,7 +57,7 @@ mapper.updateArray(); - double[] data = mapper.getInternalDataArray(); + double[] data = mapper.getDataArray(); for (int i = 0; i < data.length; ++i) { assertTrue(Math.abs(data [i] - i * 10.0) < 1.0e-10); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
