remove network from MainRunCarrierResource and its Builder

matsim-vsp · Aug 13, 2024 · 2db8f74 · 2db8f74
1 parent ce44ec7
commit 2db8f74
Show file tree

Hide file tree

Showing 37 changed files with 54 additions and 52 deletions.
diff --git a/...org/matsim/freight/logistics/examples/initialPlans/ExampleSchedulingOfTransportChain.java b/...org/matsim/freight/logistics/examples/initialPlans/ExampleSchedulingOfTransportChain.java
@@ -152,7 +152,7 @@ private static LSP createInitialLSP(Scenario scenario) {
         ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
             .setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
             .setToLinkId(Id.createLinkId("(14 2) (14 3)"))
-            .setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+            .setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
             .build();
 
     // The LogisticsSolutionElement for the main run Resource is created

diff --git a/...reight/logistics/examples/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java b/...reight/logistics/examples/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java
@@ -267,7 +267,7 @@ private static LSP createInitialLSP(Scenario scenario, SolutionType solutionType
               .setFromLinkId(depotLinkId)
               .setToLinkId(hubLinkId)
               .setMainRunCarrierScheduler(
-                  ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                  ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
               .build();
 
       mainRunElement =

diff --git a/src/main/java/org/matsim/freight/logistics/examples/initialPlans/ExampleTwoEchelonGrid.java b/src/main/java/org/matsim/freight/logistics/examples/initialPlans/ExampleTwoEchelonGrid.java
@@ -289,7 +289,7 @@ private static LSP createLSP(Scenario scenario) {
           ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainCarrier, network)
               .setFromLinkId(DEPOT_LINK_ID)
               .setMainRunCarrierScheduler(
-                  ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                  ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
               .setToLinkId(HUB_LINK_ID)
               .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
               .build();

diff --git a/...ain/java/org/matsim/freight/logistics/examples/initialPlans/ExampleTwoEchelonGrid_NR.java b/...ain/java/org/matsim/freight/logistics/examples/initialPlans/ExampleTwoEchelonGrid_NR.java
@@ -299,7 +299,7 @@ private static LSP createLSP(Scenario scenario) {
           ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainCarrier, network)
               .setFromLinkId(DEPOT_LINK_ID)
               .setMainRunCarrierScheduler(
-                  ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                  ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
               .setToLinkId(HUB_LINK_ID)
               .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
               .build();

diff --git a/...a/org/matsim/freight/logistics/examples/mobsimExamples/ExampleMobsimOfTransportChain.java b/...a/org/matsim/freight/logistics/examples/mobsimExamples/ExampleMobsimOfTransportChain.java
@@ -153,7 +153,7 @@ private static LSP createInitialLSP(Scenario scenario) {
         ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
             .setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
             .setToLinkId(Id.createLinkId("(14 2) (14 3)"))
-            .setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+            .setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
             .build();
 
     // The LogisticsSolutionElement for the main run Resource is created

diff --git a/...atsim/freight/logistics/examples/multipleChains/ExampleGroceryDeliveryMultipleChains.java b/...atsim/freight/logistics/examples/multipleChains/ExampleGroceryDeliveryMultipleChains.java
@@ -231,7 +231,7 @@ private static LSP createLSP(Scenario scenario) {
                     mainCarrier, scenario.getNetwork())
                 .setFromLinkId(depotLinkFromVehicles)
                 .setMainRunCarrierScheduler(
-                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                 .setToLinkId(HUB_LINK_ID)
                 .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                 .build();

diff --git a/...g/matsim/freight/logistics/examples/multipleChains/ExampleMultipleMixedEchelonChains.java b/...g/matsim/freight/logistics/examples/multipleChains/ExampleMultipleMixedEchelonChains.java
@@ -202,7 +202,7 @@ private static LSP createLSP(Scenario scenario) {
                     mainCarrier1, network)
                 .setFromLinkId(DEPOT_LINK_ID)
                 .setMainRunCarrierScheduler(
-                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                 .setToLinkId(HUB_LINK_ID)
                 .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                 .build();
@@ -319,7 +319,7 @@ private static LSP createLSP(Scenario scenario) {
                     mainCarrier, network)
                 .setFromLinkId(DEPOT_LINK_ID)
                 .setMainRunCarrierScheduler(
-                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                 .setToLinkId(HUB_LINK_ID)
                 .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                 .build();

diff --git a/.../freight/logistics/examples/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java b/.../freight/logistics/examples/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java
@@ -206,7 +206,7 @@ private static LSP createLSP(Scenario scenario) {
             ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainCarrierLeft, network)
                 .setFromLinkId(DEPOT_LINK_ID)
                 .setMainRunCarrierScheduler(
-                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                 .setToLinkId(HUB_LEFT_LINK_ID)
                 .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                 .build();
@@ -284,7 +284,7 @@ private static LSP createLSP(Scenario scenario) {
             ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainCarrier, network)
                 .setFromLinkId(DEPOT_LINK_ID)
                 .setMainRunCarrierScheduler(
-                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                    ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                 .setToLinkId(HUB_RIGHT_LINK_ID)
                 .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                 .build();

diff --git a/...reight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java b/...reight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java
@@ -289,7 +289,7 @@ private static LogisticChain createTwoEchelonChain(Scenario scenario, String lsp
                             mainCarrier, scenario.getNetwork())
                     .setFromLinkId(depotLinkFromVehicles)
                     .setMainRunCarrierScheduler(
-                            ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                            ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                     .setToLinkId(hubLinkId)
                     .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                     .build();

diff --git a/...ogistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java b/...ogistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java
@@ -315,7 +315,7 @@ private static LogisticChain createTwoEchelonChain(Scenario scenario, String lsp
                             mainCarrier, scenario.getNetwork())
                     .setFromLinkId(depotLinkFromVehicles)
                     .setMainRunCarrierScheduler(
-                            ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                            ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
                     .setToLinkId(hubLinkId)
                     .setVehicleReturn(ResourceImplementationUtils.VehicleReturn.returnToFromLink)
                     .build();

diff --git a/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlParserV1.java b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlParserV1.java
@@ -322,7 +322,7 @@ public void endTag(String name, String content, Stack<String> context) {
           case mainRunCarrier -> lspResource =
               ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(currentCarrier, null)
                   .setMainRunCarrierScheduler(
-                      ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+                      ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(null))
                   .build();
           case distributionCarrier -> lspResource =
               ResourceImplementationUtils.DistributionCarrierResourceBuilder.newInstance(

diff --git a/...ain/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierResource.java b/...ain/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierResource.java
@@ -26,7 +26,6 @@
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
-import org.matsim.api.core.v01.network.Network;
 import org.matsim.freight.carriers.Carrier;
 import org.matsim.freight.logistics.*;
 import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.MainRunCarrierResourceBuilder;
@@ -43,7 +42,6 @@
   private final MainRunCarrierScheduler mainRunScheduler;
 
   private final ResourceImplementationUtils.VehicleReturn vehicleReturn;
-  private final Network network;
 
   MainRunCarrierResource(MainRunCarrierResourceBuilder builder) {
     super(builder.getId());
@@ -58,7 +56,6 @@
       log.warn("Return behaviour was not specified. Using the following setting as default: {}", ResourceImplementationUtils.VehicleReturn.endAtToLink);
       this.vehicleReturn = ResourceImplementationUtils.VehicleReturn.endAtToLink;
     }
-    this.network = builder.getNetwork();
   }
 
   @Override
@@ -85,10 +82,6 @@ public Carrier getCarrier() {
     return carrier;
   }
 
-  public Network getNetwork() {
-    return network;
-  }
-
   public ResourceImplementationUtils.VehicleReturn getVehicleReturn() {
     return vehicleReturn;
   }

diff --git a/...in/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java b/...in/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java
@@ -23,6 +23,7 @@
 
 import java.util.*;
 import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.core.population.routes.NetworkRoute;
 import org.matsim.freight.carriers.*;
@@ -48,14 +49,16 @@
  * shipments into the vehicle * has passed.
  */
 /*package-private*/ class MainRunCarrierScheduler extends LSPResourceScheduler {
-
+  
   private Carrier carrier;
   private MainRunCarrierResource resource;
   private ArrayList<LSPShipmentCarrierServicePair> pairs;
+  private final Scenario scenario;
   private int tourIdIndex = 1; // Have unique TourIds for the MainRun.
 
-  /*package-private*/ MainRunCarrierScheduler() {
+  /*package-private*/ MainRunCarrierScheduler(Scenario scenario) {
     this.pairs = new ArrayList<>();
+    this.scenario = scenario;
   }
 
   @Override
@@ -117,7 +120,7 @@ private CarrierPlan createPlan(Carrier carrier, List<LspShipmentWithTime> tuples
     // statt!
     NetworkBasedTransportCosts.Builder tpcostsBuilder =
         NetworkBasedTransportCosts.Builder.newInstance(
-            resource.getNetwork(),
+            scenario.getNetwork(),
             ResourceImplementationUtils.getVehicleTypeCollection(resource.getCarrier()));
     NetworkBasedTransportCosts netbasedTransportcosts = tpcostsBuilder.build();
     Collection<ScheduledTour> tours = new ArrayList<>();
@@ -193,14 +196,14 @@ private double scorePlanManually(CarrierPlan plan) {
           // distance
           NetworkRoute route = (NetworkRoute) leg.getRoute();
           for (Id<Link> linkId : route.getLinkIds()) {
-            distance = distance + resource.getNetwork().getLinks().get(linkId).getLength();
+            distance = distance + scenario.getNetwork().getLinks().get(linkId).getLength();
           }
           if (route.getEndLinkId()
               != route
                   .getStartLinkId()) { // Do not calculate any distance, if start and endpoint are
                                        // identical
             distance =
-                distance + resource.getNetwork().getLinks().get(route.getEndLinkId()).getLength();
+                distance + scenario.getNetwork().getLinks().get(route.getEndLinkId()).getLength();
           }
 
           // travel time (exp.)

diff --git a/...ava/org/matsim/freight/logistics/resourceImplementations/ResourceImplementationUtils.java b/...ava/org/matsim/freight/logistics/resourceImplementations/ResourceImplementationUtils.java
@@ -214,7 +214,7 @@ public static void setCarrierType(Carrier carrier, CARRIER_TYPE carrierType) {
   }
 
   /**
-   * Utils method to create a  DistributionCarrierScheduler
+   * Utils method to create a DistributionCarrierScheduler
    *  TODO: In the future, the scheduler should get the scenario via injection. This here is only a dirty workaround. KMT'Aug'24
    *
    * @param scenario the scenario
@@ -224,7 +224,7 @@ public static DistributionCarrierScheduler createDefaultDistributionCarrierSched
   }
 
   /**
-   * Utils method to create a  Collection CarrierScheduler
+   * Utils method to create a CollectionCarrierScheduler
    * TODO: In the future, the scheduler should get the scenario via injection. This here is only a dirty workaround. KMT'Aug'24
    *
    * @param scenario the scenario
@@ -233,8 +233,14 @@ public static CollectionCarrierScheduler createDefaultCollectionCarrierScheduler
     return new CollectionCarrierScheduler(scenario);
   }
 
-  public static MainRunCarrierScheduler createDefaultMainRunCarrierScheduler() {
-    return new MainRunCarrierScheduler();
+  /**
+   * Utils method to create a MainRunCarrierScheduler
+   * TODO: In the future, the scheduler should get the scenario via injection. This here is only a dirty workaround. KMT'Aug'24
+   *
+   * @param scenario the scenario
+   */
+  public static MainRunCarrierScheduler createDefaultMainRunCarrierScheduler(Scenario scenario) {
+    return new MainRunCarrierScheduler(scenario);
   }
 
   public enum VehicleReturn {

diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java
@@ -83,7 +83,7 @@ public void initialize() {
 		carrier.setCarrierCapabilities(capabilities);
 
 		mainRunResource = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(carrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)")).setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();
 

diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java
@@ -79,7 +79,7 @@ public void initialize() {
 		mainRunCarrierResourceBuilder.setCarrierCapabilities(capabilities);
 
 		mainRunResource = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrierResourceBuilder, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java
@@ -135,7 +135,7 @@ public void initialize() {
 		mainRunCarrier.setCarrierCapabilities(mainRunCapabilities);
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java
@@ -128,7 +128,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java
@@ -144,7 +144,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/...t/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java b/...t/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java
@@ -150,7 +150,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java
@@ -148,7 +148,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java
@@ -98,7 +98,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/.../org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java b/.../org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java
@@ -155,7 +155,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/...freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java b/...freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java
@@ -156,7 +156,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/...a/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java b/...a/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java
@@ -155,7 +155,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/...a/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java b/...a/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java
@@ -158,7 +158,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/.../freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java b/.../freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java
@@ -155,7 +155,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();

diff --git a/...va/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java b/...va/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java
@@ -149,7 +149,7 @@ public void initialize() {
 
 
 		LSPResource mainRunResource  = ResourceImplementationUtils.MainRunCarrierResourceBuilder.newInstance(mainRunCarrier, network)
-				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler())
+				.setMainRunCarrierScheduler(ResourceImplementationUtils.createDefaultMainRunCarrierScheduler(scenario))
 				.setFromLinkId(Id.createLinkId("(4 2) (4 3)"))
 				.setToLinkId(Id.createLinkId("(14 2) (14 3)"))
 				.build();