Repository: commons-math Updated Branches: refs/heads/master ffc1caada -> 598edc127
Reverting changes on "master" as per Commons Math policy. The corresponding changes have been ported into branch "develop". Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/598edc12 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/598edc12 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/598edc12 Branch: refs/heads/master Commit: 598edc12736945d27fb7dbd77cb81ac8e51f491a Parents: ffc1caa Author: Gilles <gil...@harfang.homelinux.org> Authored: Tue May 31 03:20:13 2016 +0200 Committer: Gilles <gil...@harfang.homelinux.org> Committed: Tue May 31 03:20:13 2016 +0200 ---------------------------------------------------------------------- .../distribution/AbstractIntegerDistribution.java | 3 ++- .../descriptive/MultivariateSummaryStatistics.java | 6 +++--- .../math4/stat/interval/ClopperPearsonInterval.java | 16 ++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/598edc12/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java b/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java index 4c42c01..95d6f07 100644 --- a/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java +++ b/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java @@ -209,7 +209,8 @@ public abstract class AbstractIntegerDistribution implements IntegerDistribution */ private double checkedCumulativeProbability(int argument) throws MathInternalError { - double result = cumulativeProbability(argument); + double result = Double.NaN; + result = cumulativeProbability(argument); if (Double.isNaN(result)) { throw new MathInternalError(LocalizedFormats .DISCRETE_CUMULATIVE_PROBABILITY_RETURNED_NAN, argument); http://git-wip-us.apache.org/repos/asf/commons-math/blob/598edc12/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java b/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java index 39083d0..eb1642c 100644 --- a/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java +++ b/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java @@ -319,8 +319,8 @@ public class MultivariateSummaryStatistics final String separator = ", "; final String suffix = System.getProperty("line.separator"); StringBuilder outBuffer = new StringBuilder(); - outBuffer.append("MultivariateSummaryStatistics:").append(suffix); - outBuffer.append("n: ").append(getN()).append(suffix); + outBuffer.append("MultivariateSummaryStatistics:" + suffix); + outBuffer.append("n: " + getN() + suffix); append(outBuffer, getMin(), "min: ", separator, suffix); append(outBuffer, getMax(), "max: ", separator, suffix); append(outBuffer, getMean(), "mean: ", separator, suffix); @@ -328,7 +328,7 @@ public class MultivariateSummaryStatistics append(outBuffer, getSumSq(), "sum of squares: ", separator, suffix); append(outBuffer, getSumLog(), "sum of logarithms: ", separator, suffix); append(outBuffer, getStandardDeviation(), "standard deviation: ", separator, suffix); - outBuffer.append("covariance: ").append(getCovariance()).append(suffix); + outBuffer.append("covariance: " + getCovariance().toString() + suffix); return outBuffer.toString(); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/598edc12/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java b/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java index ed0904c..bf5d6ad 100644 --- a/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java +++ b/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java @@ -35,19 +35,19 @@ public class ClopperPearsonInterval implements BinomialConfidenceInterval { IntervalUtils.checkParameters(numberOfTrials, numberOfSuccesses, confidenceLevel); double lowerBound = 0; double upperBound = 0; - - if (numberOfSuccesses > 0) { - final double alpha = (1.0 - confidenceLevel) / 2.0; + final double alpha = (1.0 - confidenceLevel) / 2.0; - final FDistribution distributionLowerBound = new FDistribution(2 * (numberOfTrials - numberOfSuccesses + 1), - 2 * numberOfSuccesses); + final FDistribution distributionLowerBound = new FDistribution(2 * (numberOfTrials - numberOfSuccesses + 1), + 2 * numberOfSuccesses); + if (numberOfSuccesses > 0) { final double fValueLowerBound = distributionLowerBound.inverseCumulativeProbability(1 - alpha); lowerBound = numberOfSuccesses / (numberOfSuccesses + (numberOfTrials - numberOfSuccesses + 1) * fValueLowerBound); + } - - final FDistribution distributionUpperBound = new FDistribution(2 * (numberOfSuccesses + 1), - 2 * (numberOfTrials - numberOfSuccesses)); + final FDistribution distributionUpperBound = new FDistribution(2 * (numberOfSuccesses + 1), + 2 * (numberOfTrials - numberOfSuccesses)); + if (numberOfSuccesses > 0) { final double fValueUpperBound = distributionUpperBound.inverseCumulativeProbability(1 - alpha); upperBound = (numberOfSuccesses + 1) * fValueUpperBound / (numberOfTrials - numberOfSuccesses + (numberOfSuccesses + 1) * fValueUpperBound);
