From ada7d365dba8a31606839bec790af846b41a69e3 Mon Sep 17 00:00:00 2001 From: Liang Shi Date: Wed, 10 Jun 2026 10:57:37 +0100 Subject: [PATCH 1/2] Revert "fixed bug: yBenAmountMonth" This reverts commit 75309eb556bac76db8f9fa2a5bcc6818ad2c137f. --- src/main/java/simpaths/model/BenefitUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/simpaths/model/BenefitUnit.java b/src/main/java/simpaths/model/BenefitUnit.java index ff4447d84..112a0e150 100644 --- a/src/main/java/simpaths/model/BenefitUnit.java +++ b/src/main/java/simpaths/model/BenefitUnit.java @@ -1481,7 +1481,7 @@ public void updateFixedCostsAndLabour() { // populate final incomes from cache (NO taxWrapper) LabourEval chosenEval = cachedEvalByLabourPairs.get(labourSupplyChoice); yDispMonth = chosenEval.disposableIncomeMonthly; - yBenAmountMonth = chosenEval.benefitsReceivedPerMonth; + yPensYear = chosenEval.benefitsReceivedPerMonth; yGrossMonth = chosenEval.grossIncomeMonthly; demDbMatchTax = chosenEval.taxDbMatch; idtaxDbDonor = demDbMatchTax.getCandidateID(); From 0eb252c15b5827d09c6e698adfbb4e846dbd3cb8 Mon Sep 17 00:00:00 2001 From: Liang Shi Date: Wed, 10 Jun 2026 11:03:50 +0100 Subject: [PATCH 2/2] Update BenefitUnit.java yBenAmountMonth is monthly benefit receipt at the benefit-unit level. It comes from the tax-benefit evaluation: TaxEvaluation.getBenefitsReceivedPerMonth(). Hence the correct assignment is: yBenAmountMonth = chosenEval.benefitsReceivedPerMonth; The old assignment was mismatched: yPensYear = chosenEval.benefitsReceivedPerMonth; It put a monthly benefit-transfer value into the annual pension-income variable. --- src/main/java/simpaths/model/BenefitUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/simpaths/model/BenefitUnit.java b/src/main/java/simpaths/model/BenefitUnit.java index 112a0e150..ff4447d84 100644 --- a/src/main/java/simpaths/model/BenefitUnit.java +++ b/src/main/java/simpaths/model/BenefitUnit.java @@ -1481,7 +1481,7 @@ public void updateFixedCostsAndLabour() { // populate final incomes from cache (NO taxWrapper) LabourEval chosenEval = cachedEvalByLabourPairs.get(labourSupplyChoice); yDispMonth = chosenEval.disposableIncomeMonthly; - yPensYear = chosenEval.benefitsReceivedPerMonth; + yBenAmountMonth = chosenEval.benefitsReceivedPerMonth; yGrossMonth = chosenEval.grossIncomeMonthly; demDbMatchTax = chosenEval.taxDbMatch; idtaxDbDonor = demDbMatchTax.getCandidateID();