set 25pct scenario as default

matsim-scenarios · Feb 26, 2024 · 20c8ab3 · 20c8ab3
1 parent 8151393
commit 20c8ab3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/input/v1.0/lausitz-v1.0-100pct.config.xml → input/v1.0/lausitz-v1.0-25pct.config.xml b/input/v1.0/lausitz-v1.0-100pct.config.xml → input/v1.0/lausitz-v1.0-25pct.config.xml
@@ -8,8 +8,8 @@
 	<module name="controller">
 		<param name="lastIteration" value="600"/>
 		<param name="overwriteFiles" value="failIfDirectoryExists"/>
-		<param name="runId" value="lausitz-100pct"/>
-		<param name="outputDirectory" value="./output/output-lausitz-100pct"/>
+		<param name="runId" value="lausitz-25pct"/>
+		<param name="outputDirectory" value="./output/output-lausitz-25pct"/>
 		<param name="writeEventsInterval" value="100"/>
 		<param name="writePlansInterval" value="100"/>
 		<param name="enableLinkToLinkRouting" value="false"/>
@@ -30,7 +30,7 @@
 
 	<module name="plans">
 		<param name="inputPlansFile"
-			   value="./lausitz-v1.0-100pct.plans-initial.xml.gz"/>
+			   value="./lausitz-v1.0-25pct.plans-initial.xml.gz"/>
 		<param name="removingUnnecessaryPlanAttributes" value="true"/>
 	</module>
 
@@ -61,8 +61,8 @@
 
 	<module name="qsim">
 		<param name="endTime" value="36:00:00"/>
-		<param name="flowCapacityFactor" value="1"/>
-		<param name="storageCapacityFactor" value="1"/>
+		<param name="flowCapacityFactor" value="0.25"/>
+		<param name="storageCapacityFactor" value="0.25"/>
 		<param name="mainMode" value="car,bike,freight"/>
 		<param name="numberOfThreads" value="12"/>
 		<param name="startTime" value="00:00:00"/>
@@ -80,7 +80,7 @@
 			<param name="context" value="" />
 			<param name="mapCenter" value="14.5,51.53" />
 			<param name="mapZoomLevel" value="6.8" />
-			<param name="sampleSize" value="1" />
+			<param name="sampleSize" value="0.25" />
 			<param name="shp" value="../shp/lausitz.shp" />
 		</parameterset>
 	</module>
@@ -156,8 +156,6 @@
 		<param name="analyzedModes" value="car,freight"/>
 
 		<param name="separateModes" value="true"/>
-
-		<!-- Needed for lane specific routing times -->
 		<param name="calculateLinkToLinkTravelTimes" value="false"/>
 		<param name="calculateLinkTravelTimes" value="true"/>
 	</module>

diff --git a/src/main/java/org/matsim/run/LausitzScenario.java b/src/main/java/org/matsim/run/LausitzScenario.java
@@ -48,15 +48,15 @@ public class LausitzScenario extends MATSimApplication {
 	public static final String VERSION = "1.0";
 
 	@CommandLine.Mixin
-	private final SampleOptions sample = new SampleOptions(100, 25, 10, 1);
+	private final SampleOptions sample = new SampleOptions( 25, 10, 1);
 
 
 	public LausitzScenario(@Nullable Config config) {
 		super(config);
 	}
 
 	public LausitzScenario() {
-		super(String.format("input/v%s/lausitz-v%s-100pct.config.xml", VERSION, VERSION));
+		super(String.format("input/v%s/lausitz-v%s-25pct.config.xml", VERSION, VERSION));
 	}
 
 	public static void main(String[] args) {