update matsim

matsim-scenarios · Jan 24, 2024 · 81d3e8d · 81d3e8d
1 parent 2ecefcb
commit 81d3e8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-		<version>16.0-PR3032</version>
+		<version>16.0-PR3071</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
 <!--		<version>16.0-SNAPSHOT</version>-->

diff --git a/src/main/java/org/matsim/dashboard/BerlinDashboardProvider.java b/src/main/java/org/matsim/dashboard/BerlinDashboardProvider.java
@@ -1,5 +1,6 @@
 package org.matsim.dashboard;
 
+import org.matsim.api.core.v01.TransportMode;
 import org.matsim.application.ApplicationUtils;
 import org.matsim.core.config.Config;
 import org.matsim.run.RunOpenBerlinScenario;
@@ -23,13 +24,12 @@ public List<Dashboard> getDashboards(Config config, SimWrapper simWrapper) {
 		TripDashboard trips = new TripDashboard("mode_share_ref.csv", "mode_share_per_dist_ref.csv", "mode_users_ref.csv");
 		trips.setAnalysisArgs("--match-id", "^berlin.+", "--shp-filter", "none");
 
-		// TODO: Freight counts should go into extra tab on counts dashboard
 		return List.of(
 			trips,
 			new TravelTimeComparisonDashboard(ApplicationUtils.resolve(config.getContext(), "berlin-v" + RunOpenBerlinScenario.VERSION + "-routes-ref.csv.gz")),
-			Dashboard.customize(new TrafficCountsDashboard(ApplicationUtils.resolve(config.getContext(), "berlin-v" + RunOpenBerlinScenario.VERSION + "-counts-vmz.xml.gz"), Set.of("truck")))
-				.title("Truck counts")
-				.context("freight")
+			new TrafficCountsDashboard()
+				.withModes(TransportMode.car, Set.of(TransportMode.car))
+				.withModes(TransportMode.truck, Set.of(TransportMode.truck, "freight"))
 		);
 	}
 

diff --git a/src/main/java/org/matsim/dashboard/DTVComparisonDashboard.java b/src/main/java/org/matsim/dashboard/DTVComparisonDashboard.java
@@ -5,6 +5,7 @@
 import org.matsim.simwrapper.Dashboard;
 import org.matsim.simwrapper.Header;
 import org.matsim.simwrapper.Layout;
+import org.matsim.simwrapper.viz.ColorScheme;
 import org.matsim.simwrapper.viz.MapPlot;
 import org.matsim.simwrapper.viz.Plotly;
 import tech.tablesaw.plotly.components.Axis;
@@ -50,7 +51,7 @@ public void configure(Header header, Layout layout) {
 
 				viz.addTrace(BarTrace.builder(Plotly.OBJ_INPUT, Plotly.INPUT).orientation(BarTrace.Orientation.HORIZONTAL).build(), ds.mapping()
 					.x("n")
-					.name("quality", Plotly.ColorScheme.RdYlBu)
+					.name("quality", ColorScheme.RdYlBu)
 				);
 			}).el(Plotly.class, (viz, data) -> {
 
@@ -67,7 +68,7 @@ public void configure(Header header, Layout layout) {
 				viz.addTrace(BarTrace.builder(Plotly.OBJ_INPUT, Plotly.INPUT).build(), ds.mapping()
 					.x("road_type")
 					.y("share")
-					.name("quality", Plotly.ColorScheme.RdYlBu)
+					.name("quality", ColorScheme.RdYlBu)
 				);
 
 			});
@@ -86,7 +87,7 @@ public void configure(Header header, Layout layout) {
 				viz.display.lineColor.dataset = "dtv";
 				viz.display.lineColor.columnName = "quality";
 				viz.display.lineColor.join = "link_id";
-				viz.display.lineColor.setColorRamp(Plotly.ColorScheme.RdYlBu, 3, false);
+				viz.display.lineColor.setColorRamp(ColorScheme.RdYlBu, 3, false);
 
 				// 8px
 				viz.display.lineWidth.dataset = "@8";