From f4e4a6f1590f09b7ae989b6d19551dbbd60d5084 Mon Sep 17 00:00:00 2001 From: NicDul <71266428+NicDul@users.noreply.github.com> Date: Tue, 28 May 2024 11:30:46 +0200 Subject: [PATCH] Added a test scenario for a construction site between Morges and Renens on the line Lausanne - Geneva (#3283) Co-authored-by: u238053 Co-authored-by: rakow --- .../integration/RailsimIntegrationTest.java | 11 +- .../config.xml | 39 ++ .../trainNetwork.xml | 319 +++++++++ .../transitSchedule.xml | 605 ++++++++++++++++++ .../transitVehicles.xml | 191 ++++++ 5 files changed, 1162 insertions(+), 3 deletions(-) create mode 100644 contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/config.xml create mode 100644 contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/trainNetwork.xml create mode 100644 contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitSchedule.xml create mode 100644 contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitVehicles.xml diff --git a/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java b/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java index 7adbb41fc31..4bf88ef4c05 100644 --- a/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java +++ b/contribs/railsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java @@ -373,9 +373,9 @@ void testScenarioKelheim() { type.setMaximumVelocity(30); type.setLength(100); } - + // simplify the activity types, e.g. home_3600 -> home - Set activityTypes = new HashSet<>(); + Set activityTypes = new HashSet<>(); for (Person person : scenario.getPopulation().getPersons().values()) { for (Plan plan : person.getPlans()) { for (PlanElement pE : plan.getPlanElements()) { @@ -388,7 +388,7 @@ void testScenarioKelheim() { } } } - + for (String type : activityTypes) { config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams(type).setTypicalDuration(1234.)); } @@ -405,6 +405,11 @@ void testScenarioMicroMesoCombination() { EventsCollector collector = runSimulation(new File(utils.getPackageInputDirectory(), "scenarioMicroMesoCombination")); } + @Test + void testScenarioMicroMesoConstructionSiteLsGe() { + EventsCollector collector = runSimulation(new File(utils.getPackageInputDirectory(), "scenarioMicroMesoConstructionSiteLsGe")); + } + private EventsCollector runSimulation(File scenarioDir) { return runSimulation(scenarioDir, null); } diff --git a/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/config.xml b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/config.xml new file mode 100644 index 00000000000..da3761b5c4e --- /dev/null +++ b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/config.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/trainNetwork.xml b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/trainNetwork.xml new file mode 100644 index 00000000000..731eca24217 --- /dev/null +++ b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/trainNetwork.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GE1GE2 + 7 + fixedBlock + + + + + GE1GE2 + 7 + fixedBlock + + + + + + GE2COP1 + 3 + fixedBlock + + + + + GE2COP1 + 3 + fixedBlock + + + + + + COP1COP2 + 3 + fixedBlock + + + + + COP1COP2 + 3 + fixedBlock + + + + + + + COP2NY1 + 2 + fixedBlock + + + + + COP2NY1 + 2 + fixedBlock + + + + + + NY1NY2 + 3 + fixedBlock + + + + + NY1NY2 + 3 + fixedBlock + + + + + + NY2GLA1 + 2 + fixedBlock + + + + + NY2GLA1 + 2 + fixedBlock + + + + + + GLA1GLA2 + 2 + fixedBlock + + + + + GLA1GLA2 + 2 + fixedBlock + + + + + + GLA2ROL1 + 2 + fixedBlock + + + + + GLA2ROL1 + 2 + fixedBlock + + + + + + + ROL1ROL2 + 2 + fixedBlock + + + + + ROL1ROL2 + 2 + fixedBlock + + + + + + ROL2ALL1 + 2 + fixedBlock + + + + + ROL2ALL1 + 2 + fixedBlock + + + + + + ALL1ALL2 + 3 + fixedBlock + + + + + ALL1ALL2 + 3 + fixedBlock + + + + + + ALL2MOR1 + 2 + fixedBlock + + + + + ALL2MOR1 + 2 + fixedBlock + + + + + + MOR1MOR2 + 4 + true + fixedBlock + + + + + MOR1MOR2 + 4 + true + fixedBlock + + + + + + MOR2REN1-1 + fixedBlock + + + + + MOR2REN1-1 + fixedBlock + + + + + MOR2REN1-2 + fixedBlock + + + + + MOR2REN1-2 + fixedBlock + + + + + + + REN1REN2 + 5 + true + fixedBlock + + + + + REN1REN2 + 5 + true + fixedBlock + + + + + + REN2LS1 + 4 + fixedBlock + + + + + REN2LS1 + 4 + fixedBlock + + + + + + LS1LS2 + 7 + fixedBlock + + + + + LS1LS2 + 7 + fixedBlock + + + + + + + + + diff --git a/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitSchedule.xml b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitSchedule.xml new file mode 100644 index 00000000000..19b28847fff --- /dev/null +++ b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitSchedule.xml @@ -0,0 +1,605 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rail + + + + + + + + + + + + + + + + + + + + diff --git a/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitVehicles.xml b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitVehicles.xml new file mode 100644 index 00000000000..7439829e879 --- /dev/null +++ b/contribs/railsim/test/input/ch/sbb/matsim/contrib/railsim/integration/scenarioMicroMesoConstructionSiteLsGe/transitVehicles.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + 5.0 + serial + 5.0 + 1 + 1 + + + + + + + + + + + + + + + + + + 5.0 + serial + 5.0 + 0.8 + 0.8 + + + + + + + + + + + + + + + + + + 5.0 + serial + 5.0 + 0.8 + 0.8 + + + + + + + + + + + + + + + + + + 5.0 + serial + 5.0 + 0.8 + 0.8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +