mdiggory 2003/07/06 19:12:47 Modified: math/src/test/org/apache/commons/math/stat/univariate/moment MeanTest.java VarianceTest.java KurtosisTest.java StandardDeviationTest.java SkewnessTest.java math/src/test/org/apache/commons/math/stat/univariate UnivariateStatisticAbstractTest.java math/src/test/org/apache/commons/math/stat/univariate/rank MinTest.java MaxTest.java math/src/test/org/apache/commons/math/stat/univariate/summary SumTest.java SumLogTest.java SumSqTest.java ProductTest.java Added: math/src/test/org/apache/commons/math/stat/univariate StorelessUnivariateStatisticAbstractTest.java Log: Adding incremental tests for storeless univariates as evaluations are now based on the implementations that were previously provided by StatUtils. Revision Changes Path 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/MeanTest.java Index: MeanTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/MeanTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MeanTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ MeanTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class MeanTest extends UnivariateStatisticAbstractTest{ +public class MeanTest extends StorelessUnivariateStatisticAbstractTest{ protected Mean stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/VarianceTest.java Index: VarianceTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/VarianceTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VarianceTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ VarianceTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class VarianceTest extends UnivariateStatisticAbstractTest{ +public class VarianceTest extends StorelessUnivariateStatisticAbstractTest{ protected Variance stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/KurtosisTest.java Index: KurtosisTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/KurtosisTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- KurtosisTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ KurtosisTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class KurtosisTest extends UnivariateStatisticAbstractTest{ +public class KurtosisTest extends StorelessUnivariateStatisticAbstractTest{ protected Kurtosis stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/StandardDeviationTest.java Index: StandardDeviationTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/StandardDeviationTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StandardDeviationTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ StandardDeviationTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class StandardDeviationTest extends UnivariateStatisticAbstractTest{ +public class StandardDeviationTest extends StorelessUnivariateStatisticAbstractTest{ protected StandardDeviation stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/SkewnessTest.java Index: SkewnessTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/moment/SkewnessTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SkewnessTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ SkewnessTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class SkewnessTest extends UnivariateStatisticAbstractTest{ +public class SkewnessTest extends StorelessUnivariateStatisticAbstractTest{ protected Skewness stat; 1.2 +1 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/UnivariateStatisticAbstractTest.java Index: UnivariateStatisticAbstractTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/UnivariateStatisticAbstractTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UnivariateStatisticAbstractTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ UnivariateStatisticAbstractTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -124,5 +124,5 @@ getUnivariateStatistic().evaluate(testArray), getTolerance()); } - + } 1.1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/StorelessUnivariateStatisticAbstractTest.java Index: StorelessUnivariateStatisticAbstractTest.java =================================================================== /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Commons", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ package org.apache.commons.math.stat.univariate; import junit.framework.TestCase; /** * Test cases for the [EMAIL PROTECTED] UnivariateStatistic} class. * * @author Mark Diggory */ public abstract class StorelessUnivariateStatisticAbstractTest extends UnivariateStatisticAbstractTest { public StorelessUnivariateStatisticAbstractTest(String name) { super(name); } public abstract UnivariateStatistic getUnivariateStatistic(); public abstract double expectedValue(); public void testIncrementation() throws Exception { StorelessUnivariateStatistic statistic = (StorelessUnivariateStatistic) getUnivariateStatistic(); statistic.clear(); for (int i = 0; i < testArray.length; i++) { statistic.increment(testArray[i]); } assertEquals(expectedValue(), statistic.getValue(), getTolerance()); statistic.clear(); assertTrue(Double.isNaN(statistic.getValue())); } } 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/rank/MinTest.java Index: MinTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/rank/MinTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MinTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ MinTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class MinTest extends UnivariateStatisticAbstractTest{ +public class MinTest extends StorelessUnivariateStatisticAbstractTest{ protected Min stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/rank/MaxTest.java Index: MaxTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/rank/MaxTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MaxTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ MaxTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class MaxTest extends UnivariateStatisticAbstractTest{ +public class MaxTest extends StorelessUnivariateStatisticAbstractTest{ protected Max stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/SumTest.java Index: SumTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/SumTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SumTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ SumTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class SumTest extends UnivariateStatisticAbstractTest{ +public class SumTest extends StorelessUnivariateStatisticAbstractTest{ protected Sum stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/SumLogTest.java Index: SumLogTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/SumLogTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SumLogTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ SumLogTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class SumLogTest extends UnivariateStatisticAbstractTest{ +public class SumLogTest extends StorelessUnivariateStatisticAbstractTest{ protected SumOfLogs stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/SumSqTest.java Index: SumSqTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/SumSqTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SumSqTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ SumSqTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class SumSqTest extends UnivariateStatisticAbstractTest{ +public class SumSqTest extends StorelessUnivariateStatisticAbstractTest{ protected SumOfSquares stat; 1.2 +2 -1 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/ProductTest.java Index: ProductTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/stat/univariate/summary/ProductTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ProductTest.java 5 Jul 2003 18:24:50 -0000 1.1 +++ ProductTest.java 7 Jul 2003 02:12:47 -0000 1.2 @@ -56,6 +56,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.math.stat.univariate.StorelessUnivariateStatisticAbstractTest; import org.apache.commons.math.stat.univariate.UnivariateStatistic; import org.apache.commons.math.stat.univariate.UnivariateStatisticAbstractTest; @@ -64,7 +65,7 @@ * * @author Mark Diggory */ -public class ProductTest extends UnivariateStatisticAbstractTest{ +public class ProductTest extends StorelessUnivariateStatisticAbstractTest{ protected Product stat;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]