reduce complexity

matsim-scenarios · Oct 12, 2023 · e4bce09 · e4bce09
1 parent a90328e
commit e4bce09
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/main/java/org/matsim/analysis/postAnalysis/BlockedInfrastructureRouteAnalysis.java b/src/main/java/org/matsim/analysis/postAnalysis/BlockedInfrastructureRouteAnalysis.java
@@ -144,19 +144,11 @@ private Map<Id<Person>, Map<Integer, TripStructureUtils.Trip>> getTripsFromPlans
 			for ( Person person : population.getPersons().values()) {
 				//check if blocked link is part of leg-route
 
+
+
 				List<TripStructureUtils.Trip> trips = TripStructureUtils.getTrips(person.getSelectedPlan());
 
-				for (int i = 0; i < trips.size(); i++) {
-					for (Leg leg : trips.get(i).getLegsOnly()) {
-						for ( String linkId : blockedLinks ) {
-							if (leg.getRoute().getRouteDescription().contains(linkId)) {
-								relevantTrips.putIfAbsent(person.getId(), new HashMap<>());
-								relevantTrips.get(person.getId()).put(i, trips.get(i));
-								continue;
-							}
-						}
-					}
-				}
+				getTripsFromPersons(blockedLinks, person, trips, relevantTrips);
 			}
 
 		} else {
@@ -178,6 +170,20 @@ private Map<Id<Person>, Map<Integer, TripStructureUtils.Trip>> getTripsFromPlans
 		return relevantTrips;
 	}
 
+	private static void getTripsFromPersons(List<String> blockedLinks, Person person, List<TripStructureUtils.Trip> trips, Map<Id<Person>, Map<Integer, TripStructureUtils.Trip>> relevantTrips) {
+		for (int i = 0; i < trips.size(); i++) {
+			for (Leg leg : trips.get(i).getLegsOnly()) {
+				for ( String linkId : blockedLinks) {
+					if (leg.getRoute().getRouteDescription().contains(linkId)) {
+						relevantTrips.putIfAbsent(person.getId(), new HashMap<>());
+						relevantTrips.get(person.getId()).put(i, trips.get(i));
+						continue;
+					}
+				}
+			}
+		}
+	}
+
 	static boolean isInsideArea(Link link, Geometry geometry) {
 
 		boolean isInsideArea = false;