more file path preparations

matsim-scenarios · May 16, 2022 · 8739408 · 8739408
1 parent 9e3679a
commit 8739408
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/org/matsim/analysis/accidents/RunAccidentsHamburg.java b/src/main/java/org/matsim/analysis/accidents/RunAccidentsHamburg.java
@@ -75,6 +75,7 @@ public static void main(String[] args) throws IOException {
             } else {
                 scenario =  RunReallabHH2030Scenario.prepareScenario(config);
             }
+            //the v3.0 network actually has the same number of lanes. TODO this code should be deleted eventually
             Network networkWithRealisticNumberOfLanes = NetworkUtils.readTimeInvariantNetwork("https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/hamburg/hamburg-v1/hamburg-v1.0/hamburg-v1.0-network-with-pt.xml.gz");
             Set<Id<Link>> tunnelLinks;
             if(baseCase){
@@ -93,7 +94,8 @@ public static void main(String[] args) throws IOException {
                     planfreeLinks);
         } else {
             //plan free and tunnel links as of 2021
-            config.network().setInputFile("https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/hamburg/hamburg-v2/hamburg-v2.0/baseCase/input/hamburg-v2.0-network-with-pt-with-accidentAttributes-2021.xml.gz");
+            //For an older version, see https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/hamburg/hamburg-v2/hamburg-v2.0/baseCase/input/hamburg-v2.0-network-with-pt-with-accidentAttributes-2021.xml.gz
+            config.network().setInputFile("provide path to preprocessed network file!");
             if(baseCase){
                 scenario =  RunBaseCaseHamburgScenario.prepareScenario(config);
             } else {

diff --git a/...java/org/matsim/analysis/emissions/RunOfflineAirPollutionAnalysisByEngineInformation.java b/...java/org/matsim/analysis/emissions/RunOfflineAirPollutionAnalysisByEngineInformation.java
@@ -106,8 +106,10 @@ public static void main(String[] args) throws IOException {
 		final String hbefaFileCold_2030 = hbefaPath + "6d425121249f0be3f411175b88cf7551e24f7143/d1944abead553305d9f1c4131cadbd382655f592.enc";
 		final String hbefaFileWarm_2030 = hbefaPath + "6d425121249f0be3f411175b88cf7551e24f7143/c154fc5d5ca7471c232f1b602575bdabbda26fab.enc";
 
-		final String runId = "hamburg-v2.2-proKlima2030" ;
-		String runDirectory = "provide run output directory";
+		final String runId = "hamburg-v3.0-10pct-base" ;
+		String runDirectory = "provide run output path";
+
+		if(!runDirectory.endsWith("/")) runDirectory = runDirectory + "/";
 		RunOfflineAirPollutionAnalysisByEngineInformation analysis = new RunOfflineAirPollutionAnalysisByEngineInformation(
 				runDirectory,
 				runId,