You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2022/12/02 15:10:18 UTC
[commons-math] 03/05: Use Map.merge
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-math.git
commit 9fcd3885dc3ea5dbe18d572d2c49e55c30857d63
Author: aherbert <ah...@apache.org>
AuthorDate: Fri Dec 2 13:54:50 2022 +0000
Use Map.merge
---
.../math4/legacy/distribution/EnumeratedIntegerDistribution.java | 6 +-----
.../math4/legacy/distribution/EnumeratedRealDistribution.java | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java
index dce14aad6..8d40da2e4 100644
--- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java
+++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java
@@ -80,11 +80,7 @@ public class EnumeratedIntegerDistribution extends AbstractIntegerDistribution {
public EnumeratedIntegerDistribution(final int[] data) {
final Map<Integer, Integer> dataMap = new HashMap<>();
for (int value : data) {
- Integer count = dataMap.get(value);
- if (count == null) {
- count = 0;
- }
- dataMap.put(value, ++count);
+ dataMap.merge(value, 1, Integer::sum);
}
final int massPoints = dataMap.size();
final double denom = data.length;
diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java
index 4dad1247c..36f70183b 100644
--- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java
+++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java
@@ -82,11 +82,7 @@ public class EnumeratedRealDistribution
public EnumeratedRealDistribution(final double[] data) {
final Map<Double, Integer> dataMap = new HashMap<>();
for (double value : data) {
- Integer count = dataMap.get(value);
- if (count == null) {
- count = 0;
- }
- dataMap.put(value, ++count);
+ dataMap.merge(value, 1, Integer::sum);
}
final int massPoints = dataMap.size();
final double denom = data.length;