simplify

matsim-org · Jun 21, 2024 · ef954c1 · ef954c1
1 parent 4646328
commit ef954c1
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/...ibs/application/src/main/java/org/matsim/freightDemandGeneration/DemandReaderFromCSV.java b/...ibs/application/src/main/java/org/matsim/freightDemandGeneration/DemandReaderFromCSV.java
@@ -902,8 +902,8 @@ else if (population == null)
 				HashMap<Id<Link>, Link> demandBasesLinks;
 				double sumOfDemandBasedLinks;
 				boolean pickupIsDemandBase = true;
-				Link linkPickup;
-				Link linkDelivery;
+				Link linkPickup = null;
+				Link linkDelivery= null;
 				double sumOfPossibleLinkLengthPickup = possibleLinksPickup.values().stream().mapToDouble(Link::getLength).sum();
 				double sumOfPossibleLinkLengthDelivery = possibleLinksDelivery.values().stream().mapToDouble(Link::getLength).sum();
 				if (numberOfPickupLocations == null && numberOfDeliveryLocations == null)
@@ -928,11 +928,7 @@ else if (numberOfPickupLocations != null) {
 						demandBasedLink);
 					if (pickupIsDemandBase) {
 						linkPickup = demandBasedLink;
-						linkDelivery = findNextUsedLink(scenario, indexShape, possibleLinksDelivery,
-								numberOfDeliveryLocations, areasForDeliveryLocations, setLocationsOfDelivery,
-								usedDeliveryLocations, possiblePersonsDelivery, nearestLinkPerPersonDelivery,
-								crsTransformationNetworkAndShape, countOfLinks - 1);
-						while (usedDeliveryLocations.contains(linkDelivery.getId().toString())) {
+						while (linkDelivery == null || usedDeliveryLocations.contains(linkDelivery.getId().toString())) {
 							linkDelivery = findNextUsedLink(scenario, indexShape, possibleLinksDelivery,
 									numberOfDeliveryLocations, areasForDeliveryLocations, setLocationsOfDelivery,
 									usedDeliveryLocations, possiblePersonsDelivery, nearestLinkPerPersonDelivery,
@@ -944,11 +940,7 @@ else if (numberOfPickupLocations != null) {
 						}
 					} else {
 						linkDelivery = demandBasedLink;
-						linkPickup = findNextUsedLink(scenario, indexShape, possibleLinksPickup,
-								numberOfPickupLocations, areasForPickupLocations, setLocationsOfPickup,
-								usedPickupLocations, possiblePersonsPickup, nearestLinkPerPersonPickup,
-								crsTransformationNetworkAndShape, countOfLinks - 1);
-						while (usedPickupLocations.contains(linkPickup.getId().toString())) {
+						while (linkPickup == null || usedPickupLocations.contains(linkPickup.getId().toString())) {
 							linkPickup = findNextUsedLink(scenario, indexShape, possibleLinksPickup,
 									numberOfPickupLocations, areasForPickupLocations, setLocationsOfPickup,
 									usedPickupLocations, possiblePersonsPickup, nearestLinkPerPersonPickup,