You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2018/01/25 13:49:50 UTC
[1/6] commons-statistics git commit: Javadoc.
Repository: commons-statistics
Updated Branches:
refs/heads/master 5d64d7ef0 -> 3a44cfd80
Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/commons-statistics/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-statistics/commit/9a9802d5
Tree: http://git-wip-us.apache.org/repos/asf/commons-statistics/tree/9a9802d5
Diff: http://git-wip-us.apache.org/repos/asf/commons-statistics/diff/9a9802d5
Branch: refs/heads/master
Commit: 9a9802d591a668a1fa292344e72b8aea8f949280
Parents: 5d64d7e
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Thu Jan 25 12:12:07 2018 +0100
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Thu Jan 25 12:12:07 2018 +0100
----------------------------------------------------------------------
.../distribution/ContinuousDistribution.java | 96 +++++++++----------
.../distribution/DiscreteDistribution.java | 97 ++++++++++----------
2 files changed, 88 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/9a9802d5/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
index b08f75a..c1f04f3 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
@@ -24,12 +24,12 @@ import org.apache.commons.rng.UniformRandomProvider;
public interface ContinuousDistribution {
/**
* For a random variable {@code X} whose values are distributed according
- * to this distribution, this method returns {@code P(X = x)}. In other
- * words, this method represents the probability mass function (PMF)
- * for the distribution.
+ * to this distribution, this method returns {@code P(X = x)}.
+ * In other words, this method represents the probability mass function
+ * (PMF) for the distribution.
*
- * @param x the point at which the PMF is evaluated
- * @return the value of the probability mass function at point {@code x}
+ * @param x Point at which the PMF is evaluated.
+ * @return the value of the probability mass function at point {@code x}.
*/
double probability(double x);
@@ -37,54 +37,48 @@ public interface ContinuousDistribution {
* For a random variable {@code X} whose values are distributed according
* to this distribution, this method returns {@code P(x0 < X <= x1)}.
*
- * @param x0 the exclusive lower bound
- * @param x1 the inclusive upper bound
+ * @param x0 Lower bound (exclusive).
+ * @param x1 Upper bound (inclusive).
* @return the probability that a random variable with this distribution
- * takes a value between {@code x0} and {@code x1},
- * excluding the lower and including the upper endpoint
- * @throws IllegalArgumentException if {@code x0 > x1}
+ * takes a value between {@code x0} and {@code x1}, excluding the lower
+ * and including the upper endpoint.
+ * @throws IllegalArgumentException if {@code x0 > x1}.
*/
double probability(double x0, double x1);
/**
* Returns the probability density function (PDF) of this distribution
- * evaluated at the specified point {@code x}. In general, the PDF is
- * the derivative of the {@link #cumulativeProbability(double) CDF}.
+ * evaluated at the specified point {@code x}.
+ * In general, the PDF is the derivative of the {@link #cumulativeProbability(double) CDF}.
* If the derivative does not exist at {@code x}, then an appropriate
* replacement should be returned, e.g. {@code Double.POSITIVE_INFINITY},
* {@code Double.NaN}, or the limit inferior or limit superior of the
* difference quotient.
*
- * @param x the point at which the PDF is evaluated
- * @return the value of the probability density function at point {@code x}
+ * @param x Point at which the PDF is evaluated.
+ * @return the value of the probability density function at {@code x}.
*/
double density(double x);
/**
* Returns the natural logarithm of the probability density function
* (PDF) of this distribution evaluated at the specified point {@code x}.
- * In general, the PDF is the derivative of the {@link #cumulativeProbability(double) CDF}.
- * If the derivative does not exist at {@code x}, then an appropriate replacement
- * should be returned, e.g. {@code Double.POSITIVE_INFINITY}, {@code Double.NaN},
- * or the limit inferior or limit superior of the difference quotient. Note that
- * due to the floating point precision and under/overflow issues, this method will
- * for some distributions be more precise and faster than computing the logarithm of
- * {@link #density(double)}.
*
- * @param x the point at which the PDF is evaluated
- * @return the logarithm of the value of the probability density function at point {@code x}
+ * @param x Point at which the PDF is evaluated.
+ * @return the logarithm of the value of the probability density function
+ * at {@code x}.
*/
double logDensity(double x);
/**
* For a random variable {@code X} whose values are distributed according
- * to this distribution, this method returns {@code P(X <= x)}. In other
- * words, this method represents the (cumulative) distribution function
- * (CDF) for this distribution.
+ * to this distribution, this method returns {@code P(X <= x)}.
+ * In other words, this method represents the (cumulative) distribution
+ * function (CDF) for this distribution.
*
- * @param x the point at which the CDF is evaluated
+ * @param x Point at which the CDF is evaluated.
* @return the probability that a random variable with this
- * distribution takes a value less than or equal to {@code x}
+ * distribution takes a value less than or equal to {@code x}.
*/
double cumulativeProbability(double x);
@@ -97,59 +91,53 @@ public interface ContinuousDistribution {
* <li>{@code inf{x in R | P(X<=x) > 0}} for {@code p = 0}.</li>
* </ul>
*
- * @param p the cumulative probability
+ * @param p Cumulative probability.
* @return the smallest {@code p}-quantile of this distribution
- * (largest 0-quantile for {@code p = 0})
- * @throws IllegalArgumentException if {@code p < 0} or {@code p > 1}
+ * (largest 0-quantile for {@code p = 0}).
+ * @throws IllegalArgumentException if {@code p < 0} or {@code p > 1}.
*/
double inverseCumulativeProbability(double p);
/**
- * Use this method to get the numerical value of the mean of this
- * distribution.
+ * Gets the mean of this distribution.
*
- * @return the mean or {@code Double.NaN} if it is not defined
+ * @return the mean, or {@code Double.NaN} if it is not defined.
*/
double getNumericalMean();
/**
- * Use this method to get the numerical value of the variance of this
- * distribution.
+ * Gets the variance of this distribution.
*
- * @return the variance (possibly {@code Double.POSITIVE_INFINITY} as
- * for certain cases in {@link TDistribution}) or {@code Double.NaN} if it
- * is not defined
+ * @return the variance, or {@code Double.NaN} if it is not defined.
*/
double getNumericalVariance();
/**
- * Access the lower bound of the support. This method must return the same
- * value as {@code inverseCumulativeProbability(0)}. In other words, this
- * method must return
- * <p>{@code inf {x in R | P(X <= x) > 0}}.</p>
+ * Gets the lower bound of the support.
+ * It must return the same value as
+ * {@code inverseCumulativeProbability(0)}, i.e.
+ * {@code inf {x in R | P(X <= x) > 0}}.
*
- * @return lower bound of the support (might be
- * {@code Double.NEGATIVE_INFINITY})
+ * @return the lower bound of the support.
*/
double getSupportLowerBound();
/**
- * Access the upper bound of the support. This method must return the same
- * value as {@code inverseCumulativeProbability(1)}. In other words, this
- * method must return
- * <p>{@code inf {x in R | P(X <= x) = 1}}.</p>
+ * Gets the upper bound of the support.
+ * It must return the same
+ * value as {@code inverseCumulativeProbability(1)}, i.e.
+ * {@code inf {x in R | P(X <= x) = 1}}.
*
- * @return upper bound of the support (might be
- * {@code Double.POSITIVE_INFINITY})
+ * @return the upper bound of the support.
*/
double getSupportUpperBound();
/**
- * Use this method to get information about whether the support is connected,
- * i.e. whether all values between the lower and upper bound of the support
+ * Indicates whether the support is connected, i.e. whether
+ * all values between the lower and upper bound of the support
* are included in the support.
*
- * @return whether the support is connected or not
+ * @return whether the support is connected.
*/
boolean isSupportConnected();
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/9a9802d5/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
index 1cd4a35..f418eb9 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
@@ -24,28 +24,24 @@ import org.apache.commons.rng.UniformRandomProvider;
public interface DiscreteDistribution {
/**
- * For a random variable {@code X} whose values are distributed according to
- * this distribution, this method returns {@code log(P(X = x))}, where
- * {@code log} is the natural logarithm. In other words, this method
- * represents the logarithm of the probability mass function (PMF) for the
- * distribution. Note that due to the floating point precision and
- * under/overflow issues, this method will for some distributions be more
- * precise and faster than computing the logarithm of
- * {@link #probability(int)}.
+ * For a random variable {@code X} whose values are distributed according
+ * to this distribution, this method returns {@code log(P(X = x))}, where
+ * {@code log} is the natural logarithm.
*
- * @param x the point at which the PMF is evaluated
- * @return the logarithm of the value of the probability mass function at {@code x}
+ * @param x Point at which the PMF is evaluated.
+ * @return the logarithm of the value of the probability mass function at
+ * {@code x}.
*/
double logProbability(int x);
/**
* For a random variable {@code X} whose values are distributed according
- * to this distribution, this method returns {@code P(X = x)}. In other
- * words, this method represents the probability mass function (PMF)
+ * to this distribution, this method returns {@code P(X = x)}.
+ * In other words, this method represents the probability mass function (PMF)
* for the distribution.
*
- * @param x the point at which the PMF is evaluated
- * @return the value of the probability mass function at {@code x}
+ * @param x Point at which the PMF is evaluated.
+ * @return the value of the probability mass function at {@code x}.
*/
double probability(int x);
@@ -53,24 +49,24 @@ public interface DiscreteDistribution {
* For a random variable {@code X} whose values are distributed according
* to this distribution, this method returns {@code P(x0 < X <= x1)}.
*
- * @param x0 the exclusive lower bound
- * @param x1 the inclusive upper bound
+ * @param x0 Lower bound (exclusive).
+ * @param x1 Upper bound (inclusive).
* @return the probability that a random variable with this distribution
- * will take a value between {@code x0} and {@code x1},
- * excluding the lower and including the upper endpoint
- * @throws IllegalArgumentException if {@code x0 > x1}
+ * will take a value between {@code x0} and {@code x1}, excluding the lower
+ * and including the upper endpoint.
+ * @throws IllegalArgumentException if {@code x0 > x1}.
*/
double probability(int x0, int x1);
/**
* For a random variable {@code X} whose values are distributed according
- * to this distribution, this method returns {@code P(X <= x)}. In other
- * words, this method represents the (cumulative) distribution function
- * (CDF) for this distribution.
+ * to this distribution, this method returns {@code P(X <= x)}.
+ * In other, words, this method represents the (cumulative) distribution
+ * function (CDF) for this distribution.
*
- * @param x the point at which the CDF is evaluated
- * @return the probability that a random variable with this
- * distribution takes a value less than or equal to {@code x}
+ * @param x Point at which the CDF is evaluated.
+ * @return the probability that a random variable with this distribution
+ * takes a value less than or equal to {@code x}.
*/
double cumulativeProbability(int x);
@@ -85,58 +81,57 @@ public interface DiscreteDistribution {
* If the result exceeds the range of the data type {@code int},
* then {@code Integer.MIN_VALUE} or {@code Integer.MAX_VALUE} is returned.
*
- * @param p the cumulative probability
+ * @param p Cumulative probability.
* @return the smallest {@code p}-quantile of this distribution
- * (largest 0-quantile for {@code p = 0})
- * @throws IllegalArgumentException if {@code p < 0} or {@code p > 1}
+ * (largest 0-quantile for {@code p = 0}).
+ * @throws IllegalArgumentException if {@code p < 0} or {@code p > 1}.
*/
int inverseCumulativeProbability(double p);
/**
- * Use this method to get the numerical value of the mean of this
- * distribution.
+ * Gets the mean of this distribution.
*
- * @return the mean or {@code Double.NaN} if it is not defined
+ * @return the mean, or {@code Double.NaN} if it is not defined.
*/
double getNumericalMean();
/**
- * Use this method to get the numerical value of the variance of this
- * distribution.
+ * Gets the variance of this distribution.
*
- * @return the variance (possibly {@code Double.POSITIVE_INFINITY} or
- * {@code Double.NaN} if it is not defined)
+ * @return the variance, or {@code Double.NaN} if it is not defined.
*/
double getNumericalVariance();
/**
- * Access the lower bound of the support. This method must return the same
- * value as {@code inverseCumulativeProbability(0)}. In other words, this
- * method must return
- * <p>{@code inf {x in Z | P(X <= x) > 0}}.</p>
+ * Gets the lower bound of the support.
+ * This method must return the same value as
+ * {@code inverseCumulativeProbability(0)}, i.e.
+ * {@code inf {x in Z | P(X <= x) > 0}}.
+ * By convention, {@code Integer.MIN_VALUE} should be substituted
+ * for negative infinity.
*
- * @return lower bound of the support ({@code Integer.MIN_VALUE}
- * for negative infinity)
+ * @return the lower bound of the support.
*/
int getSupportLowerBound();
/**
- * Access the upper bound of the support. This method must return the same
- * value as {@code inverseCumulativeProbability(1)}. In other words, this
- * method must return
- * <p>{@code inf {x in R | P(X <= x) = 1}}.</p>
+ * Gets the upper bound of the support.
+ * This method must return the same value as
+ * {@code inverseCumulativeProbability(1)}, i.e.
+ * {@code inf {x in R | P(X <= x) = 1}}.
+ * By convention, {@code Integer.MAX_VALUE} should be substituted
+ * for positive infinity.
*
- * @return upper bound of the support ({@code Integer.MAX_VALUE}
- * for positive infinity)
+ * @return the upper bound of the support.
*/
int getSupportUpperBound();
/**
- * Use this method to get information about whether the support is
- * connected, i.e. whether all integers between the lower and upper bound of
- * the support are included in the support.
+ * Indicates whether the support is connected, i.e. whether all
+ * integers between the lower and upper bound of the support are
+ * included in the support.
*
- * @return whether the support is connected or not
+ * @return whether the support is connected.
*/
boolean isSupportConnected();
[5/6] commons-statistics git commit: Hide undocumented parameters
(and probably rarely used API).
Posted by er...@apache.org.
Hide undocumented parameters (and probably rarely used API).
Project: http://git-wip-us.apache.org/repos/asf/commons-statistics/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-statistics/commit/c6640dec
Tree: http://git-wip-us.apache.org/repos/asf/commons-statistics/tree/c6640dec
Diff: http://git-wip-us.apache.org/repos/asf/commons-statistics/diff/c6640dec
Branch: refs/heads/master
Commit: c6640dec400bbacef51493f37099c241de9b7e6e
Parents: 9abbfc6
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Thu Jan 25 14:17:39 2018 +0100
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Thu Jan 25 14:17:39 2018 +0100
----------------------------------------------------------------------
.../distribution/PoissonDistribution.java | 32 ++------------------
1 file changed, 3 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/c6640dec/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
index 26ea3fc..545e2b4 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
@@ -60,9 +60,9 @@ public class PoissonDistribution extends AbstractDiscreteDistribution {
* probabilities.
* @throws IllegalArgumentException if {@code p <= 0}.
*/
- public PoissonDistribution(double p,
- double epsilon,
- int maxIterations) {
+ private PoissonDistribution(double p,
+ double epsilon,
+ int maxIterations) {
if (p <= 0) {
throw new DistributionException(DistributionException.NEGATIVE, p);
}
@@ -73,32 +73,6 @@ public class PoissonDistribution extends AbstractDiscreteDistribution {
normal = new NormalDistribution(p, Math.sqrt(p));
}
- /**
- * Creates a new Poisson distribution with the specified mean and
- * convergence criterion.
- *
- * @param p Poisson mean.
- * @param epsilon Convergence criterion for cumulative probabilities.
- * @throws IllegalArgumentException if {@code p <= 0}.
- */
- public PoissonDistribution(double p,
- double epsilon) {
- this(p, epsilon, DEFAULT_MAX_ITERATIONS);
- }
-
- /**
- * Creates a new Poisson distribution with the specified mean and maximum
- * number of iterations.
- *
- * @param p Poisson mean.
- * @param maxIterations Maximum number of iterations for cumulative
- * probabilities.
- */
- public PoissonDistribution(double p,
- int maxIterations) {
- this(p, DEFAULT_EPSILON, maxIterations);
- }
-
/** {@inheritDoc} */
@Override
public double probability(int x) {
[6/6] commons-statistics git commit: Removed default constructors.
Posted by er...@apache.org.
Removed default constructors.
Arguments naming and ordering differ among references; hence, the default
constructor is ambiguous.
Project: http://git-wip-us.apache.org/repos/asf/commons-statistics/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-statistics/commit/3a44cfd8
Tree: http://git-wip-us.apache.org/repos/asf/commons-statistics/tree/3a44cfd8
Diff: http://git-wip-us.apache.org/repos/asf/commons-statistics/diff/3a44cfd8
Branch: refs/heads/master
Commit: 3a44cfd80b6afc4b1e15ede3785504777708d1b0
Parents: c6640de
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Thu Jan 25 14:26:02 2018 +0100
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Thu Jan 25 14:26:02 2018 +0100
----------------------------------------------------------------------
.../statistics/distribution/CauchyDistribution.java | 8 --------
.../statistics/distribution/LogNormalDistribution.java | 11 -----------
.../statistics/distribution/NormalDistribution.java | 8 --------
.../statistics/distribution/ParetoDistribution.java | 7 -------
.../distribution/UniformContinuousDistribution.java | 8 --------
5 files changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/3a44cfd8/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
index 89aead7..b0eb0ca 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
@@ -26,14 +26,6 @@ public class CauchyDistribution extends AbstractContinuousDistribution {
private final double scale;
/**
- * Creates a Cauchy distribution with the median equal to zero and scale
- * equal to one.
- */
- public CauchyDistribution() {
- this(0, 1);
- }
-
- /**
* Creates a distribution.
*
* @param median Median for this distribution.
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/3a44cfd8/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
index 1766200..935c421 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
@@ -57,17 +57,6 @@ public class LogNormalDistribution extends AbstractContinuousDistribution {
private final double logShapePlusHalfLog2Pi;
/**
- * Creates a log-normal distribution, where the mean and standard deviation
- * of the {@link NormalDistribution normally distributed} natural
- * logarithm of the log-normal distribution are equal to zero and one
- * respectively. In other words, the scale of the returned distribution is
- * {@code 0}, while its shape is {@code 1}.
- */
- public LogNormalDistribution() {
- this(0, 1);
- }
-
- /**
* Creates a log-normal distribution.
*
* @param scale Scale parameter of this distribution.
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/3a44cfd8/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
index 5d60824..9d6293c 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
@@ -39,14 +39,6 @@ public class NormalDistribution extends AbstractContinuousDistribution {
private final double logStandardDeviationPlusHalfLog2Pi;
/**
- * Create a normal distribution with mean equal to zero and standard
- * deviation equal to one.
- */
- public NormalDistribution() {
- this(0, 1);
- }
-
- /**
* Creates a distribution.
*
* @param mean Mean for this distribution.
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/3a44cfd8/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
index 958d9d5..f97b7f1 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
@@ -42,13 +42,6 @@ public class ParetoDistribution extends AbstractContinuousDistribution {
private final double shape;
/**
- * Creates a Pareto distribution with a scale of {@code 1} and a shape of {@code 1}.
- */
- public ParetoDistribution() {
- this(1, 1);
- }
-
- /**
* Creates a Pareto distribution.
*
* @param scale Scale parameter of this distribution.
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/3a44cfd8/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
index 03e136b..da5abf7 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
@@ -31,14 +31,6 @@ public class UniformContinuousDistribution extends AbstractContinuousDistributio
private final double upper;
/**
- * Create a standard uniform real distribution with lower bound (inclusive)
- * equal to zero and upper bound (exclusive) equal to one.
- */
- public UniformContinuousDistribution() {
- this(0, 1);
- }
-
- /**
* Creates a uniform distribution.
*
* @param lower Lower bound of this distribution (inclusive).
[2/6] commons-statistics git commit: Changed ambiguous method names.
Posted by er...@apache.org.
Changed ambiguous method names.
getNumericalMean -> getMean
getNumericalVariance -> getVariance
Project: http://git-wip-us.apache.org/repos/asf/commons-statistics/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-statistics/commit/764dfb85
Tree: http://git-wip-us.apache.org/repos/asf/commons-statistics/tree/764dfb85
Diff: http://git-wip-us.apache.org/repos/asf/commons-statistics/diff/764dfb85
Branch: refs/heads/master
Commit: 764dfb856e69a4fae2a5fcad48e67b7f15e665ce
Parents: 9a9802d
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Thu Jan 25 12:24:34 2018 +0100
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Thu Jan 25 12:24:34 2018 +0100
----------------------------------------------------------------------
.../AbstractContinuousDistribution.java | 4 ++--
.../AbstractDiscreteDistribution.java | 4 ++--
.../distribution/BetaDistribution.java | 4 ++--
.../distribution/BinomialDistribution.java | 4 ++--
.../distribution/CauchyDistribution.java | 4 ++--
.../distribution/ChiSquaredDistribution.java | 4 ++--
.../ConstantContinuousDistribution.java | 4 ++--
.../distribution/ContinuousDistribution.java | 4 ++--
.../distribution/DiscreteDistribution.java | 4 ++--
.../distribution/ExponentialDistribution.java | 24 ++++----------------
.../statistics/distribution/FDistribution.java | 4 ++--
.../distribution/GammaDistribution.java | 4 ++--
.../distribution/GeometricDistribution.java | 4 ++--
.../distribution/GumbelDistribution.java | 4 ++--
.../HypergeometricDistribution.java | 4 ++--
.../distribution/LaplaceDistribution.java | 4 ++--
.../distribution/LevyDistribution.java | 4 ++--
.../distribution/LogNormalDistribution.java | 4 ++--
.../distribution/LogisticDistribution.java | 4 ++--
.../distribution/NakagamiDistribution.java | 4 ++--
.../distribution/NormalDistribution.java | 21 ++++-------------
.../distribution/ParetoDistribution.java | 4 ++--
.../distribution/PascalDistribution.java | 4 ++--
.../distribution/PoissonDistribution.java | 23 ++++---------------
.../statistics/distribution/TDistribution.java | 4 ++--
.../distribution/TriangularDistribution.java | 4 ++--
.../UniformContinuousDistribution.java | 4 ++--
.../UniformDiscreteDistribution.java | 4 ++--
.../distribution/WeibullDistribution.java | 6 ++---
.../distribution/ZipfDistribution.java | 4 ++--
.../AbstractContinuousDistributionTest.java | 12 +++++-----
.../AbstractDiscreteDistributionTest.java | 4 ++--
.../distribution/BetaDistributionTest.java | 12 +++++-----
.../distribution/BinomialDistributionTest.java | 8 +++----
.../distribution/CauchyDistributionTest.java | 8 +++----
.../ChiSquaredDistributionTest.java | 8 +++----
.../ConstantContinuousDistributionTest.java | 4 ++--
.../ExponentialDistributionTest.java | 8 +++----
.../distribution/FDistributionTest.java | 12 +++++-----
.../distribution/GammaDistributionTest.java | 8 +++----
.../distribution/GeometricDistributionTest.java | 8 +++----
.../HypergeometricDistributionTest.java | 8 +++----
.../distribution/LogNormalDistributionTest.java | 14 ++++++------
.../distribution/NormalDistributionTest.java | 12 +++++-----
.../distribution/ParetoDistributionTest.java | 8 +++----
.../distribution/PascalDistributionTest.java | 8 +++----
.../distribution/PoissonDistributionTest.java | 8 +++----
.../distribution/TDistributionTest.java | 12 +++++-----
.../TriangularDistributionTest.java | 12 +++++-----
.../UniformContinuousDistributionTest.java | 12 +++++-----
.../UniformDiscreteDistributionTest.java | 12 +++++-----
.../distribution/WeibullDistributionTest.java | 12 +++++-----
.../distribution/ZipfDistributionTest.java | 4 ++--
53 files changed, 176 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
index 521cc1c..c084bb6 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
@@ -113,8 +113,8 @@ public abstract class AbstractContinuousDistribution
return upperBound;
}
- final double mu = getNumericalMean();
- final double sig = Math.sqrt(getNumericalVariance());
+ final double mu = getMean();
+ final double sig = Math.sqrt(getVariance());
final boolean chebyshevApplies;
chebyshevApplies = !(Double.isInfinite(mu) ||
Double.isNaN(mu) ||
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
index faef96c..1b80851 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
@@ -82,8 +82,8 @@ public abstract class AbstractDiscreteDistribution
// use the one-sided Chebyshev inequality to narrow the bracket
// cf. AbstractRealDistribution.inverseCumulativeProbability(double)
- final double mu = getNumericalMean();
- final double sigma = Math.sqrt(getNumericalVariance());
+ final double mu = getMean();
+ final double sigma = Math.sqrt(getVariance());
final boolean chebyshevApplies = !(Double.isInfinite(mu) ||
Double.isNaN(mu) ||
Double.isInfinite(sigma) ||
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BetaDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BetaDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BetaDistribution.java
index 0a07b49..6a198e5 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BetaDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BetaDistribution.java
@@ -115,7 +115,7 @@ public class BetaDistribution extends AbstractContinuousDistribution {
* {@code beta}, the mean is {@code alpha / (alpha + beta)}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
final double a = getAlpha();
return a / (a + getBeta());
}
@@ -128,7 +128,7 @@ public class BetaDistribution extends AbstractContinuousDistribution {
* {@code (alpha * beta) / [(alpha + beta)^2 * (alpha + beta + 1)]}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double a = getAlpha();
final double b = getBeta();
final double alphabetasum = a + b;
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BinomialDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BinomialDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BinomialDistribution.java
index 7177968..97389be 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BinomialDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/BinomialDistribution.java
@@ -114,7 +114,7 @@ public class BinomialDistribution extends AbstractDiscreteDistribution {
* {@code n * p}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return numberOfTrials * probabilityOfSuccess;
}
@@ -125,7 +125,7 @@ public class BinomialDistribution extends AbstractDiscreteDistribution {
* {@code n * p * (1 - p)}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double p = probabilityOfSuccess;
return numberOfTrials * p * (1 - p);
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
index a7b6c64..89aead7 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/CauchyDistribution.java
@@ -110,7 +110,7 @@ public class CauchyDistribution extends AbstractContinuousDistribution {
* @return mean (always Double.NaN)
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return Double.NaN;
}
@@ -122,7 +122,7 @@ public class CauchyDistribution extends AbstractContinuousDistribution {
* @return variance (always Double.NaN)
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return Double.NaN;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ChiSquaredDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ChiSquaredDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ChiSquaredDistribution.java
index 5f31254..3407cc6 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ChiSquaredDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ChiSquaredDistribution.java
@@ -65,7 +65,7 @@ public class ChiSquaredDistribution extends AbstractContinuousDistribution {
* For {@code k} degrees of freedom, the mean is {@code k}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return getDegreesOfFreedom();
}
@@ -75,7 +75,7 @@ public class ChiSquaredDistribution extends AbstractContinuousDistribution {
* @return {@code 2 * k}, where {@code k} is the number of degrees of freedom.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return 2 * getDegreesOfFreedom();
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ConstantContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ConstantContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ConstantContinuousDistribution.java
index 54694f1..592e19e 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ConstantContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ConstantContinuousDistribution.java
@@ -61,7 +61,7 @@ public class ConstantContinuousDistribution extends AbstractContinuousDistributi
* {@inheritDoc}
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return value;
}
@@ -69,7 +69,7 @@ public class ConstantContinuousDistribution extends AbstractContinuousDistributi
* {@inheritDoc}
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return 0;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
index c1f04f3..6d3cb3e 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ContinuousDistribution.java
@@ -103,14 +103,14 @@ public interface ContinuousDistribution {
*
* @return the mean, or {@code Double.NaN} if it is not defined.
*/
- double getNumericalMean();
+ double getMean();
/**
* Gets the variance of this distribution.
*
* @return the variance, or {@code Double.NaN} if it is not defined.
*/
- double getNumericalVariance();
+ double getVariance();
/**
* Gets the lower bound of the support.
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
index f418eb9..6770104 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/DiscreteDistribution.java
@@ -93,14 +93,14 @@ public interface DiscreteDistribution {
*
* @return the mean, or {@code Double.NaN} if it is not defined.
*/
- double getNumericalMean();
+ double getMean();
/**
* Gets the variance of this distribution.
*
* @return the variance, or {@code Double.NaN} if it is not defined.
*/
- double getNumericalVariance();
+ double getVariance();
/**
* Gets the lower bound of the support.
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ExponentialDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ExponentialDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ExponentialDistribution.java
index 091c6a4..9fdf5ea 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ExponentialDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ExponentialDistribution.java
@@ -43,15 +43,6 @@ public class ExponentialDistribution extends AbstractContinuousDistribution {
logMean = Math.log(mean);
}
- /**
- * Access the mean.
- *
- * @return the mean.
- */
- public double getMean() {
- return mean;
- }
-
/** {@inheritDoc} */
@Override
public double density(double x) {
@@ -111,14 +102,10 @@ public class ExponentialDistribution extends AbstractContinuousDistribution {
return ret;
}
- /**
- * {@inheritDoc}
- *
- * For mean parameter {@code k}, the mean is {@code k}.
- */
+ /** {@inheritDoc} */
@Override
- public double getNumericalMean() {
- return getMean();
+ public double getMean() {
+ return mean;
}
/**
@@ -127,9 +114,8 @@ public class ExponentialDistribution extends AbstractContinuousDistribution {
* For mean parameter {@code k}, the variance is {@code k^2}.
*/
@Override
- public double getNumericalVariance() {
- final double m = getMean();
- return m * m;
+ public double getVariance() {
+ return mean * mean;
}
/**
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/FDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/FDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/FDistribution.java
index a8b9890..7f19248 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/FDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/FDistribution.java
@@ -132,7 +132,7 @@ public class FDistribution extends AbstractContinuousDistribution {
* </ul>
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
final double denominatorDF = getDenominatorDegreesOfFreedom();
if (denominatorDF > 2) {
@@ -156,7 +156,7 @@ public class FDistribution extends AbstractContinuousDistribution {
* </ul>
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double denominatorDF = getDenominatorDegreesOfFreedom();
if (denominatorDF > 4) {
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GammaDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GammaDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GammaDistribution.java
index c13db5b..84d2f8a 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GammaDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GammaDistribution.java
@@ -257,7 +257,7 @@ public class GammaDistribution extends AbstractContinuousDistribution {
* mean is {@code alpha * beta}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return shape * scale;
}
@@ -270,7 +270,7 @@ public class GammaDistribution extends AbstractContinuousDistribution {
* @return {@inheritDoc}
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return shape * scale * scale;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java
index fba2580..0f8876f 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GeometricDistribution.java
@@ -88,7 +88,7 @@ public class GeometricDistribution extends AbstractDiscreteDistribution {
* For probability parameter {@code p}, the mean is {@code (1 - p) / p}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return (1 - probabilityOfSuccess) / probabilityOfSuccess;
}
@@ -99,7 +99,7 @@ public class GeometricDistribution extends AbstractDiscreteDistribution {
* {@code (1 - p) / (p * p)}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return (1 - probabilityOfSuccess) / (probabilityOfSuccess * probabilityOfSuccess);
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GumbelDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GumbelDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GumbelDistribution.java
index 97962a3..5c71855 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GumbelDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/GumbelDistribution.java
@@ -97,13 +97,13 @@ public class GumbelDistribution extends AbstractContinuousDistribution {
/** {@inheritDoc} */
@Override
- public double getNumericalMean() {
+ public double getMean() {
return mu + EULER * beta;
}
/** {@inheritDoc} */
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return PI_SQUARED_OVER_SIX * beta * beta;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/HypergeometricDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/HypergeometricDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/HypergeometricDistribution.java
index 732a253..d2bdbb0 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/HypergeometricDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/HypergeometricDistribution.java
@@ -232,7 +232,7 @@ public class HypergeometricDistribution extends AbstractDiscreteDistribution {
* size {@code n}, the mean is {@code n * m / N}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return getSampleSize() * (getNumberOfSuccesses() / (double) getPopulationSize());
}
@@ -244,7 +244,7 @@ public class HypergeometricDistribution extends AbstractDiscreteDistribution {
* {@code (n * m * (N - n) * (N - m)) / (N^2 * (N - 1))}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double N = getPopulationSize();
final double m = getNumberOfSuccesses();
final double n = getSampleSize();
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java
index 0d1a8bf..15c67f9 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LaplaceDistribution.java
@@ -101,13 +101,13 @@ public class LaplaceDistribution extends AbstractContinuousDistribution {
/** {@inheritDoc} */
@Override
- public double getNumericalMean() {
+ public double getMean() {
return mu;
}
/** {@inheritDoc} */
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return 2.0 * beta * beta;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LevyDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LevyDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LevyDistribution.java
index d16da8d..c61d6da 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LevyDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LevyDistribution.java
@@ -131,13 +131,13 @@ public class LevyDistribution extends AbstractContinuousDistribution {
/** {@inheritDoc} */
@Override
- public double getNumericalMean() {
+ public double getMean() {
return Double.POSITIVE_INFINITY;
}
/** {@inheritDoc} */
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return Double.POSITIVE_INFINITY;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
index 25bdd33..1766200 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogNormalDistribution.java
@@ -190,7 +190,7 @@ public class LogNormalDistribution extends AbstractContinuousDistribution {
* {@code exp(m + s^2 / 2)}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
double s = shape;
return Math.exp(scale + (s * s / 2));
}
@@ -202,7 +202,7 @@ public class LogNormalDistribution extends AbstractContinuousDistribution {
* {@code (exp(s^2) - 1) * exp(2 * m + s^2)}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double s = shape;
final double ss = s * s;
return (Math.expm1(ss)) * Math.exp(2 * scale + ss);
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogisticDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogisticDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogisticDistribution.java
index 28a6657..ecf9efb 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogisticDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/LogisticDistribution.java
@@ -98,13 +98,13 @@ public class LogisticDistribution extends AbstractContinuousDistribution {
/** {@inheritDoc} */
@Override
- public double getNumericalMean() {
+ public double getMean() {
return mu;
}
/** {@inheritDoc} */
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return oneOverScale * oneOverScale * PI_SQUARED_OVER_THREE;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NakagamiDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NakagamiDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NakagamiDistribution.java
index 9bf7d2f..ab94bb8 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NakagamiDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NakagamiDistribution.java
@@ -85,13 +85,13 @@ public class NakagamiDistribution extends AbstractContinuousDistribution {
/** {@inheritDoc} */
@Override
- public double getNumericalMean() {
+ public double getMean() {
return Gamma.value(mu + 0.5) / Gamma.value(mu) * Math.sqrt(omega / mu);
}
/** {@inheritDoc} */
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
double v = Gamma.value(mu + 0.5) / Gamma.value(mu);
return omega * (1 - 1 / mu * v * v);
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
index 632657f..5d60824 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/NormalDistribution.java
@@ -65,15 +65,6 @@ public class NormalDistribution extends AbstractContinuousDistribution {
}
/**
- * Access the mean.
- *
- * @return the mean for this distribution.
- */
- public double getMean() {
- return mean;
- }
-
- /**
* Access the standard deviation.
*
* @return the standard deviation for this distribution.
@@ -136,14 +127,10 @@ public class NormalDistribution extends AbstractContinuousDistribution {
return 0.5 * ErfDifference.value(v0, v1);
}
- /**
- * {@inheritDoc}
- *
- * For mean parameter {@code mu}, the mean is {@code mu}.
- */
+ /** {@inheritDoc} */
@Override
- public double getNumericalMean() {
- return getMean();
+ public double getMean() {
+ return mean;
}
/**
@@ -152,7 +139,7 @@ public class NormalDistribution extends AbstractContinuousDistribution {
* For standard deviation parameter {@code s}, the variance is {@code s^2}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double s = getStandardDeviation();
return s * s;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
index 2bbd42d..958d9d5 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ParetoDistribution.java
@@ -144,7 +144,7 @@ public class ParetoDistribution extends AbstractContinuousDistribution {
* </ul>
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
if (shape <= 1) {
return Double.POSITIVE_INFINITY;
}
@@ -161,7 +161,7 @@ public class ParetoDistribution extends AbstractContinuousDistribution {
* </ul>
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
if (shape <= 2) {
return Double.POSITIVE_INFINITY;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PascalDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PascalDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PascalDistribution.java
index 8bdf6b6..7520bba 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PascalDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PascalDistribution.java
@@ -152,7 +152,7 @@ public class PascalDistribution extends AbstractDiscreteDistribution {
* the mean is {@code r * (1 - p) / p}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
final double p = getProbabilityOfSuccess();
final double r = getNumberOfSuccesses();
return (r * (1 - p)) / p;
@@ -165,7 +165,7 @@ public class PascalDistribution extends AbstractDiscreteDistribution {
* the variance is {@code r * (1 - p) / p^2}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double p = getProbabilityOfSuccess();
final double r = getNumberOfSuccesses();
return r * (1 - p) / (p * p);
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
index 225b8f1..d33e439 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
@@ -99,15 +99,6 @@ public class PoissonDistribution extends AbstractDiscreteDistribution {
this(p, DEFAULT_EPSILON, maxIterations);
}
- /**
- * Get the mean for the distribution.
- *
- * @return the mean for the distribution.
- */
- public double getMean() {
- return mean;
- }
-
/** {@inheritDoc} */
@Override
public double probability(int x) {
@@ -160,14 +151,10 @@ public class PoissonDistribution extends AbstractDiscreteDistribution {
return normal.cumulativeProbability(x + 0.5);
}
- /**
- * {@inheritDoc}
- *
- * For mean parameter {@code p}, the mean is {@code p}.
- */
+ /** {@inheritDoc} */
@Override
- public double getNumericalMean() {
- return getMean();
+ public double getMean() {
+ return mean;
}
/**
@@ -176,8 +163,8 @@ public class PoissonDistribution extends AbstractDiscreteDistribution {
* For mean parameter {@code p}, the variance is {@code p}.
*/
@Override
- public double getNumericalVariance() {
- return getMean();
+ public double getVariance() {
+ return mean;
}
/**
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java
index ef34c1f..07b1fc6 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TDistribution.java
@@ -102,7 +102,7 @@ public class TDistribution extends AbstractContinuousDistribution {
* </ul>
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
final double df = getDegreesOfFreedom();
if (df > 1) {
@@ -124,7 +124,7 @@ public class TDistribution extends AbstractContinuousDistribution {
* </ul>
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double df = getDegreesOfFreedom();
if (df > 2) {
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
index 6a94b62..01fab1a 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/TriangularDistribution.java
@@ -148,7 +148,7 @@ public class TriangularDistribution extends AbstractContinuousDistribution {
* the mean is {@code (a + b + c) / 3}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return (a + b + c) / 3;
}
@@ -159,7 +159,7 @@ public class TriangularDistribution extends AbstractContinuousDistribution {
* the variance is {@code (a^2 + b^2 + c^2 - a * b - a * c - b * c) / 18}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return (a * a + b * b + c * c - a * b - a * c - b * c) / 18;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
index e68465b..03e136b 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformContinuousDistribution.java
@@ -95,7 +95,7 @@ public class UniformContinuousDistribution extends AbstractContinuousDistributio
* {@code 0.5 * (lower + upper)}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return 0.5 * (lower + upper);
}
@@ -106,7 +106,7 @@ public class UniformContinuousDistribution extends AbstractContinuousDistributio
* variance is {@code (upper - lower)^2 / 12}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
double ul = upper - lower;
return ul * ul / 12;
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
index 41df2bd..47ffffb 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/UniformDiscreteDistribution.java
@@ -85,7 +85,7 @@ public class UniformDiscreteDistribution extends AbstractDiscreteDistribution {
* {@code 0.5 * (lower + upper)}.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
return 0.5 * upperPlusLower;
}
@@ -96,7 +96,7 @@ public class UniformDiscreteDistribution extends AbstractDiscreteDistribution {
* {@code n = upper - lower + 1}, the variance is {@code (n^2 - 1) / 12}.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
double n = upperMinusLower + 1;
return ONE_TWELFTH * (n * n - 1);
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/WeibullDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/WeibullDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/WeibullDistribution.java
index 0e396d8..dd227ba 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/WeibullDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/WeibullDistribution.java
@@ -156,7 +156,7 @@ public class WeibullDistribution extends AbstractContinuousDistribution {
* is the Gamma-function.
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
final double sh = getShape();
final double sc = getScale();
@@ -170,10 +170,10 @@ public class WeibullDistribution extends AbstractContinuousDistribution {
* where {@code Gamma()} is the Gamma-function.
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final double sh = getShape();
final double sc = getScale();
- final double mn = getNumericalMean();
+ final double mn = getMean();
return (sc * sc) * Math.exp(LogGamma.value(1 + (2 / sh))) -
(mn * mn);
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ZipfDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ZipfDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ZipfDistribution.java
index f0d54a1..8d233fa 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ZipfDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/ZipfDistribution.java
@@ -130,7 +130,7 @@ public class ZipfDistribution extends AbstractDiscreteDistribution {
* </ul>
*/
@Override
- public double getNumericalMean() {
+ public double getMean() {
final int N = getNumberOfElements();
final double s = getExponent();
@@ -152,7 +152,7 @@ public class ZipfDistribution extends AbstractDiscreteDistribution {
* </ul>
*/
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
final int N = getNumberOfElements();
final double s = getExponent();
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
index 3e30763..b47e5ad 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractContinuousDistributionTest.java
@@ -69,13 +69,13 @@ public class AbstractContinuousDistributionTest {
}
@Override
- public double getNumericalMean() {
+ public double getMean() {
return ((x0 + x1) * p12 + (x2 + x3) * (1.0 - p12)) / 2.0;
}
@Override
- public double getNumericalVariance() {
- final double meanX = getNumericalMean();
+ public double getVariance() {
+ final double meanX = getMean();
final double meanX2;
meanX2 = ((x0 * x0 + x0 * x1 + x1 * x1) * p12 + (x2 * x2 + x2
* x3 + x3 * x3)
@@ -154,7 +154,7 @@ public class AbstractContinuousDistributionTest {
}
@Override
- public double getNumericalMean() {
+ public double getMean() {
final UnivariateFunction f = new UnivariateFunction() {
@Override
@@ -167,8 +167,8 @@ public class AbstractContinuousDistributionTest {
}
@Override
- public double getNumericalVariance() {
- final double meanX = getNumericalMean();
+ public double getVariance() {
+ final double meanX = getMean();
final UnivariateFunction f = new UnivariateFunction() {
@Override
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
index bcf8e7c..2e8c7ae 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistributionTest.java
@@ -103,12 +103,12 @@ public class AbstractDiscreteDistributionTest {
}
@Override
- public double getNumericalMean() {
+ public double getMean() {
return 3.5;
}
@Override
- public double getNumericalVariance() {
+ public double getVariance() {
return 70/24; // E(X^2) - E(X)^2
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
index f37961c..91c23b2 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BetaDistributionTest.java
@@ -304,12 +304,12 @@ public class BetaDistributionTest {
BetaDistribution dist;
dist = new BetaDistribution(1, 1);
- Assert.assertEquals(dist.getNumericalMean(), 0.5, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 1.0 / 12.0, tol);
+ Assert.assertEquals(dist.getMean(), 0.5, tol);
+ Assert.assertEquals(dist.getVariance(), 1.0 / 12.0, tol);
dist = new BetaDistribution(2, 5);
- Assert.assertEquals(dist.getNumericalMean(), 2.0 / 7.0, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 10.0 / (49.0 * 8.0), tol);
+ Assert.assertEquals(dist.getMean(), 2.0 / 7.0, tol);
+ Assert.assertEquals(dist.getVariance(), 10.0 / (49.0 * 8.0), tol);
}
@Test
@@ -326,10 +326,10 @@ public class BetaDistributionTest {
final String distribution = String.format("Beta(%.2f, %.2f)", alpha, beta);
Assert.assertEquals(String.format("E[%s]", distribution),
- betaDistribution.getNumericalMean(),
+ betaDistribution.getMean(),
StatUtils.mean(observed), epsilon);
Assert.assertEquals(String.format("Var[%s]", distribution),
- betaDistribution.getNumericalVariance(),
+ betaDistribution.getVariance(),
StatUtils.variance(observed), epsilon);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
index 9d5a97e..ff64971 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/BinomialDistributionTest.java
@@ -150,12 +150,12 @@ public class BinomialDistributionTest extends DiscreteDistributionAbstractTest {
BinomialDistribution dist;
dist = new BinomialDistribution(10, 0.5);
- Assert.assertEquals(dist.getNumericalMean(), 10d * 0.5d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 10d * 0.5d * 0.5d, tol);
+ Assert.assertEquals(dist.getMean(), 10d * 0.5d, tol);
+ Assert.assertEquals(dist.getVariance(), 10d * 0.5d * 0.5d, tol);
dist = new BinomialDistribution(30, 0.3);
- Assert.assertEquals(dist.getNumericalMean(), 30d * 0.3d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 30d * 0.3d * (1d - 0.3d), tol);
+ Assert.assertEquals(dist.getMean(), 30d * 0.3d, tol);
+ Assert.assertEquals(dist.getVariance(), 30d * 0.3d * (1d - 0.3d), tol);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
index 4407976..7093931 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/CauchyDistributionTest.java
@@ -101,11 +101,11 @@ public class CauchyDistributionTest extends ContinuousDistributionAbstractTest {
CauchyDistribution dist;
dist = new CauchyDistribution(10.2, 0.15);
- Assert.assertTrue(Double.isNaN(dist.getNumericalMean()));
- Assert.assertTrue(Double.isNaN(dist.getNumericalVariance()));
+ Assert.assertTrue(Double.isNaN(dist.getMean()));
+ Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new CauchyDistribution(23.12, 2.12);
- Assert.assertTrue(Double.isNaN(dist.getNumericalMean()));
- Assert.assertTrue(Double.isNaN(dist.getNumericalVariance()));
+ Assert.assertTrue(Double.isNaN(dist.getMean()));
+ Assert.assertTrue(Double.isNaN(dist.getVariance()));
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
index dc97f47..0043062 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ChiSquaredDistributionTest.java
@@ -126,11 +126,11 @@ public class ChiSquaredDistributionTest extends ContinuousDistributionAbstractTe
ChiSquaredDistribution dist;
dist = new ChiSquaredDistribution(1500);
- Assert.assertEquals(dist.getNumericalMean(), 1500, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 3000, tol);
+ Assert.assertEquals(dist.getMean(), 1500, tol);
+ Assert.assertEquals(dist.getVariance(), 3000, tol);
dist = new ChiSquaredDistribution(1.12);
- Assert.assertEquals(dist.getNumericalMean(), 1.12, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 2.24, tol);
+ Assert.assertEquals(dist.getMean(), 1.12, tol);
+ Assert.assertEquals(dist.getVariance(), 2.24, tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
index 152a6c2..586485a 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ConstantContinuousDistributionTest.java
@@ -76,8 +76,8 @@ public class ConstantContinuousDistributionTest extends ContinuousDistributionAb
ConstantContinuousDistribution dist;
dist = new ConstantContinuousDistribution(-1);
- Assert.assertEquals(dist.getNumericalMean(), -1, 0d);
- Assert.assertEquals(dist.getNumericalVariance(), 0, 0d);
+ Assert.assertEquals(dist.getMean(), -1, 0d);
+ Assert.assertEquals(dist.getVariance(), 0, 0d);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
index 649ce7a..b82716c 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ExponentialDistributionTest.java
@@ -122,11 +122,11 @@ public class ExponentialDistributionTest extends ContinuousDistributionAbstractT
ExponentialDistribution dist;
dist = new ExponentialDistribution(11d);
- Assert.assertEquals(dist.getNumericalMean(), 11d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 11d * 11d, tol);
+ Assert.assertEquals(dist.getMean(), 11d, tol);
+ Assert.assertEquals(dist.getVariance(), 11d * 11d, tol);
dist = new ExponentialDistribution(10.5d);
- Assert.assertEquals(dist.getNumericalMean(), 10.5d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 10.5d * 10.5d, tol);
+ Assert.assertEquals(dist.getMean(), 10.5d, tol);
+ Assert.assertEquals(dist.getVariance(), 10.5d * 10.5d, tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
index b29a0be..e286667 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/FDistributionTest.java
@@ -122,16 +122,16 @@ public class FDistributionTest extends ContinuousDistributionAbstractTest {
FDistribution dist;
dist = new FDistribution(1, 2);
- Assert.assertTrue(Double.isNaN(dist.getNumericalMean()));
- Assert.assertTrue(Double.isNaN(dist.getNumericalVariance()));
+ Assert.assertTrue(Double.isNaN(dist.getMean()));
+ Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new FDistribution(1, 3);
- Assert.assertEquals(dist.getNumericalMean(), 3d / (3d - 2d), tol);
- Assert.assertTrue(Double.isNaN(dist.getNumericalVariance()));
+ Assert.assertEquals(dist.getMean(), 3d / (3d - 2d), tol);
+ Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new FDistribution(1, 5);
- Assert.assertEquals(dist.getNumericalMean(), 5d / (5d - 2d), tol);
- Assert.assertEquals(dist.getNumericalVariance(), (2d * 5d * 5d * 4d) / 9d, tol);
+ Assert.assertEquals(dist.getMean(), 5d / (5d - 2d), tol);
+ Assert.assertEquals(dist.getVariance(), (2d * 5d * 5d * 4d) / 9d, tol);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
index b25f251..a281748 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GammaDistributionTest.java
@@ -158,12 +158,12 @@ public class GammaDistributionTest extends ContinuousDistributionAbstractTest {
GammaDistribution dist;
dist = new GammaDistribution(1, 2);
- Assert.assertEquals(dist.getNumericalMean(), 2, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 4, tol);
+ Assert.assertEquals(dist.getMean(), 2, tol);
+ Assert.assertEquals(dist.getVariance(), 4, tol);
dist = new GammaDistribution(1.1, 4.2);
- Assert.assertEquals(dist.getNumericalMean(), 1.1d * 4.2d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 1.1d * 4.2d * 4.2d, tol);
+ Assert.assertEquals(dist.getMean(), 1.1d * 4.2d, tol);
+ Assert.assertEquals(dist.getVariance(), 1.1d * 4.2d * 4.2d, tol);
}
private static final double HALF_LOG_2_PI = 0.5 * Math.log(2.0 * Math.PI);
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
index 25cf6ed..128e372 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/GeometricDistributionTest.java
@@ -157,11 +157,11 @@ public class GeometricDistributionTest extends DiscreteDistributionAbstractTest
GeometricDistribution dist;
dist = new GeometricDistribution(0.5);
- Assert.assertEquals(dist.getNumericalMean(), (1.0d - 0.5d) / 0.5d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), (1.0d - 0.5d) / (0.5d * 0.5d), tol);
+ Assert.assertEquals(dist.getMean(), (1.0d - 0.5d) / 0.5d, tol);
+ Assert.assertEquals(dist.getVariance(), (1.0d - 0.5d) / (0.5d * 0.5d), tol);
dist = new GeometricDistribution(0.3);
- Assert.assertEquals(dist.getNumericalMean(), (1.0d - 0.3d) / 0.3d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), (1.0d - 0.3d) / (0.3d * 0.3d), tol);
+ Assert.assertEquals(dist.getMean(), (1.0d - 0.3d) / 0.3d, tol);
+ Assert.assertEquals(dist.getVariance(), (1.0d - 0.3d) / (0.3d * 0.3d), tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
index 95be226..777d4a9 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/HypergeometricDistributionTest.java
@@ -267,12 +267,12 @@ public class HypergeometricDistributionTest extends DiscreteDistributionAbstract
HypergeometricDistribution dist;
dist = new HypergeometricDistribution(1500, 40, 100);
- Assert.assertEquals(dist.getNumericalMean(), 40d * 100d / 1500d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), ( 100d * 40d * (1500d - 100d) * (1500d - 40d) ) / ( (1500d * 1500d * 1499d) ), tol);
+ Assert.assertEquals(dist.getMean(), 40d * 100d / 1500d, tol);
+ Assert.assertEquals(dist.getVariance(), ( 100d * 40d * (1500d - 100d) * (1500d - 40d) ) / ( (1500d * 1500d * 1499d) ), tol);
dist = new HypergeometricDistribution(3000, 55, 200);
- Assert.assertEquals(dist.getNumericalMean(), 55d * 200d / 3000d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), ( 200d * 55d * (3000d - 200d) * (3000d - 55d) ) / ( (3000d * 3000d * 2999d) ), tol);
+ Assert.assertEquals(dist.getMean(), 55d * 200d / 3000d, tol);
+ Assert.assertEquals(dist.getVariance(), ( 200d * 55d * (3000d - 200d) * (3000d - 55d) ) / ( (3000d * 3000d * 2999d) ), tol);
}
@Test
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
index 43b2fdd..f7a5b4c 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/LogNormalDistributionTest.java
@@ -227,24 +227,24 @@ public class LogNormalDistributionTest extends ContinuousDistributionAbstractTes
LogNormalDistribution dist;
dist = new LogNormalDistribution(0, 1);
- Assert.assertEquals(dist.getNumericalMean(), 1.6487212707001282, tol);
- Assert.assertEquals(dist.getNumericalVariance(),
+ Assert.assertEquals(dist.getMean(), 1.6487212707001282, tol);
+ Assert.assertEquals(dist.getVariance(),
4.670774270471604, tol);
dist = new LogNormalDistribution(2.2, 1.4);
- Assert.assertEquals(dist.getNumericalMean(), 24.046753552064498, tol);
- Assert.assertEquals(dist.getNumericalVariance(),
+ Assert.assertEquals(dist.getMean(), 24.046753552064498, tol);
+ Assert.assertEquals(dist.getVariance(),
3526.913651880464, tol);
dist = new LogNormalDistribution(-2000.9, 10.4);
- Assert.assertEquals(dist.getNumericalMean(), 0.0, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 0.0, tol);
+ Assert.assertEquals(dist.getMean(), 0.0, tol);
+ Assert.assertEquals(dist.getVariance(), 0.0, tol);
}
@Test
public void testTinyVariance() {
LogNormalDistribution dist = new LogNormalDistribution(0, 1e-9);
- double t = dist.getNumericalVariance();
+ double t = dist.getVariance();
Assert.assertEquals(1e-18, t, 1e-20);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
index 3b2889e..9262252 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/NormalDistributionTest.java
@@ -199,15 +199,15 @@ public class NormalDistributionTest extends ContinuousDistributionAbstractTest {
NormalDistribution dist;
dist = new NormalDistribution(0, 1);
- Assert.assertEquals(dist.getNumericalMean(), 0, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 1, tol);
+ Assert.assertEquals(dist.getMean(), 0, tol);
+ Assert.assertEquals(dist.getVariance(), 1, tol);
dist = new NormalDistribution(2.2, 1.4);
- Assert.assertEquals(dist.getNumericalMean(), 2.2, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 1.4 * 1.4, tol);
+ Assert.assertEquals(dist.getMean(), 2.2, tol);
+ Assert.assertEquals(dist.getVariance(), 1.4 * 1.4, tol);
dist = new NormalDistribution(-2000.9, 10.4);
- Assert.assertEquals(dist.getNumericalMean(), -2000.9, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 10.4 * 10.4, tol);
+ Assert.assertEquals(dist.getMean(), -2000.9, tol);
+ Assert.assertEquals(dist.getVariance(), 10.4 * 10.4, tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
index 6223dbc..52b0521 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ParetoDistributionTest.java
@@ -191,11 +191,11 @@ public class ParetoDistributionTest extends ContinuousDistributionAbstractTest {
ParetoDistribution dist;
dist = new ParetoDistribution(1, 1);
- Assert.assertEquals(dist.getNumericalMean(), Double.POSITIVE_INFINITY, tol);
- Assert.assertEquals(dist.getNumericalVariance(), Double.POSITIVE_INFINITY, tol);
+ Assert.assertEquals(dist.getMean(), Double.POSITIVE_INFINITY, tol);
+ Assert.assertEquals(dist.getVariance(), Double.POSITIVE_INFINITY, tol);
dist = new ParetoDistribution(2.2, 2.4);
- Assert.assertEquals(dist.getNumericalMean(), 3.771428571428, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 14.816326530, tol);
+ Assert.assertEquals(dist.getMean(), 3.771428571428, tol);
+ Assert.assertEquals(dist.getVariance(), 14.816326530, tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
index b0d7ac1..3cc9f85 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PascalDistributionTest.java
@@ -122,11 +122,11 @@ public class PascalDistributionTest extends DiscreteDistributionAbstractTest {
PascalDistribution dist;
dist = new PascalDistribution(10, 0.5);
- Assert.assertEquals(dist.getNumericalMean(), ( 10d * 0.5d ) / 0.5d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), ( 10d * 0.5d ) / (0.5d * 0.5d), tol);
+ Assert.assertEquals(dist.getMean(), ( 10d * 0.5d ) / 0.5d, tol);
+ Assert.assertEquals(dist.getVariance(), ( 10d * 0.5d ) / (0.5d * 0.5d), tol);
dist = new PascalDistribution(25, 0.7);
- Assert.assertEquals(dist.getNumericalMean(), ( 25d * 0.3d ) / 0.7d, tol);
- Assert.assertEquals(dist.getNumericalVariance(), ( 25d * 0.3d ) / (0.7d * 0.7d), tol);
+ Assert.assertEquals(dist.getMean(), ( 25d * 0.3d ) / 0.7d, tol);
+ Assert.assertEquals(dist.getVariance(), ( 25d * 0.3d ) / (0.7d * 0.7d), tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
index 150e120..d0f59cf 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/PoissonDistributionTest.java
@@ -234,11 +234,11 @@ public class PoissonDistributionTest extends DiscreteDistributionAbstractTest {
PoissonDistribution dist;
dist = new PoissonDistribution(1);
- Assert.assertEquals(dist.getNumericalMean(), 1, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 1, tol);
+ Assert.assertEquals(dist.getMean(), 1, tol);
+ Assert.assertEquals(dist.getVariance(), 1, tol);
dist = new PoissonDistribution(11.23);
- Assert.assertEquals(dist.getNumericalMean(), 11.23, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 11.23, tol);
+ Assert.assertEquals(dist.getMean(), 11.23, tol);
+ Assert.assertEquals(dist.getVariance(), 11.23, tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
index 46e2a08..06d2efb 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TDistributionTest.java
@@ -127,16 +127,16 @@ public class TDistributionTest extends ContinuousDistributionAbstractTest {
TDistribution dist;
dist = new TDistribution(1);
- Assert.assertTrue(Double.isNaN(dist.getNumericalMean()));
- Assert.assertTrue(Double.isNaN(dist.getNumericalVariance()));
+ Assert.assertTrue(Double.isNaN(dist.getMean()));
+ Assert.assertTrue(Double.isNaN(dist.getVariance()));
dist = new TDistribution(1.5);
- Assert.assertEquals(dist.getNumericalMean(), 0, tol);
- Assert.assertTrue(Double.isInfinite(dist.getNumericalVariance()));
+ Assert.assertEquals(dist.getMean(), 0, tol);
+ Assert.assertTrue(Double.isInfinite(dist.getVariance()));
dist = new TDistribution(5);
- Assert.assertEquals(dist.getNumericalMean(), 0, tol);
- Assert.assertEquals(dist.getNumericalVariance(), 5d / (5d - 2d), tol);
+ Assert.assertEquals(dist.getMean(), 0, tol);
+ Assert.assertEquals(dist.getVariance(), 5d / (5d - 2d), tol);
}
/*
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
index cddb70d..311a74f 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/TriangularDistributionTest.java
@@ -178,15 +178,15 @@ public class TriangularDistributionTest extends ContinuousDistributionAbstractTe
TriangularDistribution dist;
dist = new TriangularDistribution(0, 0.5, 1.0);
- Assert.assertEquals(dist.getNumericalMean(), 0.5, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 1 / 24.0, 0);
+ Assert.assertEquals(dist.getMean(), 0.5, 0);
+ Assert.assertEquals(dist.getVariance(), 1 / 24.0, 0);
dist = new TriangularDistribution(0, 1, 1);
- Assert.assertEquals(dist.getNumericalMean(), 2 / 3.0, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 1 / 18.0, 0);
+ Assert.assertEquals(dist.getMean(), 2 / 3.0, 0);
+ Assert.assertEquals(dist.getVariance(), 1 / 18.0, 0);
dist = new TriangularDistribution(-3, 2, 12);
- Assert.assertEquals(dist.getNumericalMean(), 3 + (2 / 3.0), 0);
- Assert.assertEquals(dist.getNumericalVariance(), 175 / 18.0, 0);
+ Assert.assertEquals(dist.getMean(), 3 + (2 / 3.0), 0);
+ Assert.assertEquals(dist.getVariance(), 175 / 18.0, 0);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
index 7f76f08..5f122db 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformContinuousDistributionTest.java
@@ -98,16 +98,16 @@ public class UniformContinuousDistributionTest extends ContinuousDistributionAbs
UniformContinuousDistribution dist;
dist = new UniformContinuousDistribution(0, 1);
- Assert.assertEquals(dist.getNumericalMean(), 0.5, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 1/12.0, 0);
+ Assert.assertEquals(dist.getMean(), 0.5, 0);
+ Assert.assertEquals(dist.getVariance(), 1/12.0, 0);
dist = new UniformContinuousDistribution(-1.5, 0.6);
- Assert.assertEquals(dist.getNumericalMean(), -0.45, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 0.3675, 0);
+ Assert.assertEquals(dist.getMean(), -0.45, 0);
+ Assert.assertEquals(dist.getVariance(), 0.3675, 0);
dist = new UniformContinuousDistribution(-0.5, 1.25);
- Assert.assertEquals(dist.getNumericalMean(), 0.375, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 0.2552083333333333, 0);
+ Assert.assertEquals(dist.getMean(), 0.375, 0);
+ Assert.assertEquals(dist.getVariance(), 0.2552083333333333, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
index 98305db..b9cac54 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/UniformDiscreteDistributionTest.java
@@ -90,12 +90,12 @@ public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstrac
UniformDiscreteDistribution dist;
dist = new UniformDiscreteDistribution(0, 5);
- Assert.assertEquals(dist.getNumericalMean(), 2.5, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 35 / 12.0, 0);
+ Assert.assertEquals(dist.getMean(), 2.5, 0);
+ Assert.assertEquals(dist.getVariance(), 35 / 12.0, 0);
dist = new UniformDiscreteDistribution(0, 1);
- Assert.assertEquals(dist.getNumericalMean(), 0.5, 0);
- Assert.assertEquals(dist.getNumericalVariance(), 3 / 12.0, 0);
+ Assert.assertEquals(dist.getMean(), 0.5, 0);
+ Assert.assertEquals(dist.getVariance(), 3 / 12.0, 0);
}
// MATH-1141
@@ -121,7 +121,7 @@ public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstrac
Assert.assertEquals(0.5 / hi, dist.probability(123456), tol);
Assert.assertEquals(0.5, dist.cumulativeProbability(-1), tol);
- Assert.assertTrue(Precision.equals((Math.pow(2d * hi, 2) - 1) / 12, dist.getNumericalVariance(), 1));
+ Assert.assertTrue(Precision.equals((Math.pow(2d * hi, 2) - 1) / 12, dist.getVariance(), 1));
}
// MATH-1396
@@ -134,6 +134,6 @@ public class UniformDiscreteDistributionTest extends DiscreteDistributionAbstrac
Assert.assertEquals(1d / 3d, dist.probability(hi), tol);
Assert.assertEquals(2d / 3d, dist.cumulativeProbability(hi), tol);
- Assert.assertTrue(Precision.equals(hi, dist.getNumericalMean(), 1));
+ Assert.assertTrue(Precision.equals(hi, dist.getMean(), 1));
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
index c993fba..006b798 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/WeibullDistributionTest.java
@@ -104,15 +104,15 @@ public class WeibullDistributionTest extends ContinuousDistributionAbstractTest
dist = new WeibullDistribution(2.5, 3.5);
// In R: 3.5*gamma(1+(1/2.5)) (or emperically: mean(rweibull(10000, 2.5, 3.5)))
- Assert.assertEquals(dist.getNumericalMean(), 3.5 * Math.exp(LogGamma.value(1 + (1 / 2.5))), tol);
- Assert.assertEquals(dist.getNumericalVariance(), (3.5 * 3.5) *
+ Assert.assertEquals(dist.getMean(), 3.5 * Math.exp(LogGamma.value(1 + (1 / 2.5))), tol);
+ Assert.assertEquals(dist.getVariance(), (3.5 * 3.5) *
Math.exp(LogGamma.value(1 + (2 / 2.5))) -
- (dist.getNumericalMean() * dist.getNumericalMean()), tol);
+ (dist.getMean() * dist.getMean()), tol);
dist = new WeibullDistribution(10.4, 2.222);
- Assert.assertEquals(dist.getNumericalMean(), 2.222 * Math.exp(LogGamma.value(1 + (1 / 10.4))), tol);
- Assert.assertEquals(dist.getNumericalVariance(), (2.222 * 2.222) *
+ Assert.assertEquals(dist.getMean(), 2.222 * Math.exp(LogGamma.value(1 + (1 / 10.4))), tol);
+ Assert.assertEquals(dist.getVariance(), (2.222 * 2.222) *
Math.exp(LogGamma.value(1 + (2 / 10.4))) -
- (dist.getNumericalMean() * dist.getNumericalMean()), tol);
+ (dist.getMean() * dist.getMean()), tol);
}
}
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/764dfb85/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
index 489a4bb..cb25c95 100644
--- a/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
+++ b/commons-statistics-distribution/src/test/java/org/apache/commons/statistics/distribution/ZipfDistributionTest.java
@@ -114,8 +114,8 @@ public class ZipfDistributionTest extends DiscreteDistributionAbstractTest {
ZipfDistribution dist;
dist = new ZipfDistribution(2, 0.5);
- Assert.assertEquals(dist.getNumericalMean(), Math.sqrt(2), tol);
- Assert.assertEquals(dist.getNumericalVariance(), 0.24264068711928521, tol);
+ Assert.assertEquals(dist.getMean(), Math.sqrt(2), tol);
+ Assert.assertEquals(dist.getVariance(), 0.24264068711928521, tol);
}
[4/6] commons-statistics git commit: Hide implementation details.
Posted by er...@apache.org.
Hide implementation details.
Project: http://git-wip-us.apache.org/repos/asf/commons-statistics/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-statistics/commit/9abbfc6d
Tree: http://git-wip-us.apache.org/repos/asf/commons-statistics/tree/9abbfc6d
Diff: http://git-wip-us.apache.org/repos/asf/commons-statistics/diff/9abbfc6d
Branch: refs/heads/master
Commit: 9abbfc6d598561bdb84e8b276242a29f232254db
Parents: e7e5dea
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Thu Jan 25 14:09:58 2018 +0100
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Thu Jan 25 14:09:58 2018 +0100
----------------------------------------------------------------------
.../statistics/distribution/AbstractContinuousDistribution.java | 2 +-
.../statistics/distribution/AbstractDiscreteDistribution.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/9abbfc6d/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
index c084bb6..37f66ec 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractContinuousDistribution.java
@@ -34,7 +34,7 @@ import org.apache.commons.rng.sampling.distribution.ContinuousSampler;
* inversion method</a> for generating random samples that follow the
* distribution.
*/
-public abstract class AbstractContinuousDistribution
+abstract class AbstractContinuousDistribution
implements ContinuousDistribution {
/**
* For a random variable {@code X} whose values are distributed according
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/9abbfc6d/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
index 1b80851..9925f3e 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/AbstractDiscreteDistribution.java
@@ -26,7 +26,7 @@ import org.apache.commons.rng.sampling.distribution.DiscreteSampler;
* implementations are provided for some of the methods that do not vary
* from distribution to distribution.
*/
-public abstract class AbstractDiscreteDistribution
+abstract class AbstractDiscreteDistribution
implements DiscreteDistribution {
/**
* {@inheritDoc}
[3/6] commons-statistics git commit: Javadoc.
Posted by er...@apache.org.
Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/commons-statistics/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-statistics/commit/e7e5dea8
Tree: http://git-wip-us.apache.org/repos/asf/commons-statistics/tree/e7e5dea8
Diff: http://git-wip-us.apache.org/repos/asf/commons-statistics/diff/e7e5dea8
Branch: refs/heads/master
Commit: e7e5dea8cea40c4ba36303ba4db781a0ba9b6798
Parents: 764dfb8
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
Authored: Thu Jan 25 14:09:37 2018 +0100
Committer: Gilles Sadowski <gi...@harfang.homelinux.org>
Committed: Thu Jan 25 14:09:37 2018 +0100
----------------------------------------------------------------------
.../commons/statistics/distribution/PoissonDistribution.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-statistics/blob/e7e5dea8/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
----------------------------------------------------------------------
diff --git a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
index d33e439..26ea3fc 100644
--- a/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
+++ b/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution/PoissonDistribution.java
@@ -56,7 +56,7 @@ public class PoissonDistribution extends AbstractDiscreteDistribution {
*
* @param p Poisson mean.
* @param epsilon Convergence criterion for cumulative probabilities.
- * @param maxIterations the maximum number of iterations for cumulative
+ * @param maxIterations Maximum number of iterations for cumulative
* probabilities.
* @throws IllegalArgumentException if {@code p <= 0}.
*/