From 57630e0ef87c606af0b4fefdc4d1c7c98469570e Mon Sep 17 00:00:00 2001 From: Kai Nagel Date: Mon, 14 Oct 2024 14:11:26 +0200 Subject: [PATCH] go to PR version that allows Controller ctrl = ControllerUtils.createController( config ) --- pom.xml | 5 ++++- src/main/java/org/matsim/project/RunMatsim.java | 13 +++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 7fb0c6230..845af5fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,10 @@ - 2024.0 + + + 2025.0-PR3511 + 4.0.0 diff --git a/src/main/java/org/matsim/project/RunMatsim.java b/src/main/java/org/matsim/project/RunMatsim.java index ae501a05c..68e150630 100644 --- a/src/main/java/org/matsim/project/RunMatsim.java +++ b/src/main/java/org/matsim/project/RunMatsim.java @@ -21,7 +21,8 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; -import org.matsim.core.controler.Controler; +import org.matsim.core.controler.Controller; +import org.matsim.core.controler.ControllerUtils; import org.matsim.core.controler.OutputDirectoryHierarchy.OverwriteFileSetting; import org.matsim.core.scenario.ScenarioUtils; @@ -52,17 +53,17 @@ public static void main(String[] args) { // --- - Controler controler = new Controler( scenario ) ; + Controller controller = ControllerUtils.createController( scenario ); - // possibly modify controler here + // possibly modify controller here -// controler.addOverridingModule( new OTFVisLiveModule() ) ; +// controller.addOverridingModule( new OTFVisLiveModule() ) ; -// controler.addOverridingModule( new SimWrapperModule() ); +// controller.addOverridingModule( new SimWrapperModule() ); // --- - controler.run(); + controller.run(); } }