diff --git a/src/main/java/org/matsim/policies/gartenfeld/CreateGartenfeldPopulation.java b/src/main/java/org/matsim/policies/gartenfeld/CreateGartenfeldPopulation.java index 77cd7251..7939ba9d 100644 --- a/src/main/java/org/matsim/policies/gartenfeld/CreateGartenfeldPopulation.java +++ b/src/main/java/org/matsim/policies/gartenfeld/CreateGartenfeldPopulation.java @@ -1,7 +1,7 @@ package org.matsim.policies.gartenfeld; import org.matsim.application.MATSimAppCommand; -import org.matsim.application.prepare.population.MergePopulations; +import org.matsim.application.prepare.population.*; import org.matsim.prepare.population.CreateFixedPopulation; import org.matsim.prepare.population.InitLocationChoice; import org.matsim.prepare.population.RemoveUnavailableRoutes; @@ -41,7 +41,6 @@ public Integer call() throws Exception { "--output", output ); - new InitLocationChoice().execute( "--input", output, "--output", output, @@ -54,6 +53,28 @@ public Integer call() throws Exception { "--sample", "0.1" ); + new SplitActivityTypesDuration().execute( + "--input", output, + "--output", output, + "--exclude", "commercial_start,commercial_end,freight_start,freight_end" + ); + + new SetCarAvailabilityByAge().execute( + "--input", output, + "--output", output + ); + + new CheckCarAvailability().execute( + "--input", output, + "--output", output + ); + + new FixSubtourModes().execute( + "--input", output, + "--output", output, + "--coord-dist", "100" + ); + // Merge with calibrated plans into one new MergePopulations().execute( output, "input/v6.3/berlin-v6.3-10pct.plans.xml.gz",