From 85941a30ed413ae4640cf83e071cca014d19f019 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 7 Aug 2024 09:13:43 -0500 Subject: [PATCH] Simplify without parallel stream --- .../discovery/response/DiscoveryAcademicAge.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/response/DiscoveryAcademicAge.java b/src/main/java/edu/tamu/scholars/middleware/discovery/response/DiscoveryAcademicAge.java index 2ecf3d32e..4d934cca7 100644 --- a/src/main/java/edu/tamu/scholars/middleware/discovery/response/DiscoveryAcademicAge.java +++ b/src/main/java/edu/tamu/scholars/middleware/discovery/response/DiscoveryAcademicAge.java @@ -53,10 +53,9 @@ public void from(DiscoveryAcademicAgeDescriptor academicAgeDescriptor, SolrDocum List labeledRanges = academicAgeDescriptor.getLabeledRanges(); - AtomicInteger sum = new AtomicInteger(0); - AtomicInteger total = new AtomicInteger(0); + int sum = 0; - labeledRanges.parallelStream().forEach(lr -> { + for (LabeledRange lr : labeledRanges) { int subtotal = 0; @@ -70,7 +69,7 @@ public void from(DiscoveryAcademicAgeDescriptor academicAgeDescriptor, SolrDocum boolean inRange = false; if (lr.isFirst) { - sum.getAndAdd(age); + sum += age; inRange = age < lr.to; } else if (lr.isLast) { inRange = age >= lr.from; @@ -90,19 +89,16 @@ public void from(DiscoveryAcademicAgeDescriptor academicAgeDescriptor, SolrDocum } } - total.addAndGet(subtotal); - Integer value = academicAgeDescriptor.getAverageOverInterval() && set.size() > 0 ? subtotal / set.size() : subtotal; add(lr.index, lr.range, lr.label, value); - - }); + } Collections.sort(groups, new AgeGroupComparator()); - this.mean = results.size() > 0 ? sum.get() / results.size() : 0; + this.mean = results.size() > 0 ? sum / results.size() : 0; this.median = results.size() > 0 ? DateUtility.ageInYearsFromEpochSecond((long) results.get(results.size() / 2).getFieldValue(ageField)) : 0;