From c23dd9a40d21005d529cf517fad77e81e6f51538 Mon Sep 17 00:00:00 2001 From: Kai Nagel Date: Thu, 8 Feb 2024 10:37:40 +0100 Subject: [PATCH 1/2] rename a method from add... to set... since that is what is does. --- .../codeexamples/extensions/dvrp/RunDrtExample.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/matsim/codeexamples/extensions/dvrp/RunDrtExample.java b/src/main/java/org/matsim/codeexamples/extensions/dvrp/RunDrtExample.java index 37607a7e..d1aa7cb0 100644 --- a/src/main/java/org/matsim/codeexamples/extensions/dvrp/RunDrtExample.java +++ b/src/main/java/org/matsim/codeexamples/extensions/dvrp/RunDrtExample.java @@ -5,7 +5,9 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.TransportMode; import org.matsim.api.core.v01.events.Event; +import org.matsim.contrib.drt.optimizer.insertion.DrtInsertionSearchParams; import org.matsim.contrib.drt.optimizer.insertion.extensive.ExtensiveInsertionSearchParams; +import org.matsim.contrib.drt.optimizer.insertion.repeatedselective.RepeatedSelectiveInsertionSearchParams; import org.matsim.contrib.drt.routing.DrtRoute; import org.matsim.contrib.drt.routing.DrtRouteFactory; import org.matsim.contrib.drt.run.DrtConfigGroup; @@ -84,7 +86,7 @@ public static void run(boolean otfvis, String... args ){ drtConfig.rejectRequestIfMaxWaitOrTravelTimeViolated= false ; drtConfig.vehiclesFile="one_shared_taxi_vehicles_A.xml"; drtConfig.changeStartLinkToLastLinkInSchedule=true; - drtConfig.addParameterSet( new ExtensiveInsertionSearchParams() ); + drtConfig.setDrtInsertionSearchParams( new ExtensiveInsertionSearchParams() ); multiModeDrtCfg.addParameterSet(drtConfig); } { @@ -97,7 +99,7 @@ public static void run(boolean otfvis, String... args ){ drtConfig.rejectRequestIfMaxWaitOrTravelTimeViolated= false ; drtConfig.vehiclesFile="one_shared_taxi_vehicles_B.xml"; drtConfig.changeStartLinkToLastLinkInSchedule=true; - drtConfig.addParameterSet( new ExtensiveInsertionSearchParams() ); + drtConfig.setDrtInsertionSearchParams( new ExtensiveInsertionSearchParams() ); multiModeDrtCfg.addParameterSet(drtConfig); } { @@ -110,7 +112,7 @@ public static void run(boolean otfvis, String... args ){ drtConfig.rejectRequestIfMaxWaitOrTravelTimeViolated= false ; drtConfig.vehiclesFile="one_shared_taxi_vehicles_C.xml"; drtConfig.changeStartLinkToLastLinkInSchedule=true; - drtConfig.addParameterSet( new ExtensiveInsertionSearchParams() ); + drtConfig.setDrtInsertionSearchParams( new ExtensiveInsertionSearchParams() ); multiModeDrtCfg.addParameterSet(drtConfig); } From 7168ce315411fad4f4eee60f70a6314105f15bf7 Mon Sep 17 00:00:00 2001 From: Kai Nagel Date: Thu, 8 Feb 2024 10:42:53 +0100 Subject: [PATCH 2/2] set pom.xml to the PR with which it should work (once there) --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b7bf73fa..6c87fe33 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,7 @@ Therefore we need to use a fixed value here and then refer to the matsim version with ${project.parent.version} --> - 16.0-2024w06 - + 16.0-PR3099