Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 9303 invoked from network); 5 Apr 2009 14:21:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Apr 2009 14:21:03 -0000 Received: (qmail 6176 invoked by uid 500); 5 Apr 2009 14:21:02 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 6059 invoked by uid 500); 5 Apr 2009 14:21:02 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 6050 invoked by uid 99); 5 Apr 2009 14:21:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Apr 2009 14:21:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Apr 2009 14:20:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D5012388A69; Sun, 5 Apr 2009 14:20:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r762087 [3/4] - in /commons/proper/math/trunk/src: java/org/apache/commons/math/ java/org/apache/commons/math/analysis/integration/ java/org/apache/commons/math/analysis/polynomials/ java/org/apache/commons/math/analysis/solvers/ java/org/a... Date: Sun, 05 Apr 2009 14:20:23 -0000 To: commits@commons.apache.org From: luc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090405142031.3D5012388A69@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java (original) +++ commons/proper/math/trunk/src/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java Sun Apr 5 14:20:18 2009 @@ -78,6 +78,7 @@ * * Computes and caches QR decomposition of the X matrix */ + @Override public void newSampleData(double[] data, int nobs, int nvars) { super.newSampleData(data, nobs, nvars); qr = new QRDecompositionImpl(X); @@ -124,6 +125,7 @@ * * @param x the [n,k] array representing the x sample */ + @Override protected void newXSampleData(double[][] x) { this.X = new RealMatrixImpl(x); qr = new QRDecompositionImpl(X); @@ -134,6 +136,7 @@ * * @return beta */ + @Override protected RealMatrix calculateBeta() { return solveUpperTriangular(qr.getR(), qr.getQ().transpose().multiply(Y)); } @@ -149,6 +152,7 @@ * * @return The beta variance */ + @Override protected RealMatrix calculateBetaVariance() { int p = X.getColumnDimension(); RealMatrix Raug = qr.getR().getSubMatrix(0, p - 1 , 0, p - 1); @@ -164,6 +168,7 @@ *

* @return The Y variance */ + @Override protected double calculateYVariance() { RealMatrix u = calculateResiduals(); RealMatrix sse = u.transpose().multiply(u); Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/util/ResizableDoubleArray.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/util/ResizableDoubleArray.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/java/org/apache/commons/math/util/ResizableDoubleArray.java (original) +++ commons/proper/math/trunk/src/java/org/apache/commons/math/util/ResizableDoubleArray.java Sun Apr 5 14:20:18 2009 @@ -620,6 +620,7 @@ * @return the internal storage array used by this object * @deprecated replaced by {@link #getInternalValues()} as of 2.0 */ + @Deprecated public synchronized double[] getValues() { return (internalArray); } @@ -841,6 +842,7 @@ * properties as this * @since 2.0 */ + @Override public boolean equals(Object object) { if (object == this ) { return true; @@ -873,6 +875,7 @@ * @return hash code representing this ResizableDoubleArray * @since 2.0 */ + @Override public int hashCode() { int[] hashData = new int[7]; hashData[0] = new Float(expansionFactor).hashCode(); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/RetryTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/RetryTestCase.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/RetryTestCase.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/RetryTestCase.java Sun Apr 5 14:20:18 2009 @@ -43,6 +43,7 @@ /** * Override runTest() to catch AssertionFailedError and retry */ + @Override protected void runTest() throws Throwable { try { super.runTest(); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/solvers/UnivariateRealSolverFactoryImplTest.java Sun Apr 5 14:20:18 2009 @@ -32,6 +32,7 @@ * @throws java.lang.Exception * @see junit.framework.TestCase#tearDown() */ + @Override protected void setUp() throws Exception { super.setUp(); factory = new UnivariateRealSolverFactoryImpl(); @@ -41,6 +42,7 @@ * @throws java.lang.Exception * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { factory = null; super.tearDown(); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatAbstractTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatAbstractTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatAbstractTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatAbstractTest.java Sun Apr 5 14:20:18 2009 @@ -34,7 +34,8 @@ protected abstract Locale getLocale(); protected abstract char getDecimalCharacter(); - + + @Override protected void setUp() throws Exception { complexFormat = ComplexFormat.getInstance(getLocale()); complexFormatJ = ComplexFormat.getInstance(getLocale()); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/complex/ComplexFormatTest.java Sun Apr 5 14:20:18 2009 @@ -21,10 +21,12 @@ public class ComplexFormatTest extends ComplexFormatAbstractTest { + @Override protected char getDecimalCharacter() { return '.'; } + @Override protected Locale getLocale() { return Locale.US; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/complex/FrenchComplexFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/complex/FrenchComplexFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/complex/FrenchComplexFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/complex/FrenchComplexFormatTest.java Sun Apr 5 14:20:18 2009 @@ -21,11 +21,13 @@ public class FrenchComplexFormatTest extends ComplexFormatAbstractTest { - + + @Override protected char getDecimalCharacter() { return ','; } - + + @Override protected Locale getLocale() { return Locale.FRENCH; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -36,39 +36,46 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default discrete distribution instance to use in tests. */ + @Override public IntegerDistribution makeDistribution() { return new BinomialDistributionImpl(10,0.70); } /** Creates the default probability density test input values */ + @Override public int[] makeDensityTestPoints() { return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; } /** Creates the default probability density test expected values */ + @Override public double[] makeDensityTestValues() { return new double[] {0d, 0.0000d, 0.0001d, 0.0014d, 0.0090d, 0.0368d, 0.1029d, 0.2001d, 0.2668d, 0.2335d, 0.1211d, 0.0282d, 0d}; } /** Creates the default cumulative probability density test input values */ + @Override public int[] makeCumulativeTestPoints() { return makeDensityTestPoints(); } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0d, 0.0000d, 0.0001d, 0.0016d, 0.0106d, 0.0473d, 0.1503d, 0.3504d, 0.6172d, 0.8507d, 0.9718d, 1d, 1d}; } /** Creates the default inverse cumulative probability test input values */ + @Override public double[] makeInverseCumulativeTestPoints() { return new double[] {0, 0.001d, 0.010d, 0.025d, 0.050d, 0.100d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d,1}; } /** Creates the default inverse cumulative probability density test expected values */ + @Override public int[] makeInverseCumulativeTestValues() { return new int[] {-1, 1, 2, 3, 4, 4, 9, 9, 9, 8, 8, Integer.MAX_VALUE}; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -37,11 +37,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new CauchyDistributionImpl(1.2, 2.1); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using Mathematica return new double[] {-667.2485619d, -65.6230835d, -25.48302995d, @@ -50,6 +52,7 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.900d, 0.950d, 0.975d, 0.990d, 0.999d}; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -37,11 +37,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new ChiSquaredDistributionImpl(5.0); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using R version 1.8.1 (linux version) return new double[] {0.210216d, 0.5542981d, 0.8312116d, 1.145476d, 1.610308d, @@ -49,18 +51,21 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d}; } /** Creates the default inverse cumulative probability test input values */ + @Override public double[] makeInverseCumulativeTestPoints() { return new double[] {0, 0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d, 1}; } /** Creates the default inverse cumulative probability density test expected values */ + @Override public double[] makeInverseCumulativeTestValues() { return new double[] {0, 0.210216d, 0.5542981d, 0.8312116d, 1.145476d, 1.610308d, 20.51501d, 15.08627d, 12.83250d, 11.07050d, 9.236357d, @@ -68,6 +73,7 @@ } // --------------------- Override tolerance -------------- + @Override protected void setUp() throws Exception { super.setUp(); setTolerance(5e-6); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java Sun Apr 5 14:20:18 2009 @@ -112,6 +112,7 @@ /** * Setup sets all test instance data to default values */ + @Override protected void setUp() throws Exception { super.setUp(); distribution = makeDistribution(); @@ -124,6 +125,7 @@ /** * Cleans up test instance data */ + @Override protected void tearDown() throws Exception { super.tearDown(); distribution = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -38,11 +38,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new ExponentialDistributionImpl(5.0); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using R version 1.8.1 (linux version) return new double[] {0.005002502d, 0.05025168d, 0.1265890d, 0.2564665d, 0.5268026d, @@ -50,6 +52,7 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d}; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -37,11 +37,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new FDistributionImpl(5.0, 6.0); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using R version 1.8.1 (linux version) return new double[] {0.03468084d ,0.09370091d, 0.1433137d, @@ -50,12 +52,14 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d}; } // --------------------- Override tolerance -------------- + @Override protected void setUp() throws Exception { super.setUp(); setTolerance(4e-6); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -37,11 +37,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new GammaDistributionImpl(4d, 2d); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using R version 1.8.1 (linux version) return new double[] {0.8571048, 1.646497, 2.179731, 2.732637, @@ -50,12 +52,14 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d}; } // --------------------- Override tolerance -------------- + @Override protected void setUp() throws Exception { super.setUp(); setTolerance(6e-6); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -39,39 +39,46 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default discrete distribution instance to use in tests. */ + @Override public IntegerDistribution makeDistribution() { return new HypergeometricDistributionImpl(10,5, 5); } /** Creates the default probability density test input values */ + @Override public int[] makeDensityTestPoints() { return new int[] {-1, 0, 1, 2, 3, 4, 5, 10}; } /** Creates the default probability density test expected values */ + @Override public double[] makeDensityTestValues() { return new double[] {0d, 0.003968d, 0.099206d, 0.396825d, 0.396825d, 0.099206d, 0.003968d, 0d}; } /** Creates the default cumulative probability density test input values */ + @Override public int[] makeCumulativeTestPoints() { return makeDensityTestPoints(); } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0d, .003968d, .103175d, .50000d, .896825d, .996032d, 1.00000d, 1d}; } /** Creates the default inverse cumulative probability test input values */ + @Override public double[] makeInverseCumulativeTestPoints() { return new double[] {0d, 0.001d, 0.010d, 0.025d, 0.050d, 0.100d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d, 1d}; } /** Creates the default inverse cumulative probability density test expected values */ + @Override public int[] makeInverseCumulativeTestValues() { return new int[] {-1, -1, 0, 0, 0, 0, 4, 3, 3, 3, 3, 5}; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java Sun Apr 5 14:20:18 2009 @@ -105,6 +105,7 @@ /** * Setup sets all test instance data to default values */ + @Override protected void setUp() throws Exception { super.setUp(); distribution = makeDistribution(); @@ -119,6 +120,7 @@ /** * Cleans up test instance data */ + @Override protected void tearDown() throws Exception { super.tearDown(); distribution = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -37,11 +37,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new NormalDistributionImpl(2.1, 1.4); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using R return new double[] {-2.226325d, -1.156887d, -0.6439496d, -0.2027951d, 0.3058278d, @@ -49,12 +51,14 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d}; } // --------------------- Override tolerance -------------- + @Override protected void setUp() throws Exception { super.setUp(); setTolerance(1E-6); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -36,39 +36,46 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default discrete distribution instance to use in tests. */ + @Override public IntegerDistribution makeDistribution() { return new PascalDistributionImpl(10,0.70); } /** Creates the default probability density test input values */ + @Override public int[] makeDensityTestPoints() { return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; } /** Creates the default probability density test expected values */ + @Override public double[] makeDensityTestValues() { return new double[] {0d, 0.02824d, 0.08474d, 0.13982d, 0.16779d, 0.16359d, 0.1374d, 0.10306d, 0.070673d, 0.04505d, 0.02703d, 0.01540d, 0.0084}; } /** Creates the default cumulative probability density test input values */ + @Override public int[] makeCumulativeTestPoints() { return makeDensityTestPoints(); } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0d, 0.02824d, 0.11299d, 0.25281d, 0.42060d, 0.58420d, 0.72162d, 0.82468d, 0.89535d, 0.94041d, 0.967446d, 0.98285, 0.99125d}; } /** Creates the default inverse cumulative probability test input values */ + @Override public double[] makeInverseCumulativeTestPoints() { return new double[] {0, 0.001d, 0.010d, 0.025d, 0.050d, 0.100d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d, 1}; } /** Creates the default inverse cumulative probability density test expected values */ + @Override public int[] makeInverseCumulativeTestValues() { return new int[] {-1, -1, -1, -1, 0, 0, 13, 10, 9, 8, 7, Integer.MAX_VALUE}; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -42,6 +42,7 @@ /** * Creates the default discrete distribution instance to use in tests. */ + @Override public IntegerDistribution makeDistribution() { return new PoissonDistributionImpl(DEFAULT_TEST_POISSON_PARAMETER); } @@ -49,6 +50,7 @@ /** * Creates the default probability density test input values. */ + @Override public int[] makeDensityTestPoints() { return new int[] { -1, 0, 1, 2, 3, 4, 5, 10, 20}; } @@ -57,6 +59,7 @@ * Creates the default probability density test expected values. * These and all other test values are generated by R, version 1.8.1 */ + @Override public double[] makeDensityTestValues() { return new double[] { 0d, 0.0183156388887d, 0.073262555555d, 0.14652511111d, 0.195366814813d, 0.195366814813, @@ -66,6 +69,7 @@ /** * Creates the default cumulative probability density test input values. */ + @Override public int[] makeCumulativeTestPoints() { return new int[] { -1, 0, 1, 2, 3, 4, 5, 10, 20 }; } @@ -73,6 +77,7 @@ /** * Creates the default cumulative probability density test expected values. */ + @Override public double[] makeCumulativeTestValues() { return new double[] { 0d, 0.0183156388887d, 0.0915781944437d, 0.238103305554d, 0.433470120367d, 0.62883693518, @@ -85,6 +90,7 @@ * probabilities for corresponding values exceeds the target value (still * within tolerance). */ + @Override public double[] makeInverseCumulativeTestPoints() { return new double[] { 0d, 0.018315638889d, 0.0915781944437d, 0.238103305554d, 0.433470120367d, 0.62883693518, @@ -94,6 +100,7 @@ /** * Creates the default inverse cumulative probability density test expected values. */ + @Override public int[] makeInverseCumulativeTestValues() { return new int[] { -1, 0, 1, 2, 3, 4, 5, 10, 20}; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -36,11 +36,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new TDistributionImpl(5.0); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using R version 1.8.1 (linux version) return new double[] {-5.89343,-3.36493, -2.570582, -2.015048, @@ -49,12 +51,14 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.5d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d}; } // --------------------- Override tolerance -------------- + @Override protected void setUp() throws Exception { super.setUp(); setTolerance(1E-6); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -37,11 +37,13 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default continuous distribution instance to use in tests. */ + @Override public ContinuousDistribution makeDistribution() { return new WeibullDistributionImpl(1.2, 2.1); } /** Creates the default cumulative probability distribution test input values */ + @Override public double[] makeCumulativeTestPoints() { // quantiles computed using Mathematica return new double[] {0.00664355181d, 0.04543282833d, 0.09811627374d, @@ -50,6 +52,7 @@ } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0.001d, 0.01d, 0.025d, 0.05d, 0.1d, 0.900d, 0.950d, 0.975d, 0.990d, 0.999d}; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ZipfDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ZipfDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ZipfDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ZipfDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -32,39 +32,46 @@ //-------------- Implementations for abstract methods ----------------------- /** Creates the default discrete distribution instance to use in tests. */ + @Override public IntegerDistribution makeDistribution() { return new ZipfDistributionImpl(10, 1); } /** Creates the default probability density test input values */ + @Override public int[] makeDensityTestPoints() { return new int[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; } /** Creates the default probability density test expected values */ + @Override public double[] makeDensityTestValues() { return new double[] {0d, 0d, 0.3414d, 0.1707d, 0.1138d, 0.0854d, 0.0683d, 0.0569d, 0.0488d, 0.0427d, 0.0379d, 0.0341d, 0d}; } /** Creates the default cumulative probability density test input values */ + @Override public int[] makeCumulativeTestPoints() { return makeDensityTestPoints(); } /** Creates the default cumulative probability density test expected values */ + @Override public double[] makeCumulativeTestValues() { return new double[] {0d, 0.0000d, 0.3414d, 0.5121d, 0.6259d, 0.7113d, 0.7796d, 0.8365d, 0.8852d, 0.9279d, 0.9659d, 1d, 1d}; } /** Creates the default inverse cumulative probability test input values */ + @Override public double[] makeInverseCumulativeTestPoints() { return new double[] {0, 0.001d, 0.010d, 0.025d, 0.050d, 0.3414d, 0.3415d, 0.999d, 0.990d, 0.975d, 0.950d, 0.900d, 1}; } /** Creates the default inverse cumulative probability density test expected values */ + @Override public int[] makeInverseCumulativeTestValues() { return new int[] {0, 0, 0, 0, 0, 0, 1, 9, 9, 9, 8, 7, 10}; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/GaussNewtonEstimatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/GaussNewtonEstimatorTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/GaussNewtonEstimatorTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/GaussNewtonEstimatorTest.java Sun Apr 5 14:20:18 2009 @@ -591,6 +591,7 @@ setIgnored(false); } + @Override public double getTheoreticalValue() { double v = 0; for (int i = 0; i < factors.length; ++i) { @@ -599,6 +600,7 @@ return v; } + @Override public double getPartial(EstimatedParameter parameter) { for (int i = 0; i < parameters.length; ++i) { if (parameters[i] == parameter) { @@ -686,6 +688,7 @@ this.py = py; } + @Override public double getPartial(EstimatedParameter parameter) { if (parameter == cx) { return getPartialDiX() - getPartialRadiusX(); @@ -709,6 +712,7 @@ return (cy.getEstimate() - py) / getCenterDistance(); } + @Override public double getTheoreticalValue() { return getCenterDistance() - getRadius(); } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/LevenbergMarquardtEstimatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/LevenbergMarquardtEstimatorTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/LevenbergMarquardtEstimatorTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/LevenbergMarquardtEstimatorTest.java Sun Apr 5 14:20:18 2009 @@ -636,6 +636,7 @@ this.parameters = parameters; } + @Override public double getTheoreticalValue() { double v = 0; for (int i = 0; i < factors.length; ++i) { @@ -644,6 +645,7 @@ return v; } + @Override public double getPartial(EstimatedParameter parameter) { for (int i = 0; i < parameters.length; ++i) { if (parameters[i] == parameter) { @@ -731,6 +733,7 @@ this.py = py; } + @Override public double getPartial(EstimatedParameter parameter) { if (parameter == cx) { return getPartialDiX() - getPartialRadiusX(); @@ -754,6 +757,7 @@ return (cy.getEstimate() - py) / getCenterDistance(); } + @Override public double getTheoreticalValue() { return getCenterDistance() - getRadius(); } @@ -826,10 +830,12 @@ this.x = x; } + @Override public double getTheoreticalValue() { return theoreticalValue(x); } + @Override public double getPartial(EstimatedParameter parameter) { return partial(x, parameter); } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/MinpackTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/MinpackTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/MinpackTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/MinpackTest.java Sun Apr 5 14:20:18 2009 @@ -610,6 +610,7 @@ this.index = index; } + @Override public double getTheoreticalValue() { // this is obviously NOT efficient as we recompute the whole vector // each time we need only one element, but it is only for test @@ -618,6 +619,7 @@ return getResiduals()[index]; } + @Override public double getPartial(EstimatedParameter parameter) { // this is obviously NOT efficient as we recompute the whole jacobian // each time we need only one element, but it is only for test @@ -656,6 +658,7 @@ theoreticalMinCost, buildArray(n, -1.0)); } + @Override protected double[][] getJacobian() { double t = 2.0 / m; double[][] jacobian = new double[m][]; @@ -668,6 +671,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double sum = 0; for (int i = 0; i < n; ++i) { @@ -692,6 +696,7 @@ super(m, buildArray(n, x0), theoreticalStartCost, theoreticalMinCost, null); } + @Override protected double[][] getJacobian() { double[][] jacobian = new double[m][]; for (int i = 0; i < m; ++i) { @@ -703,6 +708,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double[] f = new double[m]; double sum = 0; @@ -726,6 +732,7 @@ null); } + @Override protected double[][] getJacobian() { double[][] jacobian = new double[m][]; for (int i = 0; i < m; ++i) { @@ -745,6 +752,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double[] f = new double[m]; double sum = 0; @@ -766,11 +774,13 @@ super(2, startParams, theoreticalStartCost, 0.0, buildArray(2, 1.0)); } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); return new double[][] { { -20 * x1, 10 }, { -1, 0 } }; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -787,6 +797,7 @@ new double[] { 1.0, 0.0, 0.0 }); } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -800,6 +811,7 @@ }; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -832,6 +844,7 @@ super(4, startParams, theoreticalStartCost, 0.0, buildArray(4, 0.0)); } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -845,6 +858,7 @@ }; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -873,6 +887,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double x2 = parameters[1].getEstimate(); return new double[][] { @@ -881,6 +896,7 @@ }; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -902,6 +918,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double x2 = parameters[1].getEstimate(); double x3 = parameters[2].getEstimate(); @@ -917,6 +934,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -953,6 +971,7 @@ } } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -970,6 +989,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1007,6 +1027,7 @@ } } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1022,6 +1043,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1052,6 +1074,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double[][] jacobian = new double[m][]; @@ -1084,6 +1107,7 @@ } + @Override protected double[] getResiduals() { double[] f = new double[m]; for (int i = 0; i < (m - 2); ++i) { @@ -1122,6 +1146,7 @@ 0.0, new double[] { 1.0, 10.0, 1.0 }); } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1137,6 +1162,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1162,6 +1188,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1173,6 +1200,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1196,6 +1224,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1214,6 +1243,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1250,6 +1280,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double[][] jacobian = new double[m][]; @@ -1279,6 +1310,7 @@ } + @Override protected double[] getResiduals() { double[] f = new double[m]; @@ -1321,6 +1353,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double[][] jacobian = new double[m][]; for (int i = 0; i < m; ++i) { @@ -1355,6 +1388,7 @@ } + @Override protected double[] getResiduals() { double[] f = new double[m]; double sum = -(n + 1); @@ -1382,6 +1416,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double x2 = parameters[1].getEstimate(); double x3 = parameters[2].getEstimate(); @@ -1399,6 +1434,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x1 = parameters[0].getEstimate(); double x2 = parameters[1].getEstimate(); @@ -1433,6 +1469,7 @@ theoreticalMinCost, theoreticalMinParams); } + @Override protected double[][] getJacobian() { double x01 = parameters[0].getEstimate(); double x02 = parameters[1].getEstimate(); @@ -1469,6 +1506,7 @@ return jacobian; } + @Override protected double[] getResiduals() { double x01 = parameters[0].getEstimate(); double x02 = parameters[1].getEstimate(); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/WeightedMeasurementTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/WeightedMeasurementTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/WeightedMeasurementTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/estimation/WeightedMeasurementTest.java Sun Apr 5 14:20:18 2009 @@ -70,11 +70,13 @@ return new TestSuite(WeightedMeasurementTest.class); } + @Override public void setUp() { p1 = new EstimatedParameter("p1", 1.0); p2 = new EstimatedParameter("p2", 2.0); } + @Override public void tearDown() { p1 = null; p2 = null; @@ -107,10 +109,12 @@ this.testInstance = testInstance; } + @Override public double getTheoreticalValue() { return testInstance.theoretical(); } + @Override public double getPartial(EstimatedParameter p) { return testInstance.partial(p); } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/BigFractionFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/BigFractionFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/BigFractionFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/BigFractionFormatTest.java Sun Apr 5 14:20:18 2009 @@ -34,6 +34,7 @@ return Locale.getDefault(); } + @Override protected void setUp() throws Exception { properFormat = BigFractionFormat.getProperInstance(getLocale()); improperFormat = BigFractionFormat.getImproperInstance(getLocale()); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/FractionFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/FractionFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/FractionFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/fraction/FractionFormatTest.java Sun Apr 5 14:20:18 2009 @@ -32,6 +32,7 @@ return Locale.getDefault(); } + @Override protected void setUp() throws Exception { properFormat = FractionFormat.getProperInstance(getLocale()); improperFormat = FractionFormat.getImproperInstance(getLocale()); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/FrenchVector3DFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/FrenchVector3DFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/FrenchVector3DFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/FrenchVector3DFormatTest.java Sun Apr 5 14:20:18 2009 @@ -21,11 +21,13 @@ public class FrenchVector3DFormatTest extends Vector3DFormatAbstractTest { - + + @Override protected char getDecimalCharacter() { return ','; } - + + @Override protected Locale getLocale() { return Locale.FRENCH; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatAbstractTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatAbstractTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatAbstractTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatAbstractTest.java Sun Apr 5 14:20:18 2009 @@ -34,7 +34,8 @@ protected abstract Locale getLocale(); protected abstract char getDecimalCharacter(); - + + @Override protected void setUp() throws Exception { vector3DFormat = Vector3DFormat.getInstance(getLocale()); final NumberFormat nf = NumberFormat.getInstance(getLocale()); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/geometry/Vector3DFormatTest.java Sun Apr 5 14:20:18 2009 @@ -21,10 +21,13 @@ public class Vector3DFormatTest extends Vector3DFormatAbstractTest { + + @Override protected char getDecimalCharacter() { return '.'; } - + + @Override protected Locale getLocale() { return Locale.US; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/BigMatrixImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/BigMatrixImplTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/BigMatrixImplTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/BigMatrixImplTest.java Sun Apr 5 14:20:18 2009 @@ -99,10 +99,6 @@ super(name); } - public void setUp() { - - } - public static Test suite() { TestSuite suite = new TestSuite(BigMatrixImplTest.class); suite.setName("BigMatrixImpl Tests"); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/DenseRealMatrixTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/DenseRealMatrixTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/DenseRealMatrixTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/DenseRealMatrixTest.java Sun Apr 5 14:20:18 2009 @@ -98,10 +98,6 @@ super(name); } - public void setUp() { - - } - public static Test suite() { TestSuite suite = new TestSuite(DenseRealMatrixTest.class); suite.setName("DenseRealMatrix Tests"); @@ -1162,6 +1158,7 @@ private static class SetVisitor extends DefaultRealMatrixChangingVisitor { private static final long serialVersionUID = 1773444180892369386L; + @Override public double visit(int i, int j, double value) { return i + j / 1024.0; } @@ -1170,6 +1167,7 @@ private static class GetVisitor extends DefaultRealMatrixPreservingVisitor { private static final long serialVersionUID = -7745543227178932689L; private int count = 0; + @Override public void visit(int i, int j, double value) { ++count; assertEquals(i + j / 1024.0, value, 0.0); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java Sun Apr 5 14:20:18 2009 @@ -21,11 +21,13 @@ public class FrenchRealVectorFormatTest extends RealVectorFormatAbstractTest { - + + @Override protected char getDecimalCharacter() { return ','; } - + + @Override protected Locale getLocale() { return Locale.FRENCH; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/MatrixUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/MatrixUtilsTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/MatrixUtilsTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/MatrixUtilsTest.java Sun Apr 5 14:20:18 2009 @@ -53,9 +53,7 @@ super(name); } - public void setUp() { - } - + public static Test suite() { TestSuite suite = new TestSuite(MatrixUtilsTest.class); suite.setName("MatrixUtils Tests"); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealMatrixImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealMatrixImplTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealMatrixImplTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealMatrixImplTest.java Sun Apr 5 14:20:18 2009 @@ -96,10 +96,6 @@ super(name); } - public void setUp() { - - } - public static Test suite() { TestSuite suite = new TestSuite(RealMatrixImplTest.class); suite.setName("RealMatrixImpl Tests"); @@ -940,6 +936,7 @@ private static class SetVisitor extends DefaultRealMatrixChangingVisitor { private static final long serialVersionUID = -5082825244208703349L; + @Override public double visit(int i, int j, double value) { return i + j / 1024.0; } @@ -948,6 +945,7 @@ private static class GetVisitor extends DefaultRealMatrixPreservingVisitor { private static final long serialVersionUID = 849639072339030818L; private int count = 0; + @Override public void visit(int i, int j, double value) { ++count; assertEquals(i + j / 1024.0, value, 0.0); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java Sun Apr 5 14:20:18 2009 @@ -34,8 +34,9 @@ protected abstract Locale getLocale(); protected abstract char getDecimalCharacter(); - - protected void setUp() throws Exception { + + @Override + public void setUp() throws Exception { realVectorFormat = RealVectorFormat.getInstance(getLocale()); final NumberFormat nf = NumberFormat.getInstance(getLocale()); nf.setMaximumFractionDigits(2); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/RealVectorFormatTest.java Sun Apr 5 14:20:18 2009 @@ -21,10 +21,13 @@ public class RealVectorFormatTest extends RealVectorFormatAbstractTest { + + @Override protected char getDecimalCharacter() { return '.'; } - + + @Override protected Locale getLocale() { return Locale.US; } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/SparseRealMatrixTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/SparseRealMatrixTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/SparseRealMatrixTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/SparseRealMatrixTest.java Sun Apr 5 14:20:18 2009 @@ -109,10 +109,6 @@ super(name); } - public void setUp() { - - } - public static Test suite() { TestSuite suite = new TestSuite(SparseRealMatrixTest.class); suite.setName("SparseRealMatrix Tests"); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenDecompositionImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenDecompositionImplTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenDecompositionImplTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenDecompositionImplTest.java Sun Apr 5 14:20:18 2009 @@ -314,6 +314,7 @@ return found; } + @Override public void setUp() { refValues = new double[] { 2.003, 2.002, 2.001, 1.001, 1.000, 0.001 @@ -321,6 +322,7 @@ matrix = createTestMatrix(new Random(35992629946426l), refValues); } + @Override public void tearDown() { refValues = null; matrix = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenSolverTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenSolverTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenSolverTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/EigenSolverTest.java Sun Apr 5 14:20:18 2009 @@ -161,6 +161,7 @@ } + @Override public void setUp() { refValues = new double[] { 2.003, 2.002, 2.001, 1.001, 1.000, 0.001 @@ -168,6 +169,7 @@ matrix = EigenDecompositionImplTest.createTestMatrix(new Random(35992629946426l), refValues); } + @Override public void tearDown() { refValues = null; matrix = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRDecompositionImplTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRDecompositionImplTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRDecompositionImplTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRDecompositionImplTest.java Sun Apr 5 14:20:18 2009 @@ -173,6 +173,7 @@ private void checkUpperTriangular(RealMatrix m) { m.walkInOptimizedOrder(new DefaultRealMatrixPreservingVisitor() { private static final long serialVersionUID = -7685630069569815930L; + @Override public void visit(int row, int column, double value) { if (column < row) { assertEquals(0.0, value, entryTolerance); @@ -209,6 +210,7 @@ private void checkTrapezoidal(RealMatrix m) { m.walkInOptimizedOrder(new DefaultRealMatrixPreservingVisitor() { private static final long serialVersionUID = -43649044361860701L; + @Override public void visit(int row, int column, double value) { if (column > row) { assertEquals(0.0, value, entryTolerance); @@ -257,6 +259,7 @@ RealMatrix m = MatrixUtils.createRealMatrix(rows, columns); m.walkInOptimizedOrder(new DefaultRealMatrixChangingVisitor(){ private static final long serialVersionUID = -556118291433400034L; + @Override public double visit(int row, int column, double value) throws MatrixVisitorException { return 2.0 * r.nextDouble() - 1.0; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRSolverTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRSolverTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRSolverTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/linear/decomposition/QRSolverTest.java Sun Apr 5 14:20:18 2009 @@ -200,6 +200,7 @@ final double noise = 0.001; b.walkInOptimizedOrder(new DefaultRealMatrixChangingVisitor() { private static final long serialVersionUID = 3533849820776962636L; + @Override public double visit(int row, int column, double value) { return value * (1.0 + noise * (2 * r.nextDouble() - 1)); } @@ -232,6 +233,7 @@ RealMatrix m = MatrixUtils.createRealMatrix(rows, columns); m.walkInOptimizedOrder(new DefaultRealMatrixChangingVisitor(){ private static final long serialVersionUID = -556118291433400034L; + @Override public double visit(int row, int column, double value) throws MatrixVisitorException { return 2.0 * r.nextDouble() - 1.0; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java Sun Apr 5 14:20:18 2009 @@ -182,6 +182,7 @@ return new TestSuite(ContinuousOutputModelTest.class); } + @Override public void setUp() { pb = new TestProblem3(0.9); double minStep = 0; @@ -189,6 +190,7 @@ integ = new DormandPrince54Integrator(minStep, maxStep, 1.0e-8, 1.0e-8); } + @Override public void tearDown() { pb = null; integ = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java Sun Apr 5 14:20:18 2009 @@ -66,10 +66,12 @@ * Clone operation. * @return a copy of the instance */ + @Override public Object clone() { return new TestProblem1(this); } + @Override public void doComputeDerivatives(double t, double[] y, double[] yDot) { // compute the derivatives @@ -78,6 +80,7 @@ } + @Override public double[] computeTheoreticalState(double t) { double c = Math.exp (t0 - t); for (int i = 0; i < n; ++i) { Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java Sun Apr 5 14:20:18 2009 @@ -67,10 +67,12 @@ * Clone operation. * @return a copy of the instance */ + @Override public Object clone() { return new TestProblem2(this); } + @Override public void doComputeDerivatives(double t, double[] y, double[] yDot) { // compute the derivatives @@ -79,6 +81,7 @@ } + @Override public double[] computeTheoreticalState(double t) { double t2 = t * t; double c = t2 + 2 * (Math.exp (-0.5 * t2) - 1); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java Sun Apr 5 14:20:18 2009 @@ -82,10 +82,12 @@ * Clone operation. * @return a copy of the instance */ + @Override public Object clone() { return new TestProblem3(this); } + @Override public void doComputeDerivatives(double t, double[] y, double[] yDot) { // current radius @@ -100,6 +102,7 @@ } + @Override public double[] computeTheoreticalState(double t) { // solve Kepler's equation Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java Sun Apr 5 14:20:18 2009 @@ -72,19 +72,23 @@ * Clone operation. * @return a copy of the instance */ + @Override public Object clone() { return new TestProblem4(this); } + @Override public EventHandler[] getEventsHandlers() { return new EventHandler[] { new Bounce(), new Stop() }; } + @Override public void doComputeDerivatives(double t, double[] y, double[] yDot) { yDot[0] = y[1]; yDot[1] = -y[0]; } + @Override public double[] computeTheoreticalState(double t) { double sin = Math.sin(t + a); double cos = Math.cos(t + a); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java Sun Apr 5 14:20:18 2009 @@ -85,6 +85,7 @@ * Clone operation. * @return a copy of the instance */ + @Override public abstract Object clone(); /** Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java Sun Apr 5 14:20:18 2009 @@ -134,6 +134,7 @@ public BadStepInterpolator(double[] y, boolean forward) { super(y, forward); } + @Override protected void doFinalize() throws DerivativeException { throw new DerivativeException(null); @@ -180,6 +181,7 @@ protected ErrorGeneratingInterpolator(double[] y, boolean forward) { super(y, forward); } + @Override public void computeInterpolatedState(double theta, double oneMinusThetaH) throws DerivativeException { throw new DerivativeException(null); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java Sun Apr 5 14:20:18 2009 @@ -100,6 +100,7 @@ return new TestSuite(StepNormalizerTest.class); } + @Override public void setUp() { pb = new TestProblem3(0.9); double minStep = 0; @@ -108,6 +109,7 @@ lastSeen = false; } + @Override public void tearDown() { pb = null; integ = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java Sun Apr 5 14:20:18 2009 @@ -649,6 +649,7 @@ buildArray(n, -1.0)); } + @Override public double[][] jacobian(double[] variables) { double t = 2.0 / m; double[][] jacobian = new double[m][]; @@ -661,6 +662,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double sum = 0; for (int i = 0; i < n; ++i) { @@ -687,6 +689,7 @@ super(m, buildArray(n, x0), theoreticalMinCost, null); } + @Override public double[][] jacobian(double[] variables) { double[][] jacobian = new double[m][]; for (int i = 0; i < m; ++i) { @@ -698,6 +701,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double[] f = new double[m]; double sum = 0; @@ -722,6 +726,7 @@ null); } + @Override public double[][] jacobian(double[] variables) { double[][] jacobian = new double[m][]; for (int i = 0; i < m; ++i) { @@ -741,6 +746,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double[] f = new double[m]; double sum = 0; @@ -764,11 +770,13 @@ super(2, startParams, 0.0, buildArray(2, 1.0)); } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; return new double[][] { { -20 * x1, 10 }, { -1, 0 } }; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -786,6 +794,7 @@ super(3, startParams, 0.0, new double[] { 1.0, 0.0, 0.0 }); } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -799,6 +808,7 @@ }; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -833,6 +843,7 @@ super(4, startParams, 0.0, buildArray(4, 0.0)); } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -846,6 +857,7 @@ }; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -876,6 +888,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double x2 = variables[1]; return new double[][] { @@ -884,6 +897,7 @@ }; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -907,6 +921,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double x2 = variables[1]; double x3 = variables[2]; @@ -922,6 +937,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -960,6 +976,7 @@ } } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -977,6 +994,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1016,6 +1034,7 @@ } } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1031,6 +1050,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1063,6 +1083,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double[][] jacobian = new double[m][]; @@ -1095,6 +1116,7 @@ } + @Override public double[] value(double[] variables) { double[] f = new double[m]; for (int i = 0; i < (m - 2); ++i) { @@ -1135,6 +1157,7 @@ new double[] { 1.0, 10.0, 1.0 }); } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1150,6 +1173,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1177,6 +1201,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1188,6 +1213,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1213,6 +1239,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1231,6 +1258,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1269,6 +1297,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double[][] jacobian = new double[m][]; @@ -1298,6 +1327,7 @@ } + @Override public double[] value(double[] variables) { double[] f = new double[m]; @@ -1342,6 +1372,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double[][] jacobian = new double[m][]; for (int i = 0; i < m; ++i) { @@ -1375,6 +1406,7 @@ } + @Override public double[] value(double[] variables) { double[] f = new double[m]; double sum = -(n + 1); @@ -1404,6 +1436,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double x2 = variables[1]; double x3 = variables[2]; @@ -1421,6 +1454,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x1 = variables[0]; double x2 = variables[1]; @@ -1457,6 +1491,7 @@ theoreticalMinParams); } + @Override public double[][] jacobian(double[] variables) { double x01 = variables[0]; double x02 = variables[1]; @@ -1493,6 +1528,7 @@ return jacobian; } + @Override public double[] value(double[] variables) { double x01 = variables[0]; double x02 = variables[1]; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/AbstractRandomGeneratorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/AbstractRandomGeneratorTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/AbstractRandomGeneratorTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/AbstractRandomGeneratorTest.java Sun Apr 5 14:20:18 2009 @@ -42,6 +42,7 @@ return suite; } + @Override public void testNextInt() { try { testGenerator.nextInt(-1); @@ -68,6 +69,7 @@ testStatistic.chiSquare(expected,observed) < 16.27); } + @Override public void testNextLong() { long q1 = Long.MAX_VALUE/4; long q2 = 2 * q1; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java Sun Apr 5 14:20:18 2009 @@ -98,6 +98,7 @@ } + @Override public void setUp() { try { mean = new double[] { 0.0, 1.0, -3.0, 2.3}; @@ -134,6 +135,7 @@ } } + @Override public void tearDown() { mean = null; covariance = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/EmpiricalDistributionTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/EmpiricalDistributionTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/EmpiricalDistributionTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/EmpiricalDistributionTest.java Sun Apr 5 14:20:18 2009 @@ -49,6 +49,7 @@ super(name); } + @Override public void setUp() throws IOException { empiricalDistribution = new EmpiricalDistributionImpl(100); url = getClass().getResource("testData.txt"); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/RandomDataTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/RandomDataTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/RandomDataTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/RandomDataTest.java Sun Apr 5 14:20:18 2009 @@ -48,9 +48,6 @@ protected RandomDataImpl randomData = null; protected ChiSquareTestImpl testStatistic = new ChiSquareTestImpl(); - public void setUp() { - } - public static Test suite() { TestSuite suite = new TestSuite(RandomDataTest.class); suite.setName("RandomData Tests"); Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/TestRandomGenerator.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/TestRandomGenerator.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/TestRandomGenerator.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/TestRandomGenerator.java Sun Apr 5 14:20:18 2009 @@ -28,12 +28,14 @@ private static final long serialVersionUID = -9161426374178114548L; private Random random = new Random(); - + + @Override public void setSeed(long seed) { clear(); random.setSeed(seed); } - + + @Override public double nextDouble() { return random.nextDouble(); } Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java Sun Apr 5 14:20:18 2009 @@ -59,6 +59,7 @@ } + @Override public void setUp() { mean = new double[] {0.0, 1.0, -3.0, 2.3}; standardDeviation = new double[] {1.0, 2.0, 10.0, 0.1}; @@ -69,6 +70,7 @@ new GaussianRandomGenerator(rg)); } + @Override public void tearDown() { mean = null; standardDeviation = null; Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/random/ValueServerTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/random/ValueServerTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/random/ValueServerTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/random/ValueServerTest.java Sun Apr 5 14:20:18 2009 @@ -39,6 +39,7 @@ super(name); } + @Override public void setUp() { vs.setMode(ValueServer.DIGEST_MODE); try { Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/stat/CertifiedDataTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/stat/CertifiedDataTest.java?rev=762087&r1=762086&r2=762087&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/org/apache/commons/math/stat/CertifiedDataTest.java (original) +++ commons/proper/math/trunk/src/test/org/apache/commons/math/stat/CertifiedDataTest.java Sun Apr 5 14:20:18 2009 @@ -44,12 +44,6 @@ super(name); } - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - public void setUp() { - } - /** * @return The test suite */