remove duplicate code

matsim-scenarios · Jan 31, 2024 · bd69497 · bd69497
1 parent a8ba1e0
commit bd69497
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 83 deletions.
diff --git a/src/main/java/org/matsim/legacy/prepare/population/AssignIncome.java b/src/main/java/org/matsim/legacy/prepare/population/AssignIncome.java
diff --git a/src/main/java/org/matsim/legacy/run/RunBerlinScenario.java b/src/main/java/org/matsim/legacy/run/RunBerlinScenario.java
@@ -59,12 +59,11 @@
 import org.matsim.core.utils.geometry.transformations.TransformationFactory;
 import org.matsim.extensions.pt.PtExtensionsConfigGroup;
 import org.matsim.extensions.pt.routing.EnhancedRaptorIntermodalAccessEgress;
-import org.matsim.legacy.prepare.population.AssignIncome;
 import org.matsim.legacy.run.drt.OpenBerlinIntermodalPtDrtRouterAnalysisModeIdentifier;
 import org.matsim.legacy.run.drt.RunDrtOpenBerlinScenario;
+import org.matsim.prepare.population.AssignIncome;
 import playground.vsp.scoring.IncomeDependentUtilityOfMoneyPersonScoringParameters;
 
-import java.io.IOException;
 import java.util.*;
 
 import static org.matsim.core.config.groups.ControlerConfigGroup.RoutingAlgorithmType.FastAStarLandmarks;
@@ -194,7 +193,7 @@ public static Scenario prepareScenario( Config config ) {
 			downsample(scenario.getPopulation().getPersons(), berlinCfg.getPopulationDownsampleFactor());
 		}
 
-		AssignIncome.assignIncomeToPersonSubpopulationAccordingToGermanyAverage(scenario.getPopulation());
+		AssignIncome.assignIncomeToPersons(scenario.getPopulation());
 		return scenario;
 	}
 

diff --git a/...matsim/prepare/population/CalcIncome.java → ...tsim/prepare/population/AssignIncome.java b/...matsim/prepare/population/CalcIncome.java → ...tsim/prepare/population/AssignIncome.java
@@ -1,6 +1,7 @@
 package org.matsim.prepare.population;
 
 import org.matsim.api.core.v01.population.Person;
+import org.matsim.api.core.v01.population.Population;
 import org.matsim.core.population.PersonUtils;
 import org.matsim.core.population.PopulationUtils;
 import org.matsim.core.population.algorithms.PersonAlgorithm;
@@ -10,10 +11,18 @@
 /**
  * Draw income from german wide distribution.
  */
-public class CalcIncome implements PersonAlgorithm {
+public class AssignIncome implements PersonAlgorithm {
 
 	private final SplittableRandom rnd = new SplittableRandom(1234);
 
+	/**
+	 * Assign income on whole population.
+	 */
+	public static void assignIncomeToPersons(Population population) {
+		AssignIncome assignIncome = new AssignIncome();
+		population.getPersons().values().forEach(assignIncome::run);
+	}
+
 	@Override
 	public void run(Person person) {
 

diff --git a/src/main/java/org/matsim/run/RunOpenBerlinScenario.java b/src/main/java/org/matsim/run/RunOpenBerlinScenario.java
@@ -14,7 +14,7 @@
 import org.matsim.core.replanning.strategies.DefaultPlanStrategiesModule;
 import org.matsim.core.scoring.functions.ScoringParametersForPerson;
 import org.matsim.prepare.RunOpenBerlinCalibration;
-import org.matsim.prepare.population.CalcIncome;
+import org.matsim.prepare.population.AssignIncome;
 import org.matsim.simwrapper.SimWrapperConfigGroup;
 import org.matsim.simwrapper.SimWrapperModule;
 import picocli.CommandLine;
@@ -99,7 +99,7 @@ protected Config prepareConfig(Config config) {
 	@Override
 	protected void prepareScenario(Scenario scenario) {
 
-		CalcIncome income = new CalcIncome();
+		AssignIncome income = new AssignIncome();
 
 		// Calculate the income for each person, in next versions this might also be done during creation of the population
 		scenario.getPopulation().getPersons().values().forEach(income::run);