Reduce expensive column finding in loop

arup-group · Mar 19, 2024 · affac78 · affac78
1 parent 0ab6045
commit affac78
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/main/java/com/arup/cml/abm/kpi/tablesaw/TablesawKpiCalculator.java b/src/main/java/com/arup/cml/abm/kpi/tablesaw/TablesawKpiCalculator.java
@@ -949,15 +949,20 @@ private Table addCostToLegs(Table legs, Table personModeScores, MoneyLog moneyLo
         DoubleColumn arr_time_seconds = dep_time_seconds.add(trav_time_seconds).setName("arr_time_seconds");
         legs.addColumns(dep_time_seconds, arr_time_seconds);
         LOGGER.info("Iterating over the money log");
-        for (String person : moneyLog.getMoneyLogData().keySet()) {
-            for (Map.Entry<Double, Double> costEntry : moneyLog.getMoneyLogData(person).entrySet()) {
+        DoubleColumn monetaryCostOfTravelColumn = legs.doubleColumn("monetaryCostOfTravel");
+        DoubleColumn departureTimeColumn = legs.doubleColumn("dep_time_seconds");
+        DoubleColumn arrivalTimeColumn = legs.doubleColumn("arr_time_seconds");
+        StringColumn personColumn = legs.stringColumn("person");
+        for (Map.Entry<String, Map<Double, Double>> entry : moneyLog.getMoneyLogData().entrySet()) {
+            String person = entry.getKey();
+            for (Map.Entry<Double, Double> costEntry : entry.getValue().entrySet()) {
                 Double time = costEntry.getKey();
                 Double cost = costEntry.getValue();
-                legs.doubleColumn("monetaryCostOfTravel").set(
-                        legs.stringColumn("person").isEqualTo(person)
-                                .and(legs.doubleColumn("dep_time_seconds").isLessThan(time)
-                                        .and(legs.doubleColumn("arr_time_seconds").isGreaterThanOrEqualTo(time))),
-                        legs.doubleColumn("monetaryCostOfTravel").add(cost)
+                monetaryCostOfTravelColumn.set(
+                        personColumn.isEqualTo(person)
+                                .and(departureTimeColumn.isLessThan(time)
+                                        .and(arrivalTimeColumn.isGreaterThanOrEqualTo(time))),
+                        monetaryCostOfTravelColumn.add(cost)
                 );
             }
         }