Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Performance with TableSaw #75

Merged
merged 7 commits into from
May 1, 2024
Merged

Performance with TableSaw #75

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d827d0
Use Map interface for Map types
erewalz Mar 19, 2024
0ab6045
Reduce gets to map in MoneyLog
erewalz Mar 19, 2024
affac78
Reduce expensive column finding in loop
erewalz Mar 19, 2024
6a8fbf1
Improve moneyLog access
steffenaxer Mar 21, 2024
f6c8a41
Fix sign
steffenaxer Mar 22, 2024
377ef8c
Revert "Improve moneyLog access"
marecabo Apr 30, 2024
29e72b9
Merge branch 'main' into potential-performance
marecabo Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/main/java/com/arup/cml/abm/kpi/data/MoneyLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
package com.arup.cml.abm.kpi.data;

import java.util.*;
import java.util.Map.Entry;

public class MoneyLog {
HashMap<String, HashMap<Double, Double>> moneyLogData = new HashMap<>();

public HashMap<String, HashMap<Double, Double>> getMoneyLogData() {
Map<String, Map<Double, Double>> moneyLogData = new HashMap<>();

public Map<String, Map<Double, Double>> getMoneyLogData() {
return moneyLogData;
}

public HashMap<Double, Double> getMoneyLogData(String personID) {
public Map<Double, Double> getMoneyLogData(String personID) {
return getPersonLog(personID);
}

public double getMoneyLogData(String personID, double departureTime, double arrivalTime) {
return getPersonLog(personID).entrySet().stream()
.filter(e -> e.getKey() > departureTime && e.getKey() <= arrivalTime).mapToDouble(Entry::getValue).sum();
}

public void createMoneyLogEntry(String personID, double time, double amount) {
HashMap<Double, Double> personLog = getPersonLog(personID);
if (personLog.containsKey(time)) {
personLog.put(time, amount + personLog.get(time));
} else {
personLog.put(time, amount);
}
Map<Double, Double> personLog = getPersonLog(personID);
personLog.compute(time, (k, v) -> (v == null) ? amount : amount + v);
}

private HashMap<Double, Double> getPersonLog(String personID) {
moneyLogData.putIfAbsent(personID, new HashMap<>());
return moneyLogData.get(personID);
private Map<Double, Double> getPersonLog(String personID) {
return moneyLogData.computeIfAbsent(personID, k -> new HashMap<>());
}

}
32 changes: 16 additions & 16 deletions src/main/java/com/arup/cml/abm/kpi/tablesaw/TablesawKpiCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;

import static tech.tablesaw.aggregate.AggregateFunctions.*;
Expand Down Expand Up @@ -949,18 +945,22 @@ 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()) {
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)
);
}
}
DoubleColumn monetaryCostOfTravelColumn = legs.doubleColumn("monetaryCostOfTravel");
DoubleColumn departureTimeColumn = legs.doubleColumn("dep_time_seconds");
DoubleColumn arrivalTimeColumn = legs.doubleColumn("arr_time_seconds");
StringColumn personColumn = legs.stringColumn("person");

legs.stream().parallel().forEach(row -> {
int i = row.getRowNumber();
double departureTime = departureTimeColumn.get(i);
double arrivalTime = arrivalTimeColumn.get(i);
String person = personColumn.get(i);
double costs = moneyLog.getMoneyLogData(person, departureTime, arrivalTime);
if (costs != 0) {
monetaryCostOfTravelColumn.set(i,costs);
}
});

LOGGER.debug("Finished iterating over the money log");
legs.removeColumns(dep_time_seconds, arr_time_seconds);
LOGGER.info("Finished adding costs to legs table");
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/arup/cml/abm/kpi/data/TestMoneyLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.junit.Test;

import java.util.HashMap;
import java.util.Map;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

Expand All @@ -19,7 +19,7 @@ public void recordsMoneyEvent() {

moneyLog.createMoneyLogEntry(somePersonID, someTime, someCost);

HashMap<String, HashMap<Double, Double>> moneyData = moneyLog.getMoneyLogData();
Map<String, Map<Double, Double>> moneyData = moneyLog.getMoneyLogData();
assertThat(moneyData.size())
.isEqualTo(1)
.as("Money Log should contain entries for a single person");
Expand Down Expand Up @@ -50,7 +50,7 @@ public void recordsTwoSeparateMoneyEvents() {
moneyLog.createMoneyLogEntry(somePersonID, firstTime, firstCost);
moneyLog.createMoneyLogEntry(somePersonID, secondTime, secondCost);

HashMap<String, HashMap<Double, Double>> moneyData = moneyLog.getMoneyLogData();
Map<String, Map<Double, Double>> moneyData = moneyLog.getMoneyLogData();
assertThat(moneyData.size())
.isEqualTo(1)
.as("Money Log should contain entries for a single person");
Expand Down Expand Up @@ -80,7 +80,7 @@ public void combinesTwoMoneyEventsHappeningAtTheSameTime() {
moneyLog.createMoneyLogEntry(somePersonID, someTime, firstCost);
moneyLog.createMoneyLogEntry(somePersonID, someTime, secondCost);

HashMap<String, HashMap<Double, Double>> moneyData = moneyLog.getMoneyLogData();
Map<String, Map<Double, Double>> moneyData = moneyLog.getMoneyLogData();
assertThat(moneyData.size())
.isEqualTo(1)
.as("Money Log should contain entries for a single person");
Expand Down