Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed javadoc error, replaced depreacated class. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1420006 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Phil Steitz 2012-12-11 06:10:08 +00:00
parent 905aaf4567
commit 6c048df147
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
View File

@ -84,7 +84,7 @@ import org.apache.commons.math3.util.MathUtils;
* be the bin containing x and let K be the within-bin kernel for B. Let P(B-)
* be the sum of the probabilities of the bins below B and let K(B) be the
* mass of B under K (i.e., the integral of the kernel density over B). Then
* set P(X < x) = P(B-) + K(x) / K(B) where K(x) is the kernel distribution
* set P(X < x) = P(B-) + P(B) * K(x) / K(B) where K(x) is the kernel distribution
* evaluated at x. This results in a cdf that matches the grouped frequency
* distribution at the bin endpoints and interpolates within bins using
* within-bin kernels.</p>
@ -135,13 +135,13 @@ public class EmpiricalDistribution extends AbstractRealDistribution {
private double[] upperBounds = null;
/** RandomDataImpl instance to use in repeated calls to getNext() */
private final RandomDataImpl randomData;
private final RandomDataGenerator randomData;
/**
* Creates a new EmpiricalDistribution with the default bin count.
*/
public EmpiricalDistribution() {
this(DEFAULT_BIN_COUNT, new RandomDataImpl());
this(DEFAULT_BIN_COUNT, new RandomDataGenerator());
}
/**
@ -150,7 +150,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution {
* @param binCount number of bins
*/
public EmpiricalDistribution(int binCount) {
this(binCount, new RandomDataImpl());
this(binCount, new RandomDataGenerator());
}
/**
@ -162,9 +162,10 @@ public class EmpiricalDistribution extends AbstractRealDistribution {
* @since 3.0
*/
public EmpiricalDistribution(int binCount, RandomGenerator generator) {
super(generator);
this.binCount = binCount;
randomData = new RandomDataImpl(generator);
binStats = new ArrayList<SummaryStatistics>();
this.randomData = new RandomDataGenerator(generator);
this.binStats = new ArrayList<SummaryStatistics>();
}
/**
@ -186,7 +187,8 @@ public class EmpiricalDistribution extends AbstractRealDistribution {
* @param randomData random data generator (may be null, resulting in default JDK generator)
* @since 3.0
*/
public EmpiricalDistribution(int binCount, RandomDataImpl randomData) {
@SuppressWarnings("deprecation") // Superclass argumentless constructor is deprecated
public EmpiricalDistribution(int binCount, RandomDataGenerator randomData) {
this.binCount = binCount;
this.randomData = randomData;
binStats = new ArrayList<SummaryStatistics>();
@ -199,7 +201,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution {
* @param randomData random data generator (may be null, resulting in default JDK generator)
* @since 3.0
*/
public EmpiricalDistribution(RandomDataImpl randomData) {
public EmpiricalDistribution(RandomDataGenerator randomData) {
this(DEFAULT_BIN_COUNT, randomData);
}

6
src/main/java/org/apache/commons/math3/random/ValueServer.java
View File

@ -88,13 +88,13 @@ public class ValueServer {
private BufferedReader filePointer = null;
/** RandomDataImpl to use for random data generation. */
private final RandomDataImpl randomData;
private final RandomDataGenerator randomData;
// Data generation modes ======================================
/** Creates new ValueServer */
public ValueServer() {
randomData = new RandomDataImpl();
randomData = new RandomDataGenerator();
}
/**
@ -104,7 +104,7 @@ public class ValueServer {
* @param randomData the RandomDataImpl instance used to source random data
* @since 3.0
*/
public ValueServer(RandomDataImpl randomData) {
public ValueServer(RandomDataGenerator randomData) {
this.randomData = randomData;
}