bump to PR3496

pom.xml

@@ -12,7 +12,7 @@
 		<!--<version>14.0-PR1452</version>-->
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
-		<version>2025.0-PR3486</version>
+		<version>2025.0-PR3496</version>
 	</parent>
 
 
@@ -144,7 +144,7 @@
 				<configuration>
 					<forkMode>once</forkMode>
 					<!-- avoid out of memory errors: -->
-					<argLine>@{argLine} -Xmx6500m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true</argLine>
+					<argLine>@{argLine} -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true</argLine>
 					<!--necessary in tu berlin gitlab. BUT not good in other places, so solve by command line switch only where needed.  kai, nov'18-->
 					<!--<useSystemClassLoader>false</useSystemClassLoader>-->
 				</configuration>

src/main/java/org/matsim/run/scenarios/LausitzSingleModeScenario.java

@@ -1,11 +1,11 @@
 package org.matsim.run.scenarios;
 
-import com.google.common.collect.Lists;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.TransportMode;
 import org.matsim.api.core.v01.population.*;
+import org.matsim.application.prepare.population.CleanPopulation;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.groups.ReplanningConfigGroup;
 import org.matsim.core.controler.Controler;
@@ -65,26 +65,21 @@ public void prepareScenario(Scenario scenario) {
 		//		apply all scenario changes from base scenario class
 		baseScenario.prepareScenario(scenario);
 
-//		TODO: replace code segment that selects, cleans routes and converts trips 2 legs with call of CleanPopulation PR3496
 		TripsToLegsAlgorithm trips2Legs = new TripsToLegsAlgorithm(new RoutingModeMainModeIdentifier());
 
 		for (Person person : scenario.getPopulation().getPersons().values()) {
 			if (!person.getAttributes().getAttribute("subpopulation").equals("person")) {
 				continue;
 			}
 
-			Plan selected = person.getSelectedPlan();
-			for (Plan plan : Lists.newArrayList(person.getPlans())) {
-				if (plan != selected)
-					person.removePlan(plan);
-			}
+			CleanPopulation.removeUnselectedPlans(person);
 
 			for (Plan plan : person.getPlans()) {
 				trips2Legs.run(plan);
 
 				for (PlanElement el : plan.getPlanElements()) {
 					if (el instanceof Leg leg) {
-						leg.setRoute(null);
+						CleanPopulation.removeRouteFromLeg(el);
 						leg.setMode(mode);
 					}
 				}