Repository: commons-math Updated Branches: refs/heads/master 09e31a01b -> 2e87f2934
Added @since tags, cleaned up code. JIRA: MATH-1287 Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/2e87f293 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/2e87f293 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/2e87f293 Branch: refs/heads/master Commit: 2e87f2934e757a6229e20ac3c7d7413a42619ddd Parents: 09e31a0 Author: Phil Steitz <phil.ste...@gmail.com> Authored: Sun Nov 15 11:04:09 2015 -0700 Committer: Phil Steitz <phil.ste...@gmail.com> Committed: Sun Nov 15 11:04:09 2015 -0700 ---------------------------------------------------------------------- .../distribution/EnumeratedIntegerDistribution.java | 3 ++- .../math4/distribution/EnumeratedRealDistribution.java | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/2e87f293/src/main/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistribution.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistribution.java b/src/main/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistribution.java index f542e8b..af64140 100644 --- a/src/main/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistribution.java +++ b/src/main/java/org/apache/commons/math4/distribution/EnumeratedIntegerDistribution.java @@ -107,11 +107,11 @@ public class EnumeratedIntegerDistribution extends AbstractIntegerDistribution { * * @param rng random number generator used for sampling * @param data input dataset + * #since 3.6 */ public EnumeratedIntegerDistribution(final RandomGenerator rng, final int[] data) { super(rng); final Map<Integer, Integer> dataMap = new HashMap<Integer, Integer>(); - for (int value : data) { Integer count = dataMap.get(value); if (count == null) { @@ -138,6 +138,7 @@ public class EnumeratedIntegerDistribution extends AbstractIntegerDistribution { * with values 0, 1 and 2 having probability masses 0.25, 0.5 and 0.25 respectively, * * @param data input dataset + * @since 3.6 */ public EnumeratedIntegerDistribution(final int[] data) { this(new Well19937c(), data); http://git-wip-us.apache.org/repos/asf/commons-math/blob/2e87f293/src/main/java/org/apache/commons/math4/distribution/EnumeratedRealDistribution.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/distribution/EnumeratedRealDistribution.java b/src/main/java/org/apache/commons/math4/distribution/EnumeratedRealDistribution.java index c3e7701..688b3fd 100644 --- a/src/main/java/org/apache/commons/math4/distribution/EnumeratedRealDistribution.java +++ b/src/main/java/org/apache/commons/math4/distribution/EnumeratedRealDistribution.java @@ -109,19 +109,17 @@ public class EnumeratedRealDistribution extends AbstractRealDistribution { * * @param rng random number generator used for sampling * @param data input dataset + * @since 3.6 */ public EnumeratedRealDistribution(final RandomGenerator rng, final double[] data) { super(rng); final Map<Double, Integer> dataMap = new HashMap<Double, Integer>(); - for (double value : data) { Integer count = dataMap.get(value); if (count == null) { - count = new Integer(1); - } else { - count = new Integer(count.intValue() + 1); + count = 0; } - dataMap.put(value, count); + dataMap.put(value, ++count); } final int massPoints = dataMap.size(); final double denom = data.length; @@ -142,6 +140,7 @@ public class EnumeratedRealDistribution extends AbstractRealDistribution { * with values 0, 1 and 2 having probability masses 0.25, 0.5 and 0.25 respectively, * * @param data input dataset + * @since 3.6 */ public EnumeratedRealDistribution(final double[] data) { this(new Well19937c(), data); @@ -153,7 +152,7 @@ public class EnumeratedRealDistribution extends AbstractRealDistribution { * @param probabilities probabilities * @return list of value/probability pairs */ - private List<Pair<Double, Double>> createDistribution(double[] singletons, double[] probabilities) { + private static List<Pair<Double, Double>> createDistribution(double[] singletons, double[] probabilities) { if (singletons.length != probabilities.length) { throw new DimensionMismatchException(probabilities.length, singletons.length); }
