Merge remote-tracking branch 'origin/main' into kmt_2echelon4Diss

matsim-vsp · Oct 10, 2024 · e042693 · e042693
2 parents 041eeb5 + ce37c8e
commit e042693
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>matsim-all</artifactId>
-        <version>2025.0-2024w39</version>
+        <version>2025.0-2024w41</version>
 <!--        <version>2025.0-PR3390</version>-->
 <!--		    <version>2025.0-2024w36</version>-->
 <!--        <version>2025.0-SNAPSHOT</version>-->

diff --git a/...main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java b/...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/...va/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java b/...va/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/...in/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java b/...in/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);
   }