Fix minor formatting inconsistencies

arup-group · Feb 12, 2024 · 912983c · 912983c
1 parent 80af8f0
commit 912983c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/src/main/java/com/arup/cml/abm/kpi/matsim/MatsimUtils.java b/src/main/java/com/arup/cml/abm/kpi/matsim/MatsimUtils.java
@@ -130,13 +130,11 @@ public InputStream getMatsimTripsCSVInputStream() {
                         String.format("%s/%soutput_trips.csv%s", this.matsimOutputDir, runId, compressionFileEnd)));
     }
 
-    public String getRunId()
-    {
+    public String getRunId() {
         return this.runId;
     }
 
-    public String getCompressionFileEnd()
-    {
+    public String getCompressionFileEnd() {
         return this.compressionFileEnd;
     }
 

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
@@ -45,13 +45,13 @@ public TablesawKpiCalculator(Network network, TransitSchedule schedule, Vehicles
                                  InputStream legsInputStream, InputStream tripsInputStream, Path outputDirectory) {
         // TODO: 24/01/2024 replace this ASAP with a representation of the network
         // that isn't from the MATSim API (a map, or dedicated domain object, or
-                // whatever)
+        // whatever)
         Map<String, ColumnType> columnMapping = new HashMap<>();
-                columnMapping.put("dep_time", ColumnType.STRING);
-                columnMapping.put("trav_time", ColumnType.STRING);
-                columnMapping.put("wait_time", ColumnType.STRING);
+        columnMapping.put("dep_time", ColumnType.STRING);
+        columnMapping.put("trav_time", ColumnType.STRING);
+        columnMapping.put("wait_time", ColumnType.STRING);
 
-                legs = readCSVInputStream(legsInputStream, columnMapping).setName("Legs");
+        legs = readCSVInputStream(legsInputStream, columnMapping).setName("Legs");
         trips = readCSVInputStream(tripsInputStream, columnMapping).setName("Trips");
         createNetworkLinkTables(network);
         createTransitTables(schedule);
@@ -577,7 +577,7 @@ private void createLinkLogTables(LinkLog _linkLog) {
         StringColumn agentIDColumn = StringColumn.create("agentId");
 
         for (Map.Entry<Long, Map<String, Object>> entry : _linkLog.getVehicleOccupantsData().rowMap()
-                                .entrySet()) {
+                .entrySet()) {
             linkLogIndexColumn.append(entry.getKey());
             agentIDColumn.append(entry.getValue().get("agentId").toString());
         }
@@ -590,17 +590,17 @@ private void createLinkLogTables(LinkLog _linkLog) {
 
     public Table readCSVInputStream(InputStream inputStream) {
         return readCSVInputStream(inputStream, Collections.emptyMap());
-        }
+    }
 
-        public Table readCSVInputStream(InputStream inputStream, Map<String, ColumnType> columnMapping) {
-                // TODO Make separator accessible from outside
-                CsvReadOptions.Builder builder = CsvReadOptions.builder(inputStream).separator(';').header(true)
-                                .columnTypesPartial(column -> {
-                                        if (columnMapping.keySet().contains(column)) {
-                                                return Optional.of(columnMapping.get(column));
-                                        }
-                                        return Optional.empty();
-                                });
+    public Table readCSVInputStream(InputStream inputStream, Map<String, ColumnType> columnMapping) {
+        // TODO Make separator accessible from outside
+        CsvReadOptions.Builder builder = CsvReadOptions.builder(inputStream).separator(';').header(true)
+                .columnTypesPartial(column -> {
+                    if (columnMapping.keySet().contains(column)) {
+                        return Optional.of(columnMapping.get(column));
+                    }
+                    return Optional.empty();
+                });
         return Table.read().usingOptions(builder.build());
     }
 
@@ -616,11 +616,11 @@ private void writeContentToFile(String path, String content) {
 
     private void writeIntermediateData(Path outputDir) {
         try {
-                        Files.createDirectories(outputDir);
-                } catch (IOException e) {
-                        e.printStackTrace();
-                        throw new IllegalStateException(e);
-                }
+            Files.createDirectories(outputDir);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new IllegalStateException(e);
+        }
         legs.write().csv(String.format("%s/supporting-data-legs.csv", outputDir));
         trips.write().csv(String.format("%s/supporting-data-trips.csv", outputDir));
         linkLog.write().csv(String.format("%s/supporting-data-linkLog.csv", outputDir));