network update

Makefile

@@ -35,8 +35,9 @@ input/network.osm: $(NETWORK)
 	 --bounding-polygon file="$(shared)/data/cottbus.poly"\
 	 --used-node --wb input/network-detailed.osm.pbf
 
+	# This includes residential as well, since multiple cities are covered by the study area
 	$(osmosis) --rb file=$<\
-	 --tf accept-ways highway=motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary_link,secondary,tertiary,motorway_junction\
+	 --tf accept-ways highway=motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary_link,secondary,tertiary,motorway_junction,residential\
 	 --bounding-polygon file="$(shared)/data/lausitz.poly"\
 	 --used-node --wb input/network-coarse.osm.pbf
 
@@ -114,8 +115,8 @@ input/$V/$N-$V-100pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz i
  	 --population input/$V/prepare-100pct.plans.xml.gz\
  	 --input-crs $(CRS)\
 	 --shp input/shp/lausitz.shp --shp-crs $(CRS)\
-	 --range 1500\
- 	 --num-trips 795513
+	 --range 700\
+ 	 --num-trips 324430
 
 	$(sc) prepare adjust-activity-to-link-distances input/$V/prepare-100pct.plans-with-trips.xml.gz\
 	 --shp input/shp/lausitz.shp --shp-crs $(CRS)\

input/v1.0/lausitz-v1.0-100pct.config.xml

@@ -67,7 +67,7 @@
 		<param name="numberOfThreads" value="12"/>
 		<param name="startTime" value="00:00:00"/>
 		<param name="stuckTime" value="30.0"/>
-		<param name="trafficDynamics" value="queue"/>
+		<param name="trafficDynamics" value="kinematicWaves"/>
 		<param name="linkDynamics" value="PassingQ"/>
 		<param name="useLanes" value="false"/>
 

src/main/java/org/matsim/run/RunLausitzScenario.java

@@ -71,8 +71,8 @@ protected Config prepareConfig(Config config) {
 
 		// Path is relative to config
 		simWrapper.defaultParams().shp = "../shp/lausitz.shp";
-		simWrapper.defaultParams().mapCenter = "14.3463,51.5626";
-		simWrapper.defaultParams().mapZoomLevel = 9.0;
+		simWrapper.defaultParams().mapCenter = "14.5,51.53";
+		simWrapper.defaultParams().mapZoomLevel = 6.8;
 		simWrapper.defaultParams().sampleSize = 1d;
 
 		if (sample.isSet()) {
@@ -87,6 +87,8 @@ protected Config prepareConfig(Config config) {
 			simWrapper.defaultParams().sampleSize = sample.getSample();
 		}
 
+		config.qsim().setUsingTravelTimeCheckInTeleportation(true);
+		config.qsim().setUsePersonIdForMissingVehicleId(false);
 		config.routing().setAccessEgressType(RoutingConfigGroup.AccessEgressType.accessEgressModeToLink);
 
 		// TODO: Config options

src/main/python/create_ref.py

@@ -47,5 +47,5 @@ def trip_filter(df):
 
     sim = pd.merge(sim, sim_persons, how="inner", left_on="person", right_on="person", validate="many_to_one")
 
-    share, add_trips = calc_needed_short_distance_trips(trips, sim, max_dist=1500)
+    share, add_trips = calc_needed_short_distance_trips(trips, sim, max_dist=700)
     print("Short distance trip missing: ", add_trips)

src/test/java/org/matsim/run/RunIntegrationTest.java

@@ -15,7 +15,7 @@ public void runScenario() {
 
 		assert MATSimApplication.execute(RunLausitzScenario.class,
 			"--1pct",
-			"--iterations", "2",
+			"--iterations", "1",
 			"--output", utils.getOutputDirectory(),
 			"--config:controller.overwriteFiles=deleteDirectoryIfExists") == 0 : "Must return non error code";