Merge branch 'removeDrtCase' into drtSpeedUp

matsim-scenarios · Feb 15, 2024 · 21e7508 · 21e7508
2 parents f30f222 + 5fd4e95
commit 21e7508
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 196 deletions.
diff --git a/src/main/java/org/matsim/run/RunLeipzigScenario.java b/src/main/java/org/matsim/run/RunLeipzigScenario.java
@@ -93,19 +93,12 @@ public class RunLeipzigScenario extends MATSimApplication {
 	@CommandLine.Option(names = "--parking-cost-time-period-end", defaultValue = "0", description = "End of time period for which parking cost will be charged.")
 	private Double parkingCostTimePeriodEnd;
 
-	@CommandLine.Option(names = "--drt-case", defaultValue = "oneServiceArea", description = "Defines how drt is modelled. For a more detailed description see class DrtCaseSetup.")
-	private DrtCaseSetup.DrtCase drtCase;
-
 	@CommandLine.Option(names = "--intermodality", defaultValue = "drtAndPtSeparateFromEachOther", description = "Define if drt should be used as access and egress mode for pt.")
 	private DrtCaseSetup.PtDrtIntermodality ptDrtIntermodality;
 
-	public RunLeipzigScenario(@Nullable Config config) {
-		super(config);
-	}
+	public RunLeipzigScenario(@Nullable Config config) { super(config);	}
 
-	public RunLeipzigScenario() {
-		super(String.format("input/v%s/leipzig-v%s-10pct.config.xml", VERSION, VERSION));
-	}
+	public RunLeipzigScenario() { super(String.format("input/v%s/leipzig-v%s-10pct.config.xml", VERSION, VERSION)); }
 
 	public static void main(String[] args) {
 		MATSimApplication.run(RunLeipzigScenario.class, args);
@@ -191,7 +184,7 @@ protected Config prepareConfig(Config config) {
 		if (networkOpt.hasDrtArea()) {
 			//drt
 			try {
-				DrtCaseSetup.prepareConfig(config, drtCase, new ShpOptions(networkOpt.getDrtArea(), null, null));
+				DrtCaseSetup.prepareConfig(config, /* drtCase, */ new ShpOptions(networkOpt.getDrtArea(), null, null));
 			} catch (URISyntaxException e) {
 				log.fatal(e);
 			}
@@ -280,7 +273,7 @@ protected void prepareScenario(Scenario scenario) {
 		// (passt das Netz an aus den mitgegebenen shape files, z.B. parking area, car-free area, ...)
 
 		if (networkOpt.hasDrtArea()) {
-			DrtCaseSetup.prepareScenario(scenario, drtCase, new ShpOptions(networkOpt.getDrtArea(), null, null), VERSION);
+			DrtCaseSetup.prepareScenario(scenario, new ShpOptions(networkOpt.getDrtArea(), null, null), VERSION);
 		}
 
 	}
@@ -328,7 +321,7 @@ public void install() {
 		});
 
 		if (networkOpt.hasDrtArea()) {
-			DrtCaseSetup.prepareControler(controler, drtCase, new ShpOptions(networkOpt.getDrtArea(), null, null), ptDrtIntermodality);
+			DrtCaseSetup.prepareControler(controler, new ShpOptions(networkOpt.getDrtArea(), null, null), ptDrtIntermodality);
 		}
 
 		if (bike == BicycleHandling.onNetworkWithBicycleContrib) {