You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ce...@apache.org on 2011/11/10 15:11:07 UTC
svn commit: r1200334 -
/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/
Author: celestin
Date: Thu Nov 10 14:11:06 2011
New Revision: 1200334
URL: http://svn.apache.org/viewvc?rev=1200334&view=rev
Log:
Removed illegal @Override.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java Thu Nov 10 14:11:06 2011
@@ -65,7 +65,6 @@ public abstract class AbstractContinuous
*
* @return 0
*/
- @Override
public final double probability(double x) {
return 0.0;
}
@@ -73,7 +72,6 @@ public abstract class AbstractContinuous
/**
* {@inheritDoc}
*/
- @Override
public double inverseCumulativeProbability(final double p) throws OutOfRangeException {
if (p < 0.0 || p > 1.0) {
@@ -84,7 +82,6 @@ public abstract class AbstractContinuous
// subclasses can override if there is a better method.
UnivariateRealFunction rootFindingFunction =
new UnivariateRealFunction() {
- @Override
public double value(double x) {
return cumulativeProbability(x) - p;
}
@@ -128,7 +125,6 @@ public abstract class AbstractContinuous
* @param seed New seed.
* @since 2.2
*/
- @Override
public void reseedRandomGenerator(long seed) {
randomData.reSeed(seed);
}
@@ -143,7 +139,6 @@ public abstract class AbstractContinuous
* @return a random value.
* @since 2.2
*/
- @Override
public double sample() {
return randomData.nextInversionDeviate(this);
}
@@ -157,7 +152,6 @@ public abstract class AbstractContinuous
* @throws NotStrictlyPositiveException if {@code sampleSize} is not positive.
* @since 2.2
*/
- @Override
public double[] sample(int sampleSize) {
if (sampleSize <= 0) {
throw new NotStrictlyPositiveException(LocalizedFormats.NUMBER_OF_SAMPLES,
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java Thu Nov 10 14:11:06 2011
@@ -57,7 +57,6 @@ public abstract class AbstractDistributi
* The default implementation uses the identity
* <p>{@code P(x0 < X <= x1) = P(X <= x1) - P(X <= x0)}</p>
*/
- @Override
public double cumulativeProbability(double x0, double x1) throws NumberIsTooLargeException {
if (x0 > x1) {
throw new NumberIsTooLargeException(LocalizedFormats.LOWER_ENDPOINT_ABOVE_UPPER_ENDPOINT,
@@ -81,7 +80,6 @@ public abstract class AbstractDistributi
*
* @return the mean or Double.NaN if it's not defined
*/
- @Override
public double getNumericalMean() {
if (!numericalMeanIsCalculated) {
numericalMean = calculateNumericalMean();
@@ -108,7 +106,6 @@ public abstract class AbstractDistributi
* for certain cases in {@link TDistributionImpl}) or
* Double.NaN if it's not defined
*/
- @Override
public double getNumericalVariance() {
if (!numericalVarianceIsCalculated) {
numericalVariance = calculateNumericalVariance();
@@ -124,7 +121,6 @@ public abstract class AbstractDistributi
*
* @return whether the lower bound of the support is inclusive or not
*/
- @Override
public abstract boolean isSupportLowerBoundInclusive();
/**
@@ -133,7 +129,6 @@ public abstract class AbstractDistributi
*
* @return whether the upper bound of the support is inclusive or not
*/
- @Override
public abstract boolean isSupportUpperBoundInclusive();
/**
@@ -155,7 +150,6 @@ public abstract class AbstractDistributi
*
* @return whether the support limits given by subclassed methods are connected or not
*/
- @Override
public boolean isSupportConnected() {
return true;
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -103,7 +103,6 @@ public class BetaDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
recomputeZ();
if (x < 0 || x > 1) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -89,7 +89,6 @@ public class CauchyDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double cumulativeProbability(double x) {
return 0.5 + (FastMath.atan((x - median) / scale) / FastMath.PI);
}
@@ -97,7 +96,6 @@ public class CauchyDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double getMedian() {
return median;
}
@@ -105,7 +103,6 @@ public class CauchyDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double getScale() {
return scale;
}
@@ -113,7 +110,6 @@ public class CauchyDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
final double dev = x - median;
return (1 / FastMath.PI) * (scale / (dev * dev + scale * scale));
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -67,7 +67,6 @@ public class ChiSquaredDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double getDegreesOfFreedom() {
return gamma.getAlpha() * 2.0;
}
@@ -75,7 +74,6 @@ public class ChiSquaredDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
return gamma.density(x);
}
@@ -83,7 +81,6 @@ public class ChiSquaredDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double cumulativeProbability(double x) {
return gamma.cumulativeProbability(x);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -71,7 +71,6 @@ public class ExponentialDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double getMean() {
return mean;
}
@@ -79,7 +78,6 @@ public class ExponentialDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
if (x < 0) {
return 0;
@@ -97,7 +95,6 @@ public class ExponentialDistributionImpl
* Exponential Distribution</a>, equation (1).</li>
* </ul>
*/
- @Override
public double cumulativeProbability(double x) {
double ret;
if (x <= 0.0) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -94,7 +94,6 @@ public class FDistributionImpl
*
* @since 2.1
*/
- @Override
public double density(double x) {
final double nhalf = numeratorDegreesOfFreedom / 2;
final double mhalf = denominatorDegreesOfFreedom / 2;
@@ -119,7 +118,6 @@ public class FDistributionImpl
* </li>
* </ul>
*/
- @Override
public double cumulativeProbability(double x) {
double ret;
if (x <= 0) {
@@ -200,7 +198,6 @@ public class FDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double getNumeratorDegreesOfFreedom() {
return numeratorDegreesOfFreedom;
}
@@ -208,7 +205,6 @@ public class FDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double getDenominatorDegreesOfFreedom() {
return denominatorDegreesOfFreedom;
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -92,7 +92,6 @@ public class GammaDistributionImpl exten
* </li>
* </ul>
*/
- @Override
public double cumulativeProbability(double x) {
double ret;
@@ -125,7 +124,6 @@ public class GammaDistributionImpl exten
/**
* {@inheritDoc}
*/
- @Override
public double getAlpha() {
return alpha;
}
@@ -133,7 +131,6 @@ public class GammaDistributionImpl exten
/**
* {@inheritDoc}
*/
- @Override
public double getBeta() {
return beta;
}
@@ -141,7 +138,6 @@ public class GammaDistributionImpl exten
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
if (x < 0) {
return 0;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -92,7 +92,6 @@ public class NormalDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double getMean() {
return mean;
}
@@ -100,7 +99,6 @@ public class NormalDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double getStandardDeviation() {
return standardDeviation;
}
@@ -108,7 +106,6 @@ public class NormalDistributionImpl exte
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
final double x0 = x - mean;
final double x1 = x0 / standardDeviation;
@@ -121,7 +118,6 @@ public class NormalDistributionImpl exte
* If {@code x} is more than 40 standard deviations from the mean, 0 or 1 is returned,
* as in these cases the actual value is within {@code Double.MIN_VALUE} of 0 or 1.
*/
- @Override
public double cumulativeProbability(double x) {
final double dev = x - mean;
if (FastMath.abs(dev) > 40 * standardDeviation) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -79,7 +79,6 @@ public class TDistributionImpl
*
* @return the degrees of freedom.
*/
- @Override
public double getDegreesOfFreedom() {
return degreesOfFreedom;
}
@@ -87,7 +86,6 @@ public class TDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
final double n = degreesOfFreedom;
final double nPlus1Over2 = (n + 1) / 2;
@@ -99,7 +97,6 @@ public class TDistributionImpl
/**
* {@inheritDoc}
*/
- @Override
public double cumulativeProbability(double x) {
double ret;
if (x == 0) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java?rev=1200334&r1=1200333&r2=1200334&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java Thu Nov 10 14:11:06 2011
@@ -90,7 +90,6 @@ public class WeibullDistributionImpl ext
/**
* {@inheritDoc}
*/
- @Override
public double cumulativeProbability(double x) {
double ret;
if (x <= 0.0) {
@@ -104,7 +103,6 @@ public class WeibullDistributionImpl ext
/**
* {@inheritDoc}
*/
- @Override
public double getShape() {
return shape;
}
@@ -112,7 +110,6 @@ public class WeibullDistributionImpl ext
/**
* {@inheritDoc}
*/
- @Override
public double getScale() {
return scale;
}
@@ -120,7 +117,6 @@ public class WeibullDistributionImpl ext
/**
* {@inheritDoc}
*/
- @Override
public double density(double x) {
if (x < 0) {
return 0;