1.1 commercial traffic

Makefile

@@ -7,7 +7,7 @@ JAR := matsim-$(N)-*.jar
 osmosis := osmosis/bin/osmosis
 germany := ../shared-svn/projects/matsim-germany
 shared := ../shared-svn/projects/DiTriMo
-lausitz := ../public-svn/matsim/scenarios/countries/de/lausitz/lausitz-$V
+lausitz := ../public-svn/matsim/scenarios/countries/de/lausitz/input/$V
 
 MEMORY ?= 20G
 SUMO_HOME ?= $(abspath ../../sumo-1.18.0/)
@@ -94,6 +94,42 @@ input/plans-longHaulFreight.xml.gz: input/$V/$N-$V-network.xml.gz
 	 --shp input/shp/lausitz.shp --shp-crs $(CRS)\
 	 --cut-on-boundary\
 	 --output $@
+# create facilities for commercial traffic
+input/commercialFacilities.xml.gz:
+	$(sc) prepare create-data-distribution-of-structure-data\
+	 --outputFacilityFile $@\
+	 --outputDataDistributionFile $(shared)/data/commercial_traffic/input/commercialTraffic/dataDistributionPerZone.csv\
+	 --landuseConfiguration useOSMBuildingsAndLanduse\
+ 	 --regionsShapeFileName $(shared)/data/commercial_traffic/input/commercialTraffic/lausitz_regions_25832.shp\
+	 --regionsShapeRegionColumn "GEN"\
+	 --zoneShapeFileName $(shared)/data/commercial_traffic/input/commercialTraffic/lausitz_zones_25832.shp\
+	 --zoneShapeFileNameColumn "GEN"\
+	 --buildingsShapeFileName $(shared)/data/commercial_traffic/input/commercialTraffic/lausitz_buildings_25832.shp\
+	 --shapeFileBuildingTypeColumn "building"\
+	 --landuseShapeFileName $(shared)/data/commercial_traffic/input/commercialTraffic/lausitz_landuse_25832.shp\
+	 --shapeFileLanduseTypeColumn "landuse"\
+	 --shapeCRS "EPSG:25832"\
+	 --pathToInvestigationAreaData $(shared)/data/commercial_traffic/input/commercialTraffic/commercialTrafficAreaData.csv
+# generate small scale commercial traffic
+input/lausitz-small-scale-commercialTraffic-$V-100pct.plans.xml.gz: input/$V/$N-$V-network.xml.gz input/commercialFacilities.xml.gz
+	$(sc) prepare generate-small-scale-commercial-traffic\
+	  input/$V/lausitz-$V-100pct.config.xml\
+	 --pathToDataDistributionToZones $(shared)/data/commercial_traffic/input/commercialTraffic/dataDistributionPerZone.csv\
+	 --pathToCommercialFacilities $(word 2,$^)\
+	 --sample 1.0\
+	 --jspritIterations 10\
+	 --creationOption createNewCarrierFile\
+	 --network $<\
+	 --smallScaleCommercialTrafficType completeSmallScaleCommercialTraffic\
+	 --zoneShapeFileName $(shared)/data/commercial_traffic/input/commercialTraffic/lausitz_zones_25832.shp\
+	 --zoneShapeFileNameColumn "GEN"\
+	 --shapeCRS "EPSG:25832"\
+	 --numberOfPlanVariantsPerAgent 5\
+	 --nameOutputPopulation $@\
+	 --pathOutput output/commercialPersonTraffic
+
+	mv output/commercialPersonTraffic/$@ $@
+
 
 # trajectory-to-plans formerly was a collection of methods to prepare a given population
 # now, most of the functions of this class do have their own class (downsample, splitduration types...)
@@ -113,7 +149,7 @@ input/$V/prepare-100pct.plans.xml.gz:
 	 --landuse $(germany)/landuse/landuse.shp\
 	 --output $@
 
-input/$V/$N-$V-100pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz input/$V/prepare-100pct.plans.xml.gz
+input/$V/$N-$V-100pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz input/$V/prepare-100pct.plans.xml.gz input/lausitz-small-scale-commercialTraffic-$V-100pct.plans.xml.gz
 
 #	generate some short distance trips, which in senozon data generally are missing
 # trip range 700m because:
@@ -126,7 +162,7 @@ input/$V/$N-$V-100pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz i
 	 --range 700\
  	 --num-trips 324430
 
-#	adapt coords of activitzies in the wider network such that they are closer to a link
+#	adapt coords of activities in the wider network such that they are closer to a link
 # 	such that agents do not have to walk as far as before
 	$(sc) prepare adjust-activity-to-link-distances input/$V/prepare-100pct.plans-with-trips.xml.gz\
 	 --shp input/shp/lausitz.shp --shp-crs $(CRS)\
@@ -144,11 +180,11 @@ input/$V/$N-$V-100pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz i
 #	split activity types to type_duration for the scoring to take into account the typical duration
 	$(sc) prepare split-activity-types-duration\
 		--input $@\
-		--exclude commercial_start,commercial_end,freight_start,freight_end\
+		--exclude commercial_start,commercial_end,freight_start,freight_end,service\
 		--output $@
 
 #	merge person and freight pops
-	$(sc) prepare merge-populations $@ $< --output $@
+	$(sc) prepare merge-populations $@ $< $(word 3,$^) --output $@
 
 	$(sc) prepare downsample-population $@\
     	 --sample-size 1\

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

@@ -1,6 +1,8 @@
 package org.matsim.run;
 
 import com.google.common.collect.Sets;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.TransportMode;
 import org.matsim.api.core.v01.network.Link;
@@ -18,10 +20,14 @@
 import org.matsim.contrib.vsp.scenario.SnzActivities;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
+import org.matsim.core.config.groups.ReplanningConfigGroup;
 import org.matsim.core.config.groups.RoutingConfigGroup;
 import org.matsim.core.config.groups.ScoringConfigGroup;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.Controler;
+import org.matsim.core.replanning.strategies.DefaultPlanStrategiesModule;
+import org.matsim.core.router.costcalculators.TravelDisutilityFactory;
+import org.matsim.core.router.util.TravelTime;
 import org.matsim.core.scoring.functions.ScoringParametersForPerson;
 import org.matsim.run.analysis.CommuterAnalysis;
 import org.matsim.run.prepare.PreparePopulation;
@@ -34,6 +40,8 @@
 import playground.vsp.scoring.IncomeDependentUtilityOfMoneyPersonScoringParameters;
 
 import javax.annotation.Nullable;
+import java.util.HashSet;
+import java.util.List;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
 import java.util.Set;
@@ -51,6 +59,7 @@
 public class LausitzScenario extends MATSimApplication {
 
 	public static final String VERSION = "1.1";
+	private static final String FREIGHT = "freight";
 
 	@CommandLine.Mixin
 	private final SampleOptions sample = new SampleOptions( 100, 25, 10, 1);
@@ -114,6 +123,8 @@ protected Config prepareConfig(Config config) {
 		config.qsim().setUsePersonIdForMissingVehicleId(false);
 		config.routing().setAccessEgressType(RoutingConfigGroup.AccessEgressType.accessEgressModeToLink);
 
+		prepareCommercialTrafficConfig(config);
+		// TODO: Config options
 //		set pt fare calc model to fareZoneBased = fare of vvo tarifzone 20 is paid for trips within fare zone
 //		every other trip: Deutschlandtarif
 //		for more info see FareZoneBasedPtFareHandler class in vsp contrib
@@ -139,9 +150,10 @@ protected void prepareScenario(Scenario scenario) {
 			Set<String> modes = link.getAllowedModes();
 
 			// allow freight traffic together with cars
-			if (modes.contains("car")) {
+			if (modes.contains(TransportMode.car)) {
 				Set<String> newModes = Sets.newHashSet(modes);
-				newModes.add("freight");
+				newModes.add(FREIGHT);
+				newModes.add(TransportMode.truck);
 
 				link.setAllowedModes(newModes);
 			}
@@ -161,9 +173,56 @@ public void install() {
 
 				addTravelTimeBinding(TransportMode.ride).to(networkTravelTime());
 				addTravelDisutilityFactoryBinding(TransportMode.ride).to(carTravelDisutilityFactoryKey());
+
+				addTravelTimeBinding(FREIGHT).to(Key.get(TravelTime.class, Names.named(TransportMode.truck)));
+				addTravelDisutilityFactoryBinding(FREIGHT).to(Key.get(TravelDisutilityFactory.class, Names.named(TransportMode.truck)));
 //				we do not need to add SwissRailRaptor explicitely! this is done in core
 			}
 
 		});
 	}
+
+	/**
+	 * Prepare the config for commercial traffic.
+	 */
+	public static void prepareCommercialTrafficConfig(Config config) {
+
+		Set<String> modes = Set.of(FREIGHT, TransportMode.truck);
+
+		modes.forEach(mode -> {
+			ScoringConfigGroup.ModeParams thisModeParams = new ScoringConfigGroup.ModeParams(mode);
+			config.scoring().addModeParams(thisModeParams);
+		});
+
+		Set<String> qsimModes = new HashSet<>(config.qsim().getMainModes());
+		config.qsim().setMainModes(Sets.union(qsimModes, modes));
+
+		Set<String> networkModes = new HashSet<>(config.routing().getNetworkModes());
+		config.routing().setNetworkModes(Sets.union(networkModes, modes));
+
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("commercial_start").setTypicalDuration(30 * 60.));
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("commercial_end").setTypicalDuration(30 * 60.));
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("service").setTypicalDuration(30 * 60.));
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("start").setTypicalDuration(30 * 60.));
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("end").setTypicalDuration(30 * 60.));
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_start").setTypicalDuration(30 * 60.));
+		config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_end").setTypicalDuration(30 * 60.));
+
+		//TODO: add freight and remove from config or change freight subpopulation and mode for long distance freight
+		for (String subpopulation : List.of("commercialPersonTraffic", "commercialPersonTraffic_service", "goodsTraffic")) {
+			config.replanning().addStrategySettings(
+				new ReplanningConfigGroup.StrategySettings()
+					.setStrategyName(DefaultPlanStrategiesModule.DefaultSelector.ChangeExpBeta)
+					.setWeight(0.85)
+					.setSubpopulation(subpopulation)
+			);
+
+			config.replanning().addStrategySettings(
+				new ReplanningConfigGroup.StrategySettings()
+					.setStrategyName(DefaultPlanStrategiesModule.DefaultStrategy.ReRoute)
+					.setWeight(0.1)
+					.setSubpopulation(subpopulation)
+			);
+		}
+	}
 }