Stand 21.November

matsim-scenarios · Nov 21, 2024 · 282780f · 282780f
1 parent 1a125be
commit 282780f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/input/v3.1/kelheim-v3.1-25pct.kexi.config.xml b/input/v3.1/kelheim-v3.1-25pct.kexi.config.xml
@@ -175,7 +175,7 @@
             </parameterset>
 
             <parameterset type="modeParams" >
-                <param name="constant" value="0.10908902922956654" />
+                <param name="constant" value="0" />
                 <param name="dailyMonetaryConstant" value="-5.3" />
                 <param name="dailyUtilityConstant" value="0.0" />
                 <param name="marginalUtilityOfDistance_util_m" value="0.0" />
@@ -193,7 +193,7 @@
                 <param name="monetaryDistanceRate" value="-2.0E-4" />
             </parameterset>
             <parameterset type="modeParams" >
-                <param name="constant" value="0.0449751479497542" />
+                <param name="constant" value="0" />
                 <param name="dailyMonetaryConstant" value="0.0" />
                 <param name="dailyUtilityConstant" value="0.0" />
                 <param name="marginalUtilityOfDistance_util_m" value="0.0" />

diff --git a/src/main/java/org/matsim/run/RunKelheimScenario.java b/src/main/java/org/matsim/run/RunKelheimScenario.java
@@ -238,6 +238,8 @@ protected Config prepareConfig(Config config) {
 				//TODO: temp, allow accessibility computations to occur more than 1.5km away from drt stops.
 				drtConfigGroup.maxWalkDistance = 100000.;
 
+				drtConfigGroup.transitStopFile = "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/kelheim/kelheim-v3.0/input/kelheim-v3.0-drt-stops.xml";
+
 			}
 
 			// TODO: what is a good constant for DRT. The existing one of 2.45 makes drt trips really attractive; you no longer see a difference with stops that are far away and ones that are close.
@@ -276,7 +278,7 @@ protected Config prepareConfig(Config config) {
 			accConfig.setBoundingBoxBottom(mapCenterY - num_rows*tileSize - tileSize/2);
 			accConfig.setBoundingBoxTop(mapCenterY + num_rows*tileSize + tileSize/2);
 			accConfig.setTileSize_m((int) tileSize);
-			accConfig.setTimeOfDay(12 * 60 * 60.);
+			accConfig.setTimeOfDay(19 * 60 * 60.);
 			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.freespeed, false); // works
 			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.car, true); // works
 //			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.bike, false); // ??
@@ -364,7 +366,7 @@ protected void prepareScenario(Scenario scenario) {
 
 
 			// Use this method if reading facilities from a csv.
-			Path filePath = Path.of("pois.csv");
+			Path filePath = Path.of("supermarkets_LK.csv");
 			try (CSVParser parser = new CSVParser(new BufferedReader(new InputStreamReader(Files.newInputStream(filePath))),
 				CSVFormat.DEFAULT.withDelimiter(',').withFirstRecordAsHeader())) {
 
@@ -509,7 +511,7 @@ public void handleEvent(PersonDepartureEvent event) {
 //			final AccessibilityModule moduleDoctors = new AccessibilityModule();
 //			moduleDoctors.setConsideredActivityType("doctor");
 //			controler.addOverridingModule(moduleDoctors);
-//
+
 //			final AccessibilityModule moduleSport = new AccessibilityModule();
 //			moduleSport.setConsideredActivityType("sport");
 //			controler.addOverridingModule(moduleSport);
@@ -518,10 +520,10 @@ public void handleEvent(PersonDepartureEvent event) {
 //			moduleGroceries.setConsideredActivityType("groceries");
 //			controler.addOverridingModule(moduleGroceries);
 
-//			final AccessibilityModule moduleSupermarkets = new AccessibilityModule();
-//			moduleSupermarkets.setConsideredActivityType("supermarket");
-//			controler.addOverridingModule(moduleSupermarkets);
-
+			final AccessibilityModule moduleSupermarkets = new AccessibilityModule();
+			moduleSupermarkets.setConsideredActivityType("supermarket");
+			controler.addOverridingModule(moduleSupermarkets);
+//
 //			final AccessibilityModule moduleAltstadt = new AccessibilityModule();
 //			moduleAltstadt.setConsideredActivityType("altstadt");
 //			controler.addOverridingModule(moduleAltstadt);
@@ -530,9 +532,9 @@ public void handleEvent(PersonDepartureEvent event) {
 //			moduleBuildings.setConsideredActivityType("building");
 //			controler.addOverridingModule(moduleBuildings);
 
-			final AccessibilityModule moduleSenioren = new AccessibilityModule();
-			moduleSenioren.setConsideredActivityType("senioren");
-			controler.addOverridingModule(moduleSenioren);
+//			final AccessibilityModule moduleSenioren = new AccessibilityModule();
+//			moduleSenioren.setConsideredActivityType("senioren");
+//			controler.addOverridingModule(moduleSenioren);
 		}
 	}
 }