Merge pull request #46 from pbronka/develop

Develop
centreformicrosimulation · Dec 18, 2023 · 256313e · 256313e
2 parents c1ed3c4 + e5a3801
commit 256313e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 1 deletion.
diff --git a/input/reg_employmentSelection.xlsx b/input/reg_employmentSelection.xlsx
diff --git a/input/reg_home_ownership.xlsx b/input/reg_home_ownership.xlsx
diff --git a/input/reg_income.xlsx b/input/reg_income.xlsx
diff --git a/input/reg_wages.xlsx b/input/reg_wages.xlsx
diff --git a/src/main/java/simpaths/model/Person.java b/src/main/java/simpaths/model/Person.java
@@ -1350,7 +1350,6 @@ else if(dag <= 45 && (!les_c4.equals(Les_c4.Student) || leftEducation)) { //left
                 setDer(Indicator.True);
                 setDed(Indicator.True);
                 labourSupplyWeekly = Labour.ZERO; //Assume no part-time work while studying
-                //TODO: Note that individuals re-entering education do not have a new level of education set. (They don't "leave school")
             }
             else if (les_c4.equals(Les_c4.Student)){ //If activity status is student but regression to be in education was evaluated to false, remove student status
                 setLes_c4(Les_c4.NotEmployed);