Skip to content

Fix Person getters: update old getter calls #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justin-ven merged 1 commit into from
May 13, 2026
Merged

Fix Person getters: update old getter calls #471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/main/java/simpaths/model/Person.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5708,7 +5708,7 @@ else throw new IllegalArgumentException(
// demPartnerStatus interaction terms
// -----------------------------------------------------------------------
case demPartnerStatusPartnered_Formal, demPartnerStatusPartnered_Mixed -> {
return (Dcpst.Partnered.equals(getDcpst())) ? 1.0 : 0.0;
return (Dcpst.Partnered.equals(getDemPartnerStatus())) ? 1.0 : 0.0;
}

// -----------------------------------------------------------------------
Expand Down Expand Up @@ -5830,32 +5830,32 @@ else throw new IllegalArgumentException(
// income quintile new naming
// -----------------------------------------------------------------------
case yHhQuintilesMonthC5Q2, yHhQuintilesMonthC5Q2_Formal, yHhQuintilesMonthC5Q2_Mixed -> {
return (Ydses_c5.Q2.equals(getYdses_c5_current())) ? 1.0 : 0.0;
return (Ydses_c5.Q2.equals(getYHhQuintilesMonthC5Current())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q2L1, yHhQuintilesMonthC5Q2L1_Fair, yHhQuintilesMonthC5Q2L1_Good,
yHhQuintilesMonthC5Q2L1_Poor, yHhQuintilesMonthC5Q2L1_VeryGood -> {
return (Ydses_c5.Q2.equals(getYdses_c5_lag1())) ? 1.0 : 0.0;
return (Ydses_c5.Q2.equals(getYHhQuintilesMonthC5L1())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q3, yHhQuintilesMonthC5Q3_Formal, yHhQuintilesMonthC5Q3_Mixed -> {
return (Ydses_c5.Q3.equals(getYdses_c5_current())) ? 1.0 : 0.0;
return (Ydses_c5.Q3.equals(getYHhQuintilesMonthC5Current())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q3L1, yHhQuintilesMonthC5Q3L1_Fair, yHhQuintilesMonthC5Q3L1_Good,
yHhQuintilesMonthC5Q3L1_Poor, yHhQuintilesMonthC5Q3L1_VeryGood -> {
return (Ydses_c5.Q3.equals(getYdses_c5_lag1())) ? 1.0 : 0.0;
return (Ydses_c5.Q3.equals(getYHhQuintilesMonthC5L1())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q4, yHhQuintilesMonthC5Q4_Formal, yHhQuintilesMonthC5Q4_Mixed -> {
return (Ydses_c5.Q4.equals(getYdses_c5_current())) ? 1.0 : 0.0;
return (Ydses_c5.Q4.equals(getYHhQuintilesMonthC5Current())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q4L1, yHhQuintilesMonthC5Q4L1_Fair, yHhQuintilesMonthC5Q4L1_Good,
yHhQuintilesMonthC5Q4L1_Poor, yHhQuintilesMonthC5Q4L1_VeryGood -> {
return (Ydses_c5.Q4.equals(getYdses_c5_lag1())) ? 1.0 : 0.0;
return (Ydses_c5.Q4.equals(getYHhQuintilesMonthC5L1())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q5, yHhQuintilesMonthC5Q5_Formal, yHhQuintilesMonthC5Q5_Mixed -> {
return (Ydses_c5.Q5.equals(getYdses_c5_current())) ? 1.0 : 0.0;
return (Ydses_c5.Q5.equals(getYHhQuintilesMonthC5Current())) ? 1.0 : 0.0;
}
case yHhQuintilesMonthC5Q5L1, yHhQuintilesMonthC5Q5L1_Fair, yHhQuintilesMonthC5Q5L1_Good,
yHhQuintilesMonthC5Q5L1_Poor, yHhQuintilesMonthC5Q5L1_VeryGood -> {
return (Ydses_c5.Q5.equals(getYdses_c5_lag1())) ? 1.0 : 0.0;
return (Ydses_c5.Q5.equals(getYHhQuintilesMonthC5L1())) ? 1.0 : 0.0;
}

// -----------------------------------------------------------------------
Expand All @@ -5877,7 +5877,7 @@ else throw new IllegalArgumentException(
return Indicator.True.equals(healthDsblLongtermFlagL1) ? 1. : 0.;
}
case dnc_L1 -> {
return (double) getNumberChildrenAll_lag1();
return (double) getNumberChildrenAllL1();
}
case drgn1_L1 -> {
return (double) getRegion().getValue();
Expand Down Expand Up @@ -5941,10 +5941,10 @@ else throw new IllegalArgumentException(
// Pre-existing enum values used in estimation files (missing cases)
// -----------------------------------------------------------------------
case careHrsFormalIhsL1 -> {
return Parameters.asinh(getHoursFormalSocialCare_L1());
return Parameters.asinh(getCareHrsFormalWeekL1());
}
case careHrsInformalIhsL1 -> {
return Parameters.asinh(getHoursInformalSocialCare_L1());
return Parameters.asinh(getCareHrsInformalWeekL1());
}
case careHrsProvidedWeekIhsL1 -> {
double hrs = (careHrsProvidedWeekL1 != null && careHrsProvidedWeekL1 > 0.0) ? careHrsProvidedWeekL1 : 0.0;
Expand All @@ -5968,7 +5968,7 @@ else throw new IllegalArgumentException(
return (SocialCareReceipt.Formal.equals(careReceivedFlag) || SocialCareReceipt.Informal.equals(careReceivedFlag) || SocialCareReceipt.Mixed.equals(careReceivedFlag)) ? 1. : 0.;
}
case careReceivedFlagL1 -> {
return (getTotalHoursSocialCare_L1() > 0.01) ? 1. : 0.;
return (getCareHrsTotalWeekL1() > 0.01) ? 1. : 0.;
}
case careReceivedPartnerFlag -> {
Person partner = getPartner();
Expand Down Expand Up @@ -6041,22 +6041,22 @@ else throw new IllegalArgumentException(
return (double) getNumberChildrenAll();
}
case demNChild0to2L1 -> {
return (double) getNumberChildren02_lag1();
return (double) getNumberChildren02L1();
}
case demNChildL1 -> {
return (double) getNumberChildrenAll_lag1();
return (double) getNumberChildrenAllL1();
}
case demPartnerNYearL1 -> {
return (demPartnerNYearL1 != null) ? (double) demPartnerNYearL1 : 0.0;
}
case demPartnerStatusPartnered -> {
return (Dcpst.Partnered.equals(getDcpst())) ? 1.0 : 0.0;
return (Dcpst.Partnered.equals(getDemPartnerStatus())) ? 1.0 : 0.0;
}
case demPartnerStatusPartneredL1 -> {
return (demPartnerStatusL1 != null && demPartnerStatusL1.equals(Dcpst.Partnered)) ? 1. : 0.;
}
case demPartnerStatusSingle -> {
return (Dcpst.Single.equals(getDcpst())) ? 1.0 : 0.0;
return (Dcpst.Single.equals(getDemPartnerStatus())) ? 1.0 : 0.0;
}
case demPartnerStatusSingleL1 -> {
return (demPartnerStatusL1 != null && demPartnerStatusL1.equals(Dcpst.Single)) ? 1. : 0.;
Expand Down Expand Up @@ -6185,16 +6185,16 @@ else throw new IllegalArgumentException(
return Indicator.True.equals(eduSpellFlag) ? getDoubleValue(DoublesVariables.Ydses_c5_Q5_L1) : 0.0;
}
case eduSampleFlag_Single -> {
return (Indicator.True.equals(eduSpellFlag) && Dcpst.Single.equals(getDcpst())) ? 1.0 : 0.0;
return (Indicator.True.equals(eduSpellFlag) && Dcpst.Single.equals(getDemPartnerStatus())) ? 1.0 : 0.0;
}
case eduSampleFlag_demMaleFlag -> {
return Indicator.True.equals(eduSpellFlag) ? getDoubleValue(DoublesVariables.demMaleFlag) : 0.0;
}
case eduSampleFlag_demNChild0to2L1 -> {
return Indicator.True.equals(eduSpellFlag) ? (double) getNumberChildren02_lag1() : 0.0;
return Indicator.True.equals(eduSpellFlag) ? (double) getNumberChildren02L1() : 0.0;
}
case eduSampleFlag_demNChildL1 -> {
return Indicator.True.equals(eduSpellFlag) ? (double) getNumberChildrenAll_lag1() : 0.0;
return Indicator.True.equals(eduSpellFlag) ? (double) getNumberChildrenAllL1() : 0.0;
}
case eduSampleFlag_yCapitalPersL1 -> {
return Indicator.True.equals(eduSpellFlag) ? getDoubleValue(DoublesVariables.Ypncp_L1) : 0.0;
Expand Down Expand Up @@ -6223,7 +6223,7 @@ else throw new IllegalArgumentException(
}
case healthPartnerSelfRatedExcellent -> {
Person partner = getPartner();
return (partner != null && Dhe.Excellent.equals(partner.getDhe())) ? 1. : 0.;
return (partner != null && Dhe.Excellent.equals(partner.getHealthSelfRated())) ? 1. : 0.;
}
case healthPartnerSelfRatedFair -> {
return getDoubleValue(DoublesVariables.Dhesp_Fair);
Expand Down
Loading