refactor CleanPopulation

matsim-org · Sep 26, 2024 · dc2dce2 · dc2dce2
1 parent 13dfc89
commit dc2dce2
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/.../application/src/main/java/org/matsim/application/prepare/population/CleanPopulation.java b/.../application/src/main/java/org/matsim/application/prepare/population/CleanPopulation.java
@@ -70,11 +70,7 @@ public Integer call() throws Exception {
 		for (Person person : population.getPersons().values()) {
 
 			if (rmUnselected) {
-				Plan selected = person.getSelectedPlan();
-				for (Plan plan : Lists.newArrayList(person.getPlans())) {
-					if (plan != selected)
-						person.removePlan(plan);
-				}
+				removeUnselectedPlans(person);
 			}
 
 			for (Plan plan : person.getPlans()) {
@@ -83,16 +79,11 @@ public Integer call() throws Exception {
 
 				for (PlanElement el : plan.getPlanElements()) {
 					if (rmRoutes) {
-						if (el instanceof Leg) {
-							((Leg) el).setRoute(null);
-						}
+						removeRouteFromLeg(el);
 					}
 
 					if (rmActivityLocations) {
-						if (el instanceof Activity) {
-							((Activity) el).setLinkId(null);
-							((Activity) el).setFacilityId(null);
-						}
+						removeActivityLocation(el);
 					}
 				}
 			}
@@ -102,4 +93,25 @@ public Integer call() throws Exception {
 
 		return 0;
 	}
-}
+
+	public static void removeActivityLocation(PlanElement el) {
+		if (el instanceof Activity act) {
+			act.setLinkId(null);
+			act.setFacilityId(null);
+		}
+	}
+
+	public static void removeRouteFromLeg(PlanElement el) {
+		if (el instanceof Leg leg) {
+			leg.setRoute(null);
+		}
+	}
+
+	public static void removeUnselectedPlans(Person person) {
+		Plan selected = person.getSelectedPlan();
+		for (Plan plan : Lists.newArrayList(person.getPlans())) {
+			if (plan != selected)
+				person.removePlan(plan);
+		}
+	}
+}