Merge pull request #94 from matsim-vsp/dependabot/maven/org.matsim-ma…

…tsim-all-2025.0-2024w50 Bump org.matsim:matsim-all from 2025.0-2024w49 to 2025.0-2024w50
matsim-vsp · Dec 9, 2024 · 70bc54a · 70bc54a
2 parents 3ac33e3 + 49469d0
commit 70bc54a
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 60 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>matsim-all</artifactId>
-		<version>2025.0-2024w49</version>
+		<version>2025.0-2024w50</version>
 		<!--		    <version>2025.0-PR3245</version>-->
 		<!--        <version>2025.0-SNAPSHOT</version>-->
 		<relativePath/>

diff --git a/src/main/java/org/matsim/vsp/DistanceConstraint/RunDistanceConstraint.java b/src/main/java/org/matsim/vsp/DistanceConstraint/RunDistanceConstraint.java
@@ -44,10 +44,10 @@
 import com.graphhopper.jsprit.core.util.VehicleRoutingTransportCostsMatrix;
 
 import org.matsim.freight.carriers.*;
-import org.matsim.freight.carriers.controler.CarrierControlerUtils;
-import org.matsim.freight.carriers.controler.CarrierModule;
-import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controller.CarrierControllerUtils;
+import org.matsim.freight.carriers.controller.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controller.CarrierStrategyManager;
 import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
@@ -405,7 +405,7 @@ public ScoringFunction createScoringFunction(Carrier carrier) {
 	 * @return
 	 */
 	private static CarrierStrategyManager createMyStrategyManager() {
-		return CarrierControlerUtils.createDefaultCarrierStrategyManager();
+		return CarrierControllerUtils.createDefaultCarrierStrategyManager();
 	}
 
 	/**

diff --git a/src/main/java/org/matsim/vsp/freight/CarrierScoringFunctionFactoryImpl_KT.java b/src/main/java/org/matsim/vsp/freight/CarrierScoringFunctionFactoryImpl_KT.java
@@ -19,8 +19,8 @@
 import org.matsim.freight.carriers.*;
 import org.matsim.freight.carriers.Tour.ServiceActivity;
 import org.matsim.freight.carriers.Tour.TourElement;
-import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.freight.carriers.controler.FreightActivity;
+import org.matsim.freight.carriers.controller.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controller.FreightActivity;
 import org.matsim.freight.carriers.jsprit.VehicleTypeDependentRoadPricingCalculator;
 import org.matsim.vehicles.Vehicle;
 

diff --git a/src/main/java/org/matsim/vsp/freight/RunFreight.java b/src/main/java/org/matsim/vsp/freight/RunFreight.java
@@ -51,10 +51,10 @@
 import org.matsim.freight.carriers.ScheduledTour;
 import org.matsim.freight.carriers.Tour.ServiceActivity;
 import org.matsim.freight.carriers.Tour.TourElement;
-import org.matsim.freight.carriers.controler.CarrierControlerUtils;
-import org.matsim.freight.carriers.controler.CarrierModule;
-import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controller.CarrierControllerUtils;
+import org.matsim.freight.carriers.controller.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controller.CarrierStrategyManager;
 import org.matsim.freight.carriers.CarriersUtils;
 import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
@@ -416,7 +416,7 @@ public void install(){
 	//Benötigt, da listener kein "Null" als StrategyFactory mehr erlaubt, KT 17.04.2015
 	//Da keine Strategy notwendig, hier zunächst eine "leere" Factory
 	private static CarrierStrategyManager createMyStrategymanager() {
-		return CarrierControlerUtils.createDefaultCarrierStrategyManager();
+		return CarrierControllerUtils.createDefaultCarrierStrategyManager();
 	}
 
 

diff --git a/src/main/java/org/matsim/vsp/freight/RunFreightOnlyMatsim.java b/src/main/java/org/matsim/vsp/freight/RunFreightOnlyMatsim.java
@@ -25,10 +25,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.freight.carriers.FreightCarriersConfigGroup;
 import org.matsim.freight.carriers.*;
-import org.matsim.freight.carriers.controler.CarrierControlerUtils;
-import org.matsim.freight.carriers.controler.CarrierModule;
-import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controller.CarrierControllerUtils;
+import org.matsim.freight.carriers.controller.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controller.CarrierStrategyManager;
 import org.matsim.freight.carriers.CarriersUtils;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
@@ -249,7 +249,7 @@ public void install(){
 	//Benötigt, da listener kein "Null" als StrategyFactory mehr erlaubt, KT 17.04.2015
 	//Da keine Strategy notwendig, hier zunächst eine "leere" Factory
 	private static CarrierStrategyManager createMyStrategymanager() {
-		return CarrierControlerUtils.createDefaultCarrierStrategyManager();
+		return CarrierControllerUtils.createDefaultCarrierStrategyManager();
 	}
 
 

diff --git a/src/main/java/org/matsim/vsp/freight/food/RunFood.java b/src/main/java/org/matsim/vsp/freight/food/RunFood.java
@@ -39,8 +39,8 @@
 import org.matsim.freight.carriers.CarrierPlan;
 import org.matsim.freight.carriers.CarriersUtils;
 import org.matsim.freight.carriers.Carriers;
-import org.matsim.freight.carriers.controler.CarrierModule;
-import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controller.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierScoringFunctionFactory;
 import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.freight.carriers.jsprit.NetworkRouter;

diff --git a/src/main/java/org/matsim/vsp/freight/food/UpdateRunOutputs.java b/src/main/java/org/matsim/vsp/freight/food/UpdateRunOutputs.java
@@ -20,7 +20,7 @@
 import org.matsim.freight.carriers.ScheduledTour;
 import org.matsim.freight.carriers.Tour;
 import org.matsim.freight.carriers.analysis.RunFreightAnalysisEventBased;
-import org.matsim.freight.carriers.controler.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierModule;
 
 /**
  * Diese Klasse soll den Output von "alten" runs derart updaten,

diff --git a/src/main/java/org/matsim/vsp/freight/food/prepare/AddAdditionalBEVTrucksToCarriers.java b/src/main/java/org/matsim/vsp/freight/food/prepare/AddAdditionalBEVTrucksToCarriers.java
@@ -71,7 +71,7 @@ public static void main(String[] args) {
 				VehicleUtils.copyFromTo(vehicleType_new, vehicleType);
 
 				CarrierVehicle additionalCarrierVehicle =
-						CarrierVehicle.Builder.newInstance(vehicleId2, carrierVehicle.getLocation(), vehicleType_new)
+						CarrierVehicle.Builder.newInstance(vehicleId2, carrierVehicle.getLinkId(), vehicleType_new)
 								.setEarliestStart(carrierVehicle.getEarliestStartTime())
 								.setLatestEnd(carrierVehicle.getLatestEndTime())
 								.build();

diff --git a/src/main/java/org/matsim/vsp/freight/food/prepare/ConvertCarriersToOpenBerlin.java b/src/main/java/org/matsim/vsp/freight/food/prepare/ConvertCarriersToOpenBerlin.java
@@ -57,7 +57,7 @@ private  void run(){
 
 		someChecks(oldCarriers, newCarriers);
 
-		new CarrierPlanXmlWriterV2(newCarriers).write(outputNewCarriers);
+		new CarrierPlanWriter(newCarriers).write(outputNewCarriers);
 
 		log.info("#### Done ####");
 	}
@@ -81,7 +81,7 @@ private void convertCarrierCapabilities(Network oldNetwork, Network newNetworkFi
 		newCarrier.getCarrierCapabilities().setFleetSize(cc.getFleetSize());
 		for (CarrierVehicle carrierVehicle: cc.getCarrierVehicles().values()) {
 			Id<Link> newLinkId;
-			newLinkId = getNewLinkId(oldNetwork, newNetworkFiltered, carrierVehicle.getLocation());
+			newLinkId = getNewLinkId(oldNetwork, newNetworkFiltered, carrierVehicle.getLinkId());
 			//Adapt VehicleId to new Location
 			String oldVehicleString = carrierVehicle.getId().toString();
 			Id<Vehicle> newVehicleId = Id.createVehicleId(oldVehicleString.substring(0,oldVehicleString.lastIndexOf("_")+1)+newLinkId.toString());

diff --git a/src/main/java/org/matsim/vsp/wasteCollection/AbfallChessboardUtils.java b/src/main/java/org/matsim/vsp/wasteCollection/AbfallChessboardUtils.java
@@ -6,16 +6,10 @@
 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.freight.carriers.Carrier;
-import org.matsim.freight.carriers.CarrierCapabilities;
-import org.matsim.freight.carriers.CarrierVehicle;
-import org.matsim.freight.carriers.CarrierVehicleTypeLoader;
-import org.matsim.freight.carriers.CarrierVehicleTypes;
-import org.matsim.freight.carriers.Carriers;
+import org.matsim.freight.carriers.*;
 import org.matsim.vehicles.Vehicle;
 import org.matsim.vehicles.VehicleType;
 import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
-import org.matsim.freight.carriers.CarrierImpl;
 
 public class AbfallChessboardUtils {
 
@@ -84,7 +78,7 @@ static void createShipmentsForChessboardII(HashMap<String, Carrier> carrierMap,
 	 * 
 	 * @param
 	 */
-	static void createCarriersForChessboard(Carriers carriers, FleetSize fleetSize, CarrierVehicleTypes carrierVehicleTypes) {
+	static void createCarriersForChessboard(FleetSize fleetSize, CarrierVehicleTypes carrierVehicleTypes) {
 		String vehicleName = "TruckChessboard";
 		double earliestStartingTime = 6 * 3600;
 		double latestFinishingTime = 14 * 3600;
@@ -94,27 +88,10 @@ static void createCarriersForChessboard(Carriers carriers, FleetSize fleetSize,
 			.newInstance(Id.create(vehicleName, Vehicle.class), Id.createLinkId(linkChessboardDepot), vehicleType)
 			.setEarliestStart(earliestStartingTime).setLatestEnd(latestFinishingTime).build();
 
-//		AbfallUtils.createGarbageTruck(vehicleName, linkChessboardDepot, earliestStartingTime, latestFinishingTime);
 
-		// define Carriers
+        carrierChessboard.setCarrierCapabilities(CarrierCapabilities.Builder.newInstance().
+                addVehicle(newCarrierVehicle).setFleetSize(fleetSize).build());
 
-		defineCarriersChessboard(carriers, newCarrierVehicle, fleetSize, carrierVehicleTypes);
 	}
 
-	/**
-	 * Defines and sets the Capabilities of the Carrier, including the vehicleTypes
-	 * for the carriers for the Chessboard network
-	 * 
-	 * @param
-	 * 
-	 */
-	private static void defineCarriersChessboard(Carriers carriers, CarrierVehicle vehicleDepot, FleetSize fleetSize, CarrierVehicleTypes carrierVehicleTypes) {
-		CarrierCapabilities carrierCapabilities = CarrierCapabilities.Builder.newInstance()
-				.addType(carrierVehicleTypes.getVehicleTypes().values().iterator().next()).addVehicle(vehicleDepot).setFleetSize(fleetSize).build();
-
-		carrierChessboard.setCarrierCapabilities(carrierCapabilities);
-
-		// Fahrzeugtypen den Anbietern zuordenen
-		new CarrierVehicleTypeLoader(carriers).loadVehicleTypes(carrierVehicleTypes);
-	}
 }
diff --git a/src/main/java/org/matsim/vsp/wasteCollection/AbfallUtils.java b/src/main/java/org/matsim/vsp/wasteCollection/AbfallUtils.java
@@ -32,7 +32,7 @@
 import org.matsim.freight.carriers.Tour.Leg;
 import org.matsim.freight.carriers.Tour.Pickup;
 import org.matsim.freight.carriers.Tour.TourElement;
-import org.matsim.freight.carriers.controler.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierModule;
 import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
@@ -611,7 +611,7 @@ static void solveWithJsprit(Scenario scenario, Carriers carriers, HashMap<String
 						scenario.getConfig().controller().getOutputDirectory() + "/jsprit_CarrierPlans_Test01.png",
 						"bestSolution");
 		}
-		new CarrierPlanXmlWriterV2(carriers)
+		new CarrierPlanWriter(carriers)
 				.write(scenario.getConfig().controller().getOutputDirectory() + "/jsprit_CarrierPlans.xml");
 
 	}

diff --git a/src/main/java/org/matsim/vsp/wasteCollection/Run_Abfall.java b/src/main/java/org/matsim/vsp/wasteCollection/Run_Abfall.java
@@ -167,15 +167,15 @@ public static void main(String[] args) throws Exception {
 				AbfallChessboardUtils.createShipmentsForChessboardI(carrierMap, kgGarbageToCollect, allLinks,
 						volumeDustbinInLiters, secondsServiceTimePerDustbin, scenario, carriers);
 				FleetSize fleetSize = FleetSize.INFINITE;
-				AbfallChessboardUtils.createCarriersForChessboard(carriers, fleetSize, carrierVehicleTypes);
+				AbfallChessboardUtils.createCarriersForChessboard(fleetSize, carrierVehicleTypes);
 			}
 			case chessboardGarbagePerMeterToCollect -> {
 				double kgGarbagePerMeterToCollect = 0.2;
 				CarrierVehicleTypes carrierVehicleTypes2 = CarriersUtils.getCarrierVehicleTypes(scenario);
 				AbfallChessboardUtils.createShipmentsForChessboardII(carrierMap, kgGarbagePerMeterToCollect, allLinks,
 						volumeDustbinInLiters, secondsServiceTimePerDustbin, scenario, carriers);
 				FleetSize fleetSize2 = FleetSize.INFINITE;
-				AbfallChessboardUtils.createCarriersForChessboard(carriers, fleetSize2, carrierVehicleTypes2);
+				AbfallChessboardUtils.createCarriersForChessboard(fleetSize2, carrierVehicleTypes2);
 			}
 			case berlinSelectedDistricts -> {
 				// day input: MO or DI or MI or DO or FR

diff --git a/src/test/java/org/matsim/vsp/DistanceConstraint/TestRunDistanceConstraint.java b/src/test/java/org/matsim/vsp/DistanceConstraint/TestRunDistanceConstraint.java
@@ -19,10 +19,10 @@
 import org.matsim.api.core.v01.network.Network;
 import org.matsim.freight.carriers.*;
 import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
-import org.matsim.freight.carriers.controler.CarrierModule;
-import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.controller.CarrierModule;
+import org.matsim.freight.carriers.controller.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controller.CarrierStrategyManager;
+import org.matsim.freight.carriers.controller.CarrierControllerUtils;
 import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
 import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts.Builder;
@@ -601,6 +601,6 @@ private static CarrierScoringFunctionFactory createMyScoringFunction2() {
 	 * @return
 	 */
 		private static CarrierStrategyManager createMyStrategyManager() {
-			return CarrierControlerUtils.createDefaultCarrierStrategyManager();
+			return CarrierControllerUtils.createDefaultCarrierStrategyManager();
 		}
 }