Author: brentworden
Date: Thu Jun 7 07:35:04 2007
New Revision: 545192
URL: http://svn.apache.org/viewvc?view=rev&rev=545192
Log:
Removed dependency on DistributionFactory.
Removed:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/DistributionFactoryImplTest.java
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/BinomialDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/CauchyDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactory.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactoryImpl.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ExponentialDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/FDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/GammaDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/HypergeometricDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/NormalDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/PascalDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/TDistribution.java
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/WeibullDistribution.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/BinomialDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/BinomialDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/BinomialDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/BinomialDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,9 +19,6 @@
/**
* The Binomial Distribution.
*
- * Instances of BinomialDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createBinomialDistribution(int,
double)}.
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/CauchyDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/CauchyDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/CauchyDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/CauchyDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,8 +19,6 @@
/**
* Cauchy Distribution.
- * Instances of CauchyDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createCauchyDistribution(double,
double)}.<p>
*
* <p>
* References:<p>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,9 +19,6 @@
/**
* The Chi-Squared Distribution.
*
- * Instances of ChiSquaredDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createChiSquareDistribution(double)}.
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactory.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactory.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactory.java
Thu Jun 7 07:35:04 2007
@@ -17,8 +17,6 @@
package org.apache.commons.math.distribution;
-import org.apache.commons.discovery.tools.DiscoverClass;
-
/**
* This factory provids the means to create common statistical distributions.
* The following distributions are supported:
@@ -45,6 +43,8 @@
* </pre>
*
* @version $Revision$ $Date$
+ * @deprecated pluggability of distribution instances is now provided through
+ * constructors and setters.
*/
public abstract class DistributionFactory {
/**
@@ -59,16 +59,7 @@
* @return a new factory.
*/
public static DistributionFactory newInstance() {
- DistributionFactory factory = null;
- try {
- DiscoverClass dc = new DiscoverClass();
- factory = (DistributionFactory) dc.newInstance(
- DistributionFactory.class,
-
"org.apache.commons.math.distribution.DistributionFactoryImpl");
- } catch(Throwable t) {
- return new DistributionFactoryImpl();
- }
- return factory;
+ return new DistributionFactoryImpl();
}
/**
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactoryImpl.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactoryImpl.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/DistributionFactoryImpl.java
Thu Jun 7 07:35:04 2007
@@ -21,6 +21,8 @@
* Commons-Math.
*
* @version $Revision$ $Date$
+ * @deprecated pluggability of distribution instances is now provided through
+ * constructors and setters.
*/
public class DistributionFactoryImpl extends DistributionFactory {
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ExponentialDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ExponentialDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ExponentialDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/ExponentialDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,9 +19,6 @@
/**
* The Exponential Distribution.
*
- * Instances of ExponentialDistribution objects should be created using
- * [EMAIL PROTECTED]
DistributionFactory#createExponentialDistribution(double)}.
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/FDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/FDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/FDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/FDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,9 +19,6 @@
/**
* F-Distribution.
*
- * Instances of FDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createFDistribution(double,double)}.
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/GammaDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/GammaDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/GammaDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/GammaDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,9 +19,6 @@
/**
* The Gamma Distribution.
*
- * Instances of GammaDistribution objects should be created using
- * [EMAIL PROTECTED]
DistributionFactory#createGammaDistribution(double,double)}.
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/HypergeometricDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/HypergeometricDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/HypergeometricDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/HypergeometricDistribution.java
Thu Jun 7 07:35:04 2007
@@ -20,9 +20,6 @@
/**
* The Hypergeometric Distribution.
*
- * Instances of HypergeometricDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createHypergeometricDistribution(int,
int, int)}.
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/NormalDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/NormalDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/NormalDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/NormalDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,8 +19,6 @@
/**
* Normal (Gauss) Distribution.
- * Instances of NormalDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createNormalDistribution(double,
double)}.<p>
*
* <p>
* References:<p>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/PascalDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/PascalDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/PascalDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/PascalDistribution.java
Thu Jun 7 07:35:04 2007
@@ -26,9 +26,6 @@
* library is to express these functions in terms of the number of failures in
* a Bernoulli experiment [2].
*
- * Instances of PascalDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createPascalDistribution(int,
double)}.
- *
* <p>
* References:
* <ol>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/TDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/TDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/TDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/TDistribution.java
Thu Jun 7 07:35:04 2007
@@ -19,9 +19,6 @@
/**
* Student's t-Distribution.
*
- * Instances of TDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createTDistribution(double)}
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/WeibullDistribution.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/WeibullDistribution.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/WeibullDistribution.java
(original)
+++
jakarta/commons/proper/math/trunk/src/java/org/apache/commons/math/distribution/WeibullDistribution.java
Thu Jun 7 07:35:04 2007
@@ -23,9 +23,6 @@
* <a href="http://mathworld.wolfram.com/WeibullDistribution.html";>
* Weibull Distribution</a>, equations (1) and (2).
*
- * Instances of WeibullDistribution objects should be created using
- * [EMAIL PROTECTED] DistributionFactory#createWeibullDistribution(double,
double)}
- *
* <p>
* References:
* <ul>
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/BinomialDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -37,7 +37,7 @@
/** Creates the default discrete distribution instance to use in tests. */
public IntegerDistribution makeDistribution() {
- return
DistributionFactory.newInstance().createBinomialDistribution(10,0.70);
+ return new BinomialDistributionImpl(10,0.70);
}
/** Creates the default probability density test input values */
@@ -77,7 +77,7 @@
/** Test degenerate case p = 0 */
public void testDegenerate0() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createBinomialDistribution(5,0.0d));
+ setDistribution(new BinomialDistributionImpl(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});
@@ -91,7 +91,7 @@
/** Test degenerate case p = 1 */
public void testDegenerate1() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createBinomialDistribution(5,1.0d));
+ setDistribution(new BinomialDistributionImpl(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});
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/CauchyDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -38,7 +38,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return DistributionFactory.newInstance().createCauchyDistribution(1.2,
2.1);
+ return new CauchyDistributionImpl(1.2, 2.1);
}
/** Creates the default cumulative probability distribution test input
values */
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ChiSquareDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -38,7 +38,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return
DistributionFactory.newInstance().createChiSquareDistribution(5.0);
+ return new ChiSquaredDistributionImpl(5.0);
}
/** Creates the default cumulative probability distribution test input
values */
@@ -76,7 +76,7 @@
//---------------------------- Additional test cases -------------------------
public void testSmallDf() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createChiSquareDistribution(0.1d));
+ setDistribution(new ChiSquaredDistributionImpl(0.1d));
setTolerance(1E-4);
// quantiles computed using R version 1.8.1 (linux version)
setCumulativeTestPoints(new double[] {1.168926E-60, 1.168926E-40,
1.063132E-32,
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ContinuousDistributionAbstractTest.java
Thu Jun 7 07:35:04 2007
@@ -17,6 +17,7 @@
package org.apache.commons.math.distribution;
import junit.framework.TestCase;
+
import org.apache.commons.math.TestUtils;
/**
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/ExponentialDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -37,7 +37,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return
DistributionFactory.newInstance().createExponentialDistribution(5.0);
+ return new ExponentialDistributionImpl(5.0);
}
/** Creates the default cumulative probability distribution test input
values */
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/FDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -38,7 +38,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return DistributionFactory.newInstance().createFDistribution(5.0, 6.0);
+ return new FDistributionImpl(5.0, 6.0);
}
/** Creates the default cumulative probability distribution test input
values */
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/GammaDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -38,7 +38,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return DistributionFactory.newInstance().createGammaDistribution(4d,
2d);
+ return new GammaDistributionImpl(4d, 2d);
}
/** Creates the default cumulative probability distribution test input
values */
@@ -100,15 +100,13 @@
}
private void testProbability(double x, double a, double b, double
expected) throws Exception {
- DistributionFactory factory = DistributionFactory.newInstance();
- GammaDistribution distribution = factory.createGammaDistribution( a, b
);
+ GammaDistribution distribution = new GammaDistributionImpl( a, b );
double actual = distribution.cumulativeProbability(x);
assertEquals("probability for " + x, expected, actual, 10e-4);
}
private void testValue(double expected, double a, double b, double p)
throws Exception {
- DistributionFactory factory = DistributionFactory.newInstance();
- GammaDistribution distribution = factory.createGammaDistribution( a, b
);
+ GammaDistribution distribution = new GammaDistributionImpl( a, b );
double actual = distribution.inverseCumulativeProbability(p);
assertEquals("critical value for " + p, expected, actual, 10e-4);
}
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/HypergeometricDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -40,7 +40,7 @@
/** Creates the default discrete distribution instance to use in tests. */
public IntegerDistribution makeDistribution() {
- return
DistributionFactory.newInstance().createHypergeometricDistribution(10,5, 5);
+ return new HypergeometricDistributionImpl(10,5, 5);
}
/** Creates the default probability density test input values */
@@ -80,7 +80,7 @@
/** Verify that if there are no failures, mass is concentrated on
sampleSize */
public void testDegenerateNoFailures() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createHypergeometricDistribution(5,5,3));
+ setDistribution(new HypergeometricDistributionImpl(5,5,3));
setCumulativeTestPoints(new int[] {-1, 0, 1, 3, 10 });
setCumulativeTestValues(new double[] {0d, 0d, 0d, 1d, 1d});
setDensityTestPoints(new int[] {-1, 0, 1, 3, 10});
@@ -94,7 +94,7 @@
/** Verify that if there are no successes, mass is concentrated on 0 */
public void testDegenerateNoSuccesses() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createHypergeometricDistribution(5,0,3));
+ setDistribution(new HypergeometricDistributionImpl(5,0,3));
setCumulativeTestPoints(new int[] {-1, 0, 1, 3, 10 });
setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d});
setDensityTestPoints(new int[] {-1, 0, 1, 3, 10});
@@ -108,7 +108,7 @@
/** Verify that if sampleSize = populationSize, mass is concentrated on
numberOfSuccesses */
public void testDegenerateFullSample() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createHypergeometricDistribution(5,3,5));
+ setDistribution(new HypergeometricDistributionImpl(5,3,5));
setCumulativeTestPoints(new int[] {-1, 0, 1, 3, 10 });
setCumulativeTestValues(new double[] {0d, 0d, 0d, 1d, 1d});
setDensityTestPoints(new int[] {-1, 0, 1, 3, 10});
@@ -121,7 +121,7 @@
}
public void testPopulationSize() {
- HypergeometricDistribution dist =
DistributionFactory.newInstance().createHypergeometricDistribution(5,3,5);
+ HypergeometricDistribution dist = new
HypergeometricDistributionImpl(5,3,5);
try {
dist.setPopulationSize(-1);
fail("negative population size. IllegalArgumentException
expected");
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/NormalDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -38,7 +38,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return DistributionFactory.newInstance().createNormalDistribution(2.1,
1.4);
+ return new NormalDistributionImpl(2.1, 1.4);
}
/** Creates the default cumulative probability distribution test input
values */
@@ -77,9 +77,9 @@
public void testQuantiles() throws Exception {
verifyQuantiles();
-
setDistribution(DistributionFactory.newInstance().createNormalDistribution(0,
1));
+ setDistribution(new NormalDistributionImpl(0, 1));
verifyQuantiles();
-
setDistribution(DistributionFactory.newInstance().createNormalDistribution(0,
0.1));
+ setDistribution(new NormalDistributionImpl(0, 0.1));
verifyQuantiles();
}
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PascalDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -37,7 +37,7 @@
/** Creates the default discrete distribution instance to use in tests. */
public IntegerDistribution makeDistribution() {
- return
DistributionFactory.newInstance().createPascalDistribution(10,0.70);
+ return new PascalDistributionImpl(10,0.70);
}
/** Creates the default probability density test input values */
@@ -77,7 +77,7 @@
/** Test degenerate case p = 0 */
public void testDegenerate0() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createPascalDistribution(5,0.0d));
+ setDistribution(new PascalDistributionImpl(5,0.0d));
setCumulativeTestPoints(new int[] {-1, 0, 1, 5, 10 });
setCumulativeTestValues(new double[] {0d, 0d, 0d, 0d, 0d});
setDensityTestPoints(new int[] {-1, 0, 1, 10, 11});
@@ -91,7 +91,7 @@
/** Test degenerate case p = 1 */
public void testDegenerate1() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createPascalDistribution(5,1.0d));
+ setDistribution(new PascalDistributionImpl(5,1.0d));
setCumulativeTestPoints(new int[] {-1, 0, 1, 2, 5, 10 });
setCumulativeTestValues(new double[] {0d, 1d, 1d, 1d, 1d, 1d});
setDensityTestPoints(new int[] {-1, 0, 1, 2, 5, 10});
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/PoissonDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -43,8 +43,7 @@
* Creates the default discrete distribution instance to use in tests.
*/
public IntegerDistribution makeDistribution() {
- return DistributionFactory.newInstance().createPoissonDistribution
- (DEFAULT_TEST_POISSON_PARAMETER);
+ return new PoissonDistributionImpl(DEFAULT_TEST_POISSON_PARAMETER);
}
/**
@@ -105,7 +104,7 @@
* P(9900 ≤ X ≤ 10200) for X = Po(10000)
*/
public void testNormalApproximateProbability() throws Exception {
- PoissonDistribution dist =
DistributionFactory.newInstance().createPoissonDistribution(100);
+ PoissonDistribution dist = new PoissonDistributionImpl(100);
double result = dist.normalApproximateProbability(110)
- dist.normalApproximateProbability(89);
assertEquals(0.706281887248, result, 1E-10);
@@ -120,13 +119,13 @@
* @throws Exception
*/
public void testDegenerateInverseCumulativeProbability() throws Exception {
- PoissonDistribution dist =
DistributionFactory.newInstance().createPoissonDistribution(DEFAULT_TEST_POISSON_PARAMETER);
+ PoissonDistribution dist = new
PoissonDistributionImpl(DEFAULT_TEST_POISSON_PARAMETER);
assertEquals(Integer.MAX_VALUE,
dist.inverseCumulativeProbability(1.0d));
assertEquals(-1, dist.inverseCumulativeProbability(0d));
}
public void testMean() {
- PoissonDistribution dist =
DistributionFactory.newInstance().createPoissonDistribution(DEFAULT_TEST_POISSON_PARAMETER);
+ PoissonDistribution dist = new
PoissonDistributionImpl(DEFAULT_TEST_POISSON_PARAMETER);
try {
dist.setMean(-1);
fail("negative mean. IllegalArgumentException expected");
@@ -138,7 +137,7 @@
}
public void testLargeMeanCumulativeProbability() {
- PoissonDistribution dist =
DistributionFactory.newInstance().createPoissonDistribution(1.0);
+ PoissonDistribution dist = new PoissonDistributionImpl(1.0);
double mean = 1.0;
while (mean <= 10000000.0) {
dist.setMean(mean);
@@ -159,7 +158,7 @@
}
public void testLargeMeanInverseCumulativeProbability() {
- PoissonDistribution dist =
DistributionFactory.newInstance().createPoissonDistribution(1.0);
+ PoissonDistribution dist = new PoissonDistributionImpl(1.0);
double mean = 1.0;
while (mean <= 10000000.0) {
dist.setMean(mean);
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/TDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -37,7 +37,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return DistributionFactory.newInstance().createTDistribution(5.0);
+ return new TDistributionImpl(5.0);
}
/** Creates the default cumulative probability distribution test input
values */
@@ -67,13 +67,12 @@
*/
public void testCumulativeProbabilityAgaintStackOverflow() throws
Exception {
TDistributionImpl td = new TDistributionImpl(5.);
- double est;
- est = td.cumulativeProbability(.1);
- est = td.cumulativeProbability(.01);
+ td.cumulativeProbability(.1);
+ td.cumulativeProbability(.01);
}
public void testSmallDf() throws Exception {
-
setDistribution(DistributionFactory.newInstance().createTDistribution(1d));
+ setDistribution(new TDistributionImpl(1d));
setTolerance(1E-4);
// quantiles computed using R version 1.8.1 (linux version)
setCumulativeTestPoints(new double[] {-318.3088, -31.82052, -12.70620,
-6.313752,
Modified:
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java?view=diff&rev=545192&r1=545191&r2=545192
==============================================================================
---
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java
(original)
+++
jakarta/commons/proper/math/trunk/src/test/org/apache/commons/math/distribution/WeibullDistributionTest.java
Thu Jun 7 07:35:04 2007
@@ -38,7 +38,7 @@
/** Creates the default continuous distribution instance to use in tests.
*/
public ContinuousDistribution makeDistribution() {
- return
DistributionFactory.newInstance().createWeibullDistribution(1.2, 2.1);
+ return new WeibullDistributionImpl(1.2, 2.1);
}
/** Creates the default cumulative probability distribution test input
values */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
