commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject cvs commit: jakarta-commons/math/src/test/org/apache/commons/math/distribution BinomialDistributionTest.java
Date Tue, 11 May 2004 02:11:15 GMT
psteitz     2004/05/10 19:11:15

  Modified:    math/src/test/org/apache/commons/math/distribution
                        BinomialDistributionTest.java
  Log:
  Modified to extend DiscreteDistributionAbstractTest. Added degenerate test cases.
  
  Revision  Changes    Path
  1.13      +76 -112   jakarta-commons/math/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java
  
  Index: BinomialDistributionTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/math/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BinomialDistributionTest.java	21 Feb 2004 21:35:17 -0000	1.12
  +++ BinomialDistributionTest.java	11 May 2004 02:11:15 -0000	1.13
  @@ -15,127 +15,91 @@
    */
   package org.apache.commons.math.distribution;
   
  -import org.apache.commons.math.MathException;
  -
  -import junit.framework.TestCase;
  -
   /**
  + * Test cases for BinomialDistribution.
  + * Extends DiscreteDistributionAbstractTest.  See class javadoc for
  + * DiscreteDistributionAbstractTest for details.
  + * 
    * @version $Revision$ $Date$
    */
  -public class BinomialDistributionTest extends TestCase {
  -    private BinomialDistribution b;
  -
  +public class BinomialDistributionTest extends DiscreteDistributionAbstractTest {
  +    
       /**
  -     * Constructor for ChiSquareDistributionTest.
  +     * Constructor for BinomialDistributionTest.
        * @param name
        */
       public BinomialDistributionTest(String name) {
           super(name);
       }
  -
  -    /*
  -     * @see TestCase#setUp()
  -     */
  -    protected void setUp() throws Exception {
  -        super.setUp();
  -        b =
  -            DistributionFactory.newInstance().createBinomialDistribution(
  -                10,
  -                0.70);
  -    }
  -
  -    /*
  -     * @see TestCase#tearDown()
  -     */
  -    protected void tearDown() throws Exception {
  -        b = null;
  -        super.tearDown();
  -    }
  -
  -    public void testInverseCumulativeProbability001() {
  -        testValue(1, .001);
  -    }
  -
  -    public void testInverseCumulativeProbability010() {
  -        testValue(2, .010);
  -    }
  -
  -    public void testInverseCumulativeProbability025() {
  -        testValue(3, .025);
  -    }
  -
  -    public void testInverseCumulativeProbability050() {
  -        testValue(4, .050);
  -    }
  -
  -    public void testInverseCumulativeProbability100() {
  -        testValue(4, .100);
  -    }
  -
  -    public void testInverseCumulativeProbability999() {
  -        testValue(9, .999);
  -    }
  -
  -    public void testInverseCumulativeProbability990() {
  -        testValue(9, .990);
  -    }
  -
  -    public void testInverseCumulativeProbability975() {
  -        testValue(9, .975);
  -    }
  -
  -    public void testInverseCumulativeProbability950() {
  -        testValue(8, .950);
  -    }
  -
  -    public void testInverseCumulativeProbability900() {
  -        testValue(8, .900);
  -    }
  -
  -    public void testCumulativeProbability1() {
  -        testProbability(1, .00014);
  -    }
  -
  -    public void testCumulativeProbability2() {
  -        testProbability(2, .00159);
  -    }
  -
  -    public void testCumulativeProbability3() {
  -        testProbability(3, .01059);
  -    }
  -
  -    public void testCumulativeProbability4() {
  -        testProbability(4, .04735);
  -    }
  -
  -    public void testCumulativeProbability9() {
  -        testProbability(9, .97175);
  -    }
  -
  -    public void testcumulativeProbability8() {
  -        testProbability(8, .85069);
  -    }
  -
  -    private void testProbability(int x, double expected) {
  -        try {
  -            double actual = b.cumulativeProbability(x);
  -            assertEquals(expected, actual, 10e-4);
  -        } catch (MathException e) {
  -            // TODO Auto-generated catch block
  -            e.printStackTrace();
  +    
  +    //-------------- Implementations for abstract methods -----------------------
  +    
  +    /** Creates the default discrete distribution instance to use in tests. */
  +    public DiscreteDistribution makeDistribution() {
  +        return DistributionFactory.newInstance().createBinomialDistribution(10,0.70);
  +    }
  +    
  +    /** Creates the default probability density test input values */
  +    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 */
  +    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 */
  +    public int[] makeCumulativeTestPoints() {
  +        return makeDensityTestPoints();
  +    }
  +    
  +    /** Creates the default cumulative probability density test expected values */
  +    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};
           }
  -
  -    }
  -
  -    private void testValue(int expected, double p) {
  -        try {
  -            int actual = b.inverseCumulativeProbability(p);
  -            assertEquals(expected, actual);
  -            assertTrue(b.cumulativeProbability(actual) <= p);
  -            assertTrue(b.cumulativeProbability(actual + 1) >= p);
  -        } catch (MathException e) {
  -            // TODO Auto-generated catch block
  -            e.printStackTrace();
  +    
  +    /** Creates the default inverse cumulative probability test input values */
  +    public double[] makeInverseCumulativeTestPoints() {
  +        return new double[] {0.001d, 0.010d, 0.025d, 0.050d, 0.100d, 0.999d,
  +                0.990d, 0.975d, 0.950d, 0.900d}; 
           }
  +    
  +    /** Creates the default inverse cumulative probability density test expected values
*/
  +    public int[] makeInverseCumulativeTestValues() {
  +        return new int[] {1, 2, 3, 4, 4, 9, 9, 9, 8, 8};
  +    }
  +
  +    //----------------- Additional test cases ---------------------------------
  +   
  +    /** Test degenerate case p = 0   */
  +    public void testDegenerate0() throws Exception {
  +        setDistribution(DistributionFactory.newInstance().createBinomialDistribution(5,0.0d));
  +        setCumulativeTestPoints(new int[] {-1, 0, 1, 5, 10 });
  +        setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d});
  +        setDensityTestPoints(new int[] {-1, 0, 1, 10, 11});
  +        setDensityTestValues(new double[] {0d, 1d, 0d, 0d, 0d});
  +        setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
  +        setInverseCumulativeTestValues(new int[] {-1, -1});
  +        verifyDensities();
  +        verifyCumulativeProbabilities();
  +        verifyInverseCumulativeProbabilities();     
  +    }
  +    
  +    /** Test degenerate case p = 1   */
  +    public void tstDegenerate1() throws Exception {
  +        setDistribution(DistributionFactory.newInstance().createBinomialDistribution(5,1.0d));
  +        setCumulativeTestPoints(new int[] {-1, 0, 1, 2, 5, 10 });
  +        setCumulativeTestValues(new double[] {0d, 0d, 0d, 0d, 1d, 1d});
  +        setDensityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
  +        setDensityTestValues(new double[] {0d, 0d, 0d, 0d, 1d, 0d});
  +        setInverseCumulativeTestPoints(new double[] {0.1d, 0.5d});
  +        setInverseCumulativeTestValues(new int[] {4, 4});
  +        verifyDensities();
  +        verifyCumulativeProbabilities();
  +        verifyInverseCumulativeProbabilities();     
       }
  +
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message