formatting

matsim-org · Sep 23, 2024 · 41dfb99 · 41dfb99
1 parent 5555782
commit 41dfb99
Showing 1 changed file with 14 additions and 25 deletions.
diff --git a/...tsim/smallScaleCommercialTrafficGeneration/GenerateSmallScaleCommercialTrafficDemand.java b/...tsim/smallScaleCommercialTrafficGeneration/GenerateSmallScaleCommercialTrafficDemand.java
@@ -844,14 +844,8 @@ public void createCarriers(Scenario scenario,
 	/**
 	 * Creates the services for one carrier.
 	 */
-	private void createServices(Scenario scenario,
-								ArrayList<String> noPossibleLinks,
-								String selectedStopCategory,
-								String carrierName,
-								int numberOfJobs,
-								String[] serviceArea,
-								Integer serviceTimePerStop,
-								TimeWindow serviceTimeWindow,
+	private void createServices(Scenario scenario, ArrayList<String> noPossibleLinks, String selectedStopCategory, String carrierName,
+								int numberOfJobs, String[] serviceArea, Integer serviceTimePerStop, TimeWindow serviceTimeWindow,
 								Map<String, Map<Id<Link>, Link>> linksPerZone) {
 
 		String stopZone = serviceArea[0];
@@ -871,17 +865,10 @@ private void createServices(Scenario scenario,
 	/**
 	 * Creates the carrier and the related vehicles.
 	 */
-	private void createNewCarrierAndAddVehicleTypes(Scenario scenario,
-													Integer purpose,
-													String startZone,
-													String selectedStartCategory,
-													String carrierName,
-													List<String> vehicleTypes,
-													int numberOfDepots,
-													CarrierCapabilities.FleetSize fleetSize,
-													int fixedNumberOfVehiclePerTypeAndLocation,
-													List<String> vehicleDepots,
-													Map<String, Map<Id<Link>, Link>> linksPerZone,
+	private void createNewCarrierAndAddVehicleTypes(Scenario scenario, Integer purpose, String startZone, String selectedStartCategory,
+													String carrierName, List<String> vehicleTypes, int numberOfDepots,
+													CarrierCapabilities.FleetSize fleetSize, int fixedNumberOfVehiclePerTypeAndLocation,
+													List<String> vehicleDepots, Map<String, Map<Id<Link>, Link>> linksPerZone,
 													String smallScaleCommercialTrafficType,
 													EnumeratedDistribution<GenerateSmallScaleCommercialTrafficDemand.TourStartAndDuration> tourStartTimeSelector) {
 
@@ -962,14 +949,16 @@ private int getVehicleStartTime(TourStartAndDuration t) {
 	 * @param modeORvehType 					the mode or vehicle type
 	 * @return 									the service duration
 	 */
-	private Integer getServiceTimePerStop(Map<GenerateSmallScaleCommercialTrafficDemand.StopDurationGoodTrafficKey, EnumeratedDistribution<GenerateSmallScaleCommercialTrafficDemand.DurationsBounds>> serviceDurationTimeSelector,
-										  String employeeCategory,
-										  String modeORvehType,
-										  String smallScaleCommercialTrafficType) {
+	private Integer getServiceTimePerStop(
+		Map<GenerateSmallScaleCommercialTrafficDemand.StopDurationGoodTrafficKey, EnumeratedDistribution<GenerateSmallScaleCommercialTrafficDemand.DurationsBounds>> serviceDurationTimeSelector,
+		String employeeCategory, String modeORvehType, String smallScaleCommercialTrafficType, double maxVehicleAvailability) {
+
 		GenerateSmallScaleCommercialTrafficDemand.StopDurationGoodTrafficKey key = null;
-		if (smallScaleCommercialTrafficType.equals(GenerateSmallScaleCommercialTrafficDemand.SmallScaleCommercialTrafficType.commercialPersonTraffic.toString()))
+		if (smallScaleCommercialTrafficType.equals(
+			GenerateSmallScaleCommercialTrafficDemand.SmallScaleCommercialTrafficType.commercialPersonTraffic.toString()))
 			key = GenerateSmallScaleCommercialTrafficDemand.makeStopDurationGoodTrafficKey(employeeCategory, null);
-		else if (smallScaleCommercialTrafficType.equals(GenerateSmallScaleCommercialTrafficDemand.SmallScaleCommercialTrafficType.goodsTraffic.toString())) {
+		else if (smallScaleCommercialTrafficType.equals(
+			GenerateSmallScaleCommercialTrafficDemand.SmallScaleCommercialTrafficType.goodsTraffic.toString())) {
 			key = GenerateSmallScaleCommercialTrafficDemand.makeStopDurationGoodTrafficKey(employeeCategory, modeORvehType);
 		}
 		GenerateSmallScaleCommercialTrafficDemand.DurationsBounds serviceDurationBounds = serviceDurationTimeSelector.get(key).sample();