diff --git a/pom.xml b/pom.xml index 326fa108..8556421c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.matsim matsim-all - 2025.0-2024w39 + 2025.0-2024w41 diff --git a/src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java index 022b41db..bbd9235c 100644 --- a/src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java @@ -85,6 +85,7 @@ public static Carrier solveVrpWithJsprit(Carrier carrier, Scenario scenario) { CarrierPlan plan = MatsimJspritFactory.createPlan(carrier, solution); NetworkRouter.routePlan(plan, netbasedTransportCosts); + carrier.addPlan(plan); carrier.setSelectedPlan(plan); return carrier; } diff --git a/src/main/java/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java index 814cf83b..6e4b03be 100644 --- a/src/main/java/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java @@ -138,6 +138,7 @@ protected void scheduleResource() { CarrierPlan plan = new CarrierPlan(carrier, unifyTourIds(scheduledPlans)); plan.setScore(CarrierSchedulerUtils.sumUpScore(scheduledPlans)); plan.setJspritScore(CarrierSchedulerUtils.sumUpJspritScore(scheduledPlans)); + carrier.addPlan(plan); carrier.setSelectedPlan(plan); } diff --git a/src/main/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java index 18846fc8..9e1f13c8 100644 --- a/src/main/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java @@ -112,6 +112,7 @@ protected void scheduleResource() { } CarrierPlan plan = new CarrierPlan(carrier, scheduledTours); plan.setScore(CarrierSchedulerUtils.sumUpScore(scheduledPlans)); + carrier.addPlan(plan); carrier.setSelectedPlan(plan); }