diff --git a/Comparison/src/main/java/cz/fidentis/analyst/visitors/face/WeightedAverageCollector.java b/Comparison/src/main/java/cz/fidentis/analyst/visitors/face/WeightedAverageCollector.java index 830d086152b3ce5ef64a77b8c4f240a9ea0c7576..f42241899438a6bec7f06a3148fa2c39c5e2035b 100644 --- a/Comparison/src/main/java/cz/fidentis/analyst/visitors/face/WeightedAverageCollector.java +++ b/Comparison/src/main/java/cz/fidentis/analyst/visitors/face/WeightedAverageCollector.java @@ -68,10 +68,10 @@ public class WeightedAverageCollector<T> implements Collector<T, IntemediateResu */ @Override public BiConsumer<IntemediateResults, T> accumulator() { - return (result, streamElement) -> { - result.weightedValSum += valueFunction.applyAsDouble(streamElement) + return (iResult, streamElement) -> { + iResult.weightedValSum += valueFunction.applyAsDouble(streamElement) * weightFunction.applyAsDouble(streamElement); - result.weightSum += weightFunction.applyAsDouble(streamElement); + iResult.weightSum += weightFunction.applyAsDouble(streamElement); }; } @@ -85,11 +85,11 @@ public class WeightedAverageCollector<T> implements Collector<T, IntemediateResu */ @Override public BinaryOperator<IntemediateResults> combiner() { - return (result1, result2) -> { - result1.weightedValSum += result2.weightedValSum; - result1.weightSum += result2.weightSum; + return (iResult1, iResult2) -> { + iResult1.weightedValSum += iResult2.weightedValSum; + iResult1.weightSum += iResult2.weightSum; - return result1; + return iResult1; }; } @@ -108,7 +108,7 @@ public class WeightedAverageCollector<T> implements Collector<T, IntemediateResu */ @Override public Function<IntemediateResults, Double> finisher() { - return result -> result.weightedValSum / result.weightSum; + return iResult -> iResult.weightedValSum / iResult.weightSum; } /**