From b3b2386fdcd020a5cf79cb22706a948bbf068da9 Mon Sep 17 00:00:00 2001
From: Christian Rakow <rakow@vsp.tu-berlin.de>
Date: Mon, 24 Jan 2022 16:58:46 +0100
Subject: [PATCH] 3pct config update

---
 .../input/metropole-ruhr-v1.0-3pct.config.xml             | 8 ++++----
 src/main/R/srv.R                                          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scenarios/metropole-ruhr-v1.0/input/metropole-ruhr-v1.0-3pct.config.xml b/scenarios/metropole-ruhr-v1.0/input/metropole-ruhr-v1.0-3pct.config.xml
index 269c1d5..ffc80a3 100644
--- a/scenarios/metropole-ruhr-v1.0/input/metropole-ruhr-v1.0-3pct.config.xml
+++ b/scenarios/metropole-ruhr-v1.0/input/metropole-ruhr-v1.0-3pct.config.xml
@@ -114,25 +114,25 @@
 			<parameterset type="modeParams" >
 				<param name="mode" value="car" />
 				<param name="dailyMonetaryConstant" value="-5.3" />
-				<param name="constant" value="-0.44738795868422765" />
+				<param name="constant" value="-0.4128" />
 				<param name="marginalUtilityOfTraveling_util_hr" value="-1.0" />
 				<param name="monetaryDistanceRate" value="-0.0002" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="ride" />
-				<param name="constant" value="-1.468151476058771" />
+				<param name="constant" value="-1.30034" />
 				<param name="marginalUtilityOfTraveling_util_hr" value="-3.0" />
 				<param name="monetaryDistanceRate" value="-0.0002" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="pt" />
 				<param name="dailyMonetaryConstant" value="-2.15" />
-				<param name="constant" value="0.4899" />
+				<param name="constant" value="0.60604" />
 				<param name="marginalUtilityOfTraveling_util_hr" value="-3.0" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="bike" />
-				<param name="constant" value="0.1172" />
+				<param name="constant" value="0.162" />
 				<param name="marginalUtilityOfTraveling_util_hr" value="-7.0" />
 			</parameterset>
 			<parameterset type="modeParams" >
diff --git a/src/main/R/srv.R b/src/main/R/srv.R
index 93ead97..86b5499 100644
--- a/src/main/R/srv.R
+++ b/src/main/R/srv.R
@@ -85,8 +85,8 @@ srv <- read_csv("mid_adj.csv") %>%
 # Read simulation data
 ##################
 
-f <- "\\\\sshfs.kr\\rakow@cluster.math.tu-berlin.de\\net\\ils\\matsim-metropole-ruhr\\calibration\\runs\\025"
-sim_scale <- 100/10
+f <- "\\\\sshfs.kr\\rakow@cluster.math.tu-berlin.de\\net\\ils\\matsim-metropole-ruhr\\calibration3pct\\runs\\036"
+sim_scale <- 100/3
 
 persons <- read_delim(list.files(f, pattern = "*.output_persons.csv.gz", full.names = T, include.dirs = F), delim = ";", trim_ws = T, 
                      col_types = cols(