From f804b3cfd97d8a579e3c0e5f27323262e6d44a77 Mon Sep 17 00:00:00 2001
From: rakow <rakow@vsp.tu-berlin.de>
Date: Thu, 4 Jan 2024 20:04:53 +0100
Subject: [PATCH] update update detour factors and car share

---
 .../org/matsim/prepare/RunOpenBerlinCalibration.java |  6 +++---
 .../org/matsim/prepare/opt/RunCountOptimization.java |  2 +-
 .../prepare/population/InitLocationChoice.java       | 12 +++++++++---
 .../java/org/matsim/run/RunOpenBerlinScenario.java   |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java b/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java
index 64657468..255eaf12 100644
--- a/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java
+++ b/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java
@@ -86,9 +86,9 @@
 public class RunOpenBerlinCalibration extends MATSimApplication {
 
 	/**
-	 * Scaling factor if all persons use car (~20.6% share).
+	 * Scaling factor if all persons use car (~20% share).
 	 */
-	public static final double CAR_FACTOR = 4.85;
+	public static final int CAR_FACTOR = 5;
 	/**
 	 * Flexible activities, which need to be known for location choice and during generation.
 	 * A day can not end on a flexible activity.
@@ -96,7 +96,7 @@ public class RunOpenBerlinCalibration extends MATSimApplication {
 	public static final Set<String> FLEXIBLE_ACTS = Set.of("shop_daily", "shop_other", "leisure", "dining");
 	private static final Logger log = LogManager.getLogger(RunOpenBerlinCalibration.class);
 	@CommandLine.Mixin
-	private final SampleOptions sample = new SampleOptions(100, 25, 10, 1);
+	private final SampleOptions sample = new SampleOptions(25, 10, 3, 1);
 	@CommandLine.Option(names = "--mode", description = "Calibration mode that should be run.")
 	private CalibrationMode mode;
 	@CommandLine.Option(names = "--weight", description = "Strategy weight.", defaultValue = "1")
diff --git a/src/main/java/org/matsim/prepare/opt/RunCountOptimization.java b/src/main/java/org/matsim/prepare/opt/RunCountOptimization.java
index e75178e7..d897d186 100644
--- a/src/main/java/org/matsim/prepare/opt/RunCountOptimization.java
+++ b/src/main/java/org/matsim/prepare/opt/RunCountOptimization.java
@@ -169,7 +169,7 @@ private List<PlanPerson> processPopulation(Path input, Network network, Counts<L
 				// if other trips have been scaled, these unscaled trips are scaled as well
 				if (allCar)
 					// scale with mean of CAR_FACTOR
-					scale *= (rnd.nextDouble() < 0.85 ? 5 : 4);
+					scale *= RunOpenBerlinCalibration.CAR_FACTOR;
 			}
 
 			// Index for plan
diff --git a/src/main/java/org/matsim/prepare/population/InitLocationChoice.java b/src/main/java/org/matsim/prepare/population/InitLocationChoice.java
index 5dd36b68..cd10353f 100644
--- a/src/main/java/org/matsim/prepare/population/InitLocationChoice.java
+++ b/src/main/java/org/matsim/prepare/population/InitLocationChoice.java
@@ -46,7 +46,12 @@ public class InitLocationChoice implements MATSimAppCommand, PersonAlgorithm {
 	/**
 	 * Detour factor for car routes, which was determined based on sampled routes.
 	 */
-	private static final double DETOUR_FACTOR = 1.56;
+	private static final double DETOUR_FACTOR = 1.46;
+
+	/**
+	 * Factor for short trips < 2000m.
+	 */
+	private static final double DETOUR_FACTOR_SHORT = 1.3;
 
 	private static final Logger log = LogManager.getLogger(InitLocationChoice.class);
 
@@ -198,10 +203,11 @@ public void run(Person person) {
 					ActivityFacility location = null;
 
 					// target leg distance in km
-					Object origDist = act.getAttributes().getAttribute("orig_dist");
+					double origDist = (double) act.getAttributes().getAttribute("orig_dist");
 
 					// Distance will be reduced
-					double dist = (double) origDist * 1000 / DETOUR_FACTOR;
+					double detourFactor = origDist <= 2000 ? DETOUR_FACTOR_SHORT : DETOUR_FACTOR;
+					double dist = origDist * 1000 / detourFactor;
 
 					if (fixedLocations.containsKey(type)) {
 						location = fixedLocations.get(type);
diff --git a/src/main/java/org/matsim/run/RunOpenBerlinScenario.java b/src/main/java/org/matsim/run/RunOpenBerlinScenario.java
index fbaa3fd4..20a982cd 100644
--- a/src/main/java/org/matsim/run/RunOpenBerlinScenario.java
+++ b/src/main/java/org/matsim/run/RunOpenBerlinScenario.java
@@ -30,7 +30,7 @@ public class RunOpenBerlinScenario extends MATSimApplication {
 	public static final String VERSION = "6.1";
 	public static final String CRS = "EPSG:25832";
 	@CommandLine.Mixin
-	private final SampleOptions sample = new SampleOptions(25, 10, 1);
+	private final SampleOptions sample = new SampleOptions(25, 10, 3, 1);
 
 	public RunOpenBerlinScenario() {
 		super(String.format("input/v%s/berlin-v%s.config.xml", VERSION, VERSION));