add drt dashboard + add public transit analysis

matsim-scenarios · Feb 18, 2025 · d9d98c0 · d9d98c0
1 parent 6be8a3a
commit d9d98c0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 		<!--<version>14.0-PR1452</version>-->
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
-		<version>2025.0-PR3515</version>
+		<version>2025.0-PR3552</version>
 	</parent>
 
 
@@ -77,6 +77,13 @@
 			<version>${matsim.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.matsim.contrib</groupId>
+			<artifactId>drt-extensions</artifactId>
+			<version>${matsim.version}</version>
+			<scope>compile</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>com.github.matsim-vsp</groupId>
 			<artifactId>pt-extensions</artifactId>

diff --git a/src/main/java/org/matsim/dashboards/LausitzSimWrapperRunner.java b/src/main/java/org/matsim/dashboards/LausitzSimWrapperRunner.java
@@ -26,6 +26,7 @@
 import org.matsim.application.ApplicationUtils;
 import org.matsim.application.MATSimAppCommand;
 import org.matsim.application.options.ShpOptions;
+import org.matsim.contrib.drt.extension.dashboards.DrtDashboardProvider;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.network.NetworkUtils;
@@ -69,6 +70,8 @@ public final class LausitzSimWrapperRunner implements MATSimAppCommand {
 	private boolean emissions;
 	@CommandLine.Option(names = "--pt-line-base-dir", description = "create pt line dashboard with base run dir as input")
 	private String baseDir;
+	@CommandLine.Option(names = "--drt", defaultValue = "false", description = "create emission dashboard")
+	private boolean drt;
 
 	private static final String FILE_TYPE = "_before_emissions.xml";
 
@@ -152,6 +155,10 @@ public Integer call() throws Exception {
 				new MatsimVehicleWriter(scenario.getTransitVehicles()).writeFile(transitVehiclesPath);
 			}
 
+			if (drt) {
+				new DrtDashboardProvider().getDashboards(config, sw).forEach(sw::addDashboard);
+			}
+
 			if (baseDir != null) {
 				sw.addDashboard(new PtLineDashboard(baseDir));
 			}

diff --git a/src/main/java/org/matsim/run/scenarios/LausitzScenario.java b/src/main/java/org/matsim/run/scenarios/LausitzScenario.java
@@ -6,6 +6,7 @@
 import org.matsim.api.core.v01.TransportMode;
 import org.matsim.application.MATSimApplication;
 import org.matsim.application.analysis.CheckPopulation;
+import org.matsim.application.analysis.pt.PublicTransitAnalysis;
 import org.matsim.application.analysis.traffic.LinkStats;
 import org.matsim.application.options.SampleOptions;
 import org.matsim.application.prepare.CreateLandUseShp;
@@ -60,7 +61,7 @@
 		PrepareDrtScenarioAgents.class
 })
 @MATSimApplication.Analysis({
-		LinkStats.class, CheckPopulation.class, CommuterAnalysis.class, CommunityFilter.class, DistanceMatrix.class
+		LinkStats.class, CheckPopulation.class, CommuterAnalysis.class, CommunityFilter.class, DistanceMatrix.class, PublicTransitAnalysis.class
 })
 public class LausitzScenario extends MATSimApplication {