Remove dependeny to vsp contrib

pom.xml

@@ -37,12 +37,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.matsim.contrib</groupId>
-			<artifactId>vsp</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
 		<!--MATSim examples. Not transitive -->
 		<dependency>
 			<groupId>org.matsim</groupId>

src/main/java/org/matsim/freight/logistics/LSPUtils.java

@@ -237,6 +237,8 @@ public LogisticChainBuilder addTracker(LSPSimulationTracker<LogisticChain> track
     }
 
     public LogisticChain build() {
+      //TODO: Prüfe of das alle Elemente Verbunden sind (in irgendeiner Art). Plus Hinweis auf die Änderung.
+
       return new LogisticChainImpl(this);
     }
   }

src/main/java/org/matsim/freight/logistics/examples/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java

@@ -103,6 +103,9 @@ public static void main(String[] args) {
         .controller()
         .setOverwriteFileSetting(
             OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists);
+    // The VSP default settings are designed for person transport simulation. After talking to Kai,
+    // they will be set to WARN here. Kai MT may'23
+    config.vspExperimental().setVspDefaultsCheckingLevel(VspExperimentalConfigGroup.VspDefaultsCheckingLevel.warn);
 
     var freightConfig = ConfigUtils.addOrGetModule(config, FreightCarriersConfigGroup.class);
     freightConfig.setTimeWindowHandling(FreightCarriersConfigGroup.TimeWindowHandling.ignore);
@@ -170,12 +173,7 @@ public void install() {
         });
 
     log.info("Run MATSim");
-    // The VSP default settings are designed for person transport simulation. After talking to Kai,
-    // they will be set to WARN here. Kai MT may'23
-    controler
-        .getConfig()
-        .vspExperimental()
-        .setVspDefaultsCheckingLevel(VspExperimentalConfigGroup.VspDefaultsCheckingLevel.warn);
+
     controler.run();
 
     // print the schedules for the assigned LSPShipments

src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java

@@ -47,7 +47,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.TransportMode;
@@ -71,6 +70,7 @@
 import org.matsim.freight.carriers.controler.CarrierStrategyManager;
 import org.matsim.freight.logistics.*;
 import org.matsim.freight.logistics.examples.ExampleConstants;
+import org.matsim.freight.logistics.resourceImplementations.CarrierSchedulerUtils;
 import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils;
 import org.matsim.freight.logistics.shipment.LspShipment;
 import org.matsim.vehicles.VehicleType;
@@ -132,17 +132,10 @@ public static void main(String[] args) {
     lsps.add(createLspWithDirectChain(scenario, "Kaufland_DIRECT", MultipleChainsUtils.createLSPShipmentsFromCarrierShipments(carrierKaufland), getDepotLinkFromVehicle(carrierKaufland), vehicleTypes));
     LSPUtils.addLSPs(scenario, new LSPs(lsps));
 
-
     Controler controler = prepareControler(scenario);
 
     log.info("Run MATSim");
 
-    // The VSP default settings are designed for person transport simulation. After talking to Kai,
-    // they will be set to WARN here. Kai MT may'23
-    controler
-            .getConfig()
-            .vspExperimental()
-            .setVspDefaultsCheckingLevel(VspExperimentalConfigGroup.VspDefaultsCheckingLevel.warn);
     controler.run();
 
     runCarrierAnalysis(controler.getControlerIO().getOutputPath(), config);
@@ -167,13 +160,17 @@ private static Config prepareConfig(String[] args) {
     config.global().setRandomSeed(4177);
     config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists);
 
+    // The VSP default settings are designed for person transport simulation. After talking to Kai,
+    // they will be set to WARN here. Kai MT may'23
+    config.vspExperimental().setVspDefaultsCheckingLevel(VspExperimentalConfigGroup.VspDefaultsCheckingLevel.warn);
+
     FreightCarriersConfigGroup freightConfig = ConfigUtils.addOrGetModule(config, FreightCarriersConfigGroup.class);
     freightConfig.setTimeWindowHandling(FreightCarriersConfigGroup.TimeWindowHandling.ignore);
 
     return config;
   }
 
-  private static @NotNull Controler prepareControler(Scenario scenario) {
+  private static Controler prepareControler(Scenario scenario) {
     log.info("Prepare controler");
     Controler controler = new Controler(scenario);
     controler.addOverridingModule(
@@ -347,6 +344,7 @@ private static LogisticChain createTwoEchelonChain(Scenario scenario, String lsp
             .getCarrierCapabilities()
             //.setNumberOfJspritIterations // TODO Das mal hier einbauen. --> Ist aktuell in CarrierUtils.
             .setFleetSize(CarrierCapabilities.FleetSize.INFINITE);
+   CarrierSchedulerUtils.setVrpLogic(distributionCarrier, LSPUtils.LogicOfVrp.serviceBased);
 
     CarriersUtils.addCarrierVehicle(
             distributionCarrier,
@@ -371,6 +369,7 @@ private static LogisticChain createTwoEchelonChain(Scenario scenario, String lsp
     mainCarrierElement.connectWithNextElement(hubElement);
     hubElement.connectWithNextElement(distributionCarrierElement);
 
+    //TODO: Hier das Verbinden einfügen und in der Reihenfolge ist es. KMT Nov'24
     hubChain =
             LSPUtils.LogisticChainBuilder.newInstance(Id.create("hubChain", LogisticChain.class))
                     .addLogisticChainElement(mainCarrierElement)
@@ -421,6 +420,7 @@ private static LogisticChain createDirectChain(Scenario scenario, String lspName
     LogisticChain directChain;
     Carrier directCarrier = CarriersUtils.createCarrier(Id.create(lspName +"_directCarrier", Carrier.class));
     directCarrier.getCarrierCapabilities().setFleetSize(CarrierCapabilities.FleetSize.INFINITE);
+    CarrierSchedulerUtils.setVrpLogic(directCarrier, LSPUtils.LogicOfVrp.serviceBased);
 
     CarriersUtils.addCarrierVehicle(directCarrier,
             CarrierVehicle.newInstance(

src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java

@@ -26,7 +26,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.matsim.analysis.personMoney.PersonMoneyEventsAnalysisModule;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
@@ -159,7 +158,7 @@ private static Config prepareConfig(String[] args) {
     return config;
   }
 
-  private static @NotNull Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
+  private static Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
     log.info("Prepare controler");
     Controler controler = new Controler(scenario);
     controler.addOverridingModule(

src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java

@@ -43,6 +43,10 @@ public class CarrierSchedulerUtils {
    * @return Carrier  with the solution of the VehicleRoutingProblem and the routed plan.
    */
   public static Carrier solveVrpWithJsprit(Carrier carrier, Scenario scenario) {
+    // Maybe it make sense to store this object instead of rebuilding it for each carrier (in each iteration) ???
+    // pro: save computation time
+    // con: interdependencies, if something changes in the network (load), the object is not up-to-date & it is not clear, if the object is thread safe
+    // Decision for the time being: rebuild it for each carrier to have a clear state KMT/KN Aug'24
     NetworkBasedTransportCosts netbasedTransportCosts;
     Network network = scenario.getNetwork();
     RoadPricingScheme roadPricingScheme = null;
@@ -127,10 +131,16 @@ public static void setVrpLogic(Carrier carrier, LSPUtils.LogicOfVrp logicOfVrp){
      * This decides later, whether the VRP is build base on {@link org.matsim.freight.carriers.CarrierService}s or {@link org.matsim.freight.carriers.CarrierShipment}s.
      *
      * @param carrier The carrier for which the setting should be got.
-     * @return the logic of the VRP
+     * @return the logic of the VRP, returns {@link LSPUtils.LogicOfVrp#serviceBased} if not set.
      */
   public static LSPUtils.LogicOfVrp getVrpLogic(Carrier carrier){
-    return (LSPUtils.LogicOfVrp) carrier.getAttributes().getAttribute(LOGIC_OF_VRP);
+    LSPUtils.LogicOfVrp result = (LSPUtils.LogicOfVrp) carrier.getAttributes().getAttribute(LOGIC_OF_VRP);
+    if (result == null){
+      log.error("VRPLogic not found for carrier {}. Will return {}", carrier.getId(), LSPUtils.LogicOfVrp.serviceBased);
+      return LSPUtils.LogicOfVrp.serviceBased;
+    } else {
+      return result ;
+    }
   }
 
 }