diff --git a/scenarios/metropole-ruhr-v2.0/input/area/area.cpg b/scenarios/metropole-ruhr-v2024.0/input/area/area.cpg similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/area/area.cpg rename to scenarios/metropole-ruhr-v2024.0/input/area/area.cpg diff --git a/scenarios/metropole-ruhr-v2.0/input/area/area.dbf b/scenarios/metropole-ruhr-v2024.0/input/area/area.dbf similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/area/area.dbf rename to scenarios/metropole-ruhr-v2024.0/input/area/area.dbf diff --git a/scenarios/metropole-ruhr-v2.0/input/area/area.prj b/scenarios/metropole-ruhr-v2024.0/input/area/area.prj similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/area/area.prj rename to scenarios/metropole-ruhr-v2024.0/input/area/area.prj diff --git a/scenarios/metropole-ruhr-v2.0/input/area/area.qmd b/scenarios/metropole-ruhr-v2024.0/input/area/area.qmd similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/area/area.qmd rename to scenarios/metropole-ruhr-v2024.0/input/area/area.qmd diff --git a/scenarios/metropole-ruhr-v2.0/input/area/area.shp b/scenarios/metropole-ruhr-v2024.0/input/area/area.shp similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/area/area.shp rename to scenarios/metropole-ruhr-v2024.0/input/area/area.shp diff --git a/scenarios/metropole-ruhr-v2.0/input/area/area.shx b/scenarios/metropole-ruhr-v2024.0/input/area/area.shx similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/area/area.shx rename to scenarios/metropole-ruhr-v2024.0/input/area/area.shx diff --git a/scenarios/metropole-ruhr-v2.0/input/commercialTraffic/commercial_VehicleTypes_CV.xml b/scenarios/metropole-ruhr-v2024.0/input/commercialTraffic/commercial_VehicleTypes_CV.xml similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/commercialTraffic/commercial_VehicleTypes_CV.xml rename to scenarios/metropole-ruhr-v2024.0/input/commercialTraffic/commercial_VehicleTypes_CV.xml diff --git a/scenarios/metropole-ruhr-v2.0/input/commercialTraffic/config_demand.xml b/scenarios/metropole-ruhr-v2024.0/input/commercialTraffic/config_demand.xml similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/commercialTraffic/config_demand.xml rename to scenarios/metropole-ruhr-v2024.0/input/commercialTraffic/config_demand.xml diff --git a/scenarios/metropole-ruhr-v2.0/input/investigationAreaData.csv b/scenarios/metropole-ruhr-v2024.0/input/investigationAreaData.csv similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/investigationAreaData.csv rename to scenarios/metropole-ruhr-v2024.0/input/investigationAreaData.csv diff --git a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml similarity index 94% rename from scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml rename to scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml index 3296861..eda0010 100644 --- a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml +++ b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml @@ -21,11 +21,11 @@ + value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0.network_resolutionHigh-with-pt.xml.gz"/> + value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0-3pct.plans.xml.gz"/> @@ -34,13 +34,13 @@ + value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0-transitSchedule.xml.gz"/> + value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0-transitVehicles.xml.gz"/> - + diff --git a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.mode-vehicles.xml b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.mode-vehicles.xml similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.mode-vehicles.xml rename to scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.mode-vehicles.xml diff --git a/scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.cpg b/scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.cpg similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.cpg rename to scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.cpg diff --git a/scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.dbf b/scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.dbf similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.dbf rename to scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.dbf diff --git a/scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.prj b/scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.prj similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.prj rename to scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.prj diff --git a/scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.shp b/scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.shp similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.shp rename to scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.shp diff --git a/scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.shx b/scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.shx similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/nrwArea/dvg2bld_nw.shx rename to scenarios/metropole-ruhr-v2024.0/input/nrwArea/dvg2bld_nw.shx diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.cpg b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.cpg similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.cpg rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.cpg diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.dbf b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.dbf similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.dbf rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.dbf diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.prj b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.prj similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.prj rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.prj diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.qix b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.qix similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.qix rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.qix diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.qmd b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.qmd similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.qmd rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.qmd diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.shp b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.shp similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.shp rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.shp diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.shx b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.shx similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen.shx rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen.shx diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.cpg b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.cpg similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.cpg rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.cpg diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.dbf b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.dbf similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.dbf rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.dbf diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.prj b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.prj similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.prj rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.prj diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.qmd b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.qmd similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.qmd rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.qmd diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shp b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shp similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shp rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shp diff --git a/scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shx b/scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shx similarity index 100% rename from scenarios/metropole-ruhr-v2.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shx rename to scenarios/metropole-ruhr-v2024.0/input/pt-pricing/pt_preisstufen_fare_all3.0.shx diff --git a/src/main/java/org/matsim/run/RunMetropoleRuhrScenarioCommercial.java b/src/main/java/org/matsim/run/RunMetropoleRuhrScenarioCommercial.java index 4f94dc5..b530e25 100644 --- a/src/main/java/org/matsim/run/RunMetropoleRuhrScenarioCommercial.java +++ b/src/main/java/org/matsim/run/RunMetropoleRuhrScenarioCommercial.java @@ -54,9 +54,9 @@ public Integer call() throws Exception { config.plans().setActivityDurationInterpretation(PlansConfigGroup.ActivityDurationInterpretation.tryEndTimeThenDuration); config.network().setInputFile(configPath.getParent().relativize(networkPath).toString()); config.vehicles().setVehiclesFile(configPath.getParent().relativize(pathVehicleTypes).toString()); - config.controler().setOutputDirectory(output.resolve("commercialTraffic_Run" + (int) (sample * 100) + "pct").toString()); - config.controler().setLastIteration(0); - config.controler().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists); + config.controller().setOutputDirectory(output.resolve("commercialTraffic_Run" + (int) (sample * 100) + "pct").toString()); + config.controller().setLastIteration(0); + config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists); config.transit().setUseTransit(false); config.transit().setTransitScheduleFile(null); config.transit().setVehiclesFile(null); @@ -67,13 +67,13 @@ public Integer call() throws Exception { config.qsim().setUsingTravelTimeCheckInTeleportation(true); config.qsim().setUsePersonIdForMissingVehicleId(false); //to get no traffic jam for the iteration 0 - if (config.controler().getLastIteration() == 0){ + if (config.controller().getLastIteration() == 0){ config.qsim().setFlowCapFactor(1.0); config.qsim().setStorageCapFactor(1.0); log.warn("Setting flowCapFactor and storageCapFactor to 1.0 because we have only the iteration 0 and we dont want to have traffic jams."); } - config.strategy().setFractionOfIterationsToDisableInnovation(0.8); - config.planCalcScore().setFractionOfIterationsToStartScoreMSA(0.8); + config.replanning().setFractionOfIterationsToDisableInnovation(0.8); + config.scoring().setFractionOfIterationsToStartScoreMSA(0.8); config.getModules().remove("intermodalTripFareCompensators"); config.getModules().remove("ptExtensions"); config.getModules().remove("ptIntermodalRoutingModes"); @@ -83,38 +83,38 @@ public Integer call() throws Exception { Set modes = Set.of("truck8t", "truck18t", "truck26t", "truck40t"); modes.forEach(mode -> { - PlanCalcScoreConfigGroup.ModeParams thisModeParams = new PlanCalcScoreConfigGroup.ModeParams(mode); - config.planCalcScore().addModeParams(thisModeParams); + ScoringConfigGroup.ModeParams thisModeParams = new ScoringConfigGroup.ModeParams(mode); + config.scoring().addModeParams(thisModeParams); }); Set qsimModes = new HashSet<>(config.qsim().getMainModes()); config.qsim().setMainModes(Sets.union(qsimModes, modes)); - Set networkModes = new HashSet<>(config.plansCalcRoute().getNetworkModes()); - config.plansCalcRoute().setNetworkModes(Sets.union(networkModes, modes)); - - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("commercial_start").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("commercial_end").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("service").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("pickup").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("delivery").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("commercial_return").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("start").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("end").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("freight_start").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("freight_end").setTypicalDuration(30 * 60)); - config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("freight_return").setTypicalDuration(30 * 60)); + Set networkModes = new HashSet<>(config.routing().getNetworkModes()); + config.routing().setNetworkModes(Sets.union(networkModes, modes)); + + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("commercial_start").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("commercial_end").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("service").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("pickup").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("delivery").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("commercial_return").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("start").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("end").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_start").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_end").setTypicalDuration(30 * 60)); + config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("freight_return").setTypicalDuration(30 * 60)); for (String subpopulation : List.of("LTL_trips", "commercialPersonTraffic", "commercialPersonTraffic_service", "longDistanceFreight", "FTL_trip", "FTL_kv_trip", "goodsTraffic")) { - config.strategy().addStrategySettings( - new StrategyConfigGroup.StrategySettings() + config.replanning().addStrategySettings( + new ReplanningConfigGroup.StrategySettings() .setStrategyName(DefaultPlanStrategiesModule.DefaultSelector.ChangeExpBeta) .setWeight(0.85) .setSubpopulation(subpopulation) ); - config.strategy().addStrategySettings( - new StrategyConfigGroup.StrategySettings() + config.replanning().addStrategySettings( + new ReplanningConfigGroup.StrategySettings() .setStrategyName(DefaultPlanStrategiesModule.DefaultStrategy.ReRoute) .setWeight(0.1) .setSubpopulation(subpopulation) @@ -129,4 +129,4 @@ public Integer call() throws Exception { return 0; } -} \ No newline at end of file +}