feat: use total components instead of adding all components for total

metacosm · Jul 7, 2024 · 5df705c · 5df705c
1 parent e1bcd60
commit 5df705c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/measure/src/main/java/net/laprun/sustainability/power/measure/OngoingPowerMeasure.java b/measure/src/main/java/net/laprun/sustainability/power/measure/OngoingPowerMeasure.java
@@ -33,7 +33,7 @@ public void recordMeasure(double[] components) {
         }
 
         // record min / max totals
-        final var recordedTotal = PowerMeasure.sumOfComponents(recorded);
+        final var recordedTotal = PowerMeasure.sumOfSelectedComponents(recorded, metadata().totalComponents());
         if (recordedTotal < minTotal) {
             minTotal = recordedTotal;
         }
@@ -44,7 +44,7 @@ public void recordMeasure(double[] components) {
 
     @Override
     public double total() {
-        return PowerMeasure.sumOfComponents(totals);
+        return PowerMeasure.sumOfSelectedComponents(totals, metadata().totalComponents());
     }
 
     public Duration duration() {

diff --git a/measure/src/main/java/net/laprun/sustainability/power/measure/PowerMeasure.java b/measure/src/main/java/net/laprun/sustainability/power/measure/PowerMeasure.java
@@ -26,7 +26,7 @@ default double average() {
 
     double maxMeasuredTotal();
 
-    static double sumOfComponents(double[] recorded) {
+    private static double sumOfComponents(double[] recorded) {
         var componentSum = 0.0;
         for (double value : recorded) {
             componentSum += value;
@@ -47,6 +47,7 @@ static double sumOfSelectedComponents(double[] recorded, int... indices) {
 
     default StdDev standardDeviations() {
         final var cardinality = metadata().componentCardinality();
+        final var totalComponents = metadata().totalComponents();
         final var stdDevs = new double[cardinality];
         final var aggregate = new double[1];
         final var samples = numberOfSamples() - 1; // unbiased so we remove one sample
@@ -60,7 +61,7 @@ default StdDev standardDeviations() {
                 .forEach(component -> {
                     final var sumOfSquares = measures().stream().parallel().peek(m -> {
                         // compute the std dev for total measure
-                        final var total = sumOfComponents(m);
+                        final var total = sumOfSelectedComponents(m, totalComponents);
                         aggregate[0] += total * total;
                     }).mapToDouble(m -> m[component] * m[component]).sum();
                     stdDevs[component] = stdDev(sumOfSquares, sqrdAverages[component], samples);