From 1033ab32c0ab5fbdbdefcbe47948cf785ce087e4 Mon Sep 17 00:00:00 2001 From: rakow Date: Mon, 1 Apr 2024 17:30:51 +0200 Subject: [PATCH] remove and deprecate old income attribute --- .../java/org/matsim/prepare/population/AssignIncome.java | 2 ++ src/main/java/org/matsim/run/OpenBerlinScenario.java | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/matsim/prepare/population/AssignIncome.java b/src/main/java/org/matsim/prepare/population/AssignIncome.java index 4838f255d..500f36087 100644 --- a/src/main/java/org/matsim/prepare/population/AssignIncome.java +++ b/src/main/java/org/matsim/prepare/population/AssignIncome.java @@ -10,7 +10,9 @@ /** * Draw income from german wide distribution. + * @deprecated income is already assigned during generation */ +@Deprecated public class AssignIncome implements PersonAlgorithm { private final SplittableRandom rnd = new SplittableRandom(1234); diff --git a/src/main/java/org/matsim/run/OpenBerlinScenario.java b/src/main/java/org/matsim/run/OpenBerlinScenario.java index 4142df54c..2ee625508 100644 --- a/src/main/java/org/matsim/run/OpenBerlinScenario.java +++ b/src/main/java/org/matsim/run/OpenBerlinScenario.java @@ -102,12 +102,6 @@ protected Config prepareConfig(Config config) { @Override protected void prepareScenario(Scenario scenario) { - - 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); - } @Override