From 282780f4701d836e69d63e4dd8bd505a11552ade Mon Sep 17 00:00:00 2001 From: Johanna Baensch Date: Thu, 21 Nov 2024 14:29:01 +0100 Subject: [PATCH] Stand 21.November --- input/v3.1/kelheim-v3.1-25pct.kexi.config.xml | 4 ++-- .../org/matsim/run/RunKelheimScenario.java | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 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 index c2ea1d77..ca4446a0 100644 --- 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 @@ - + @@ -193,7 +193,7 @@ - + diff --git a/src/main/java/org/matsim/run/RunKelheimScenario.java b/src/main/java/org/matsim/run/RunKelheimScenario.java index 38b02dc1..868731b4 100644 --- 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); } } }