diff --git a/input/reg_RMSE.xlsx b/input/reg_RMSE.xlsx index 199fdb6b8..b929e9701 100644 Binary files a/input/reg_RMSE.xlsx and b/input/reg_RMSE.xlsx differ diff --git a/src/main/java/simpaths/data/ManagerRegressions.java b/src/main/java/simpaths/data/ManagerRegressions.java index 0e792a28b..d2d57d14e 100644 --- a/src/main/java/simpaths/data/ManagerRegressions.java +++ b/src/main/java/simpaths/data/ManagerRegressions.java @@ -317,9 +317,6 @@ public static double getRmse(RegressionName regression) { case WagesFemalesNE -> { code = "Wages_FemalesNE"; } - case ChildcareC1b -> { - code = "C1b"; - } default -> { throw new InvalidParameterException("RMSE requested for unrecognised regression equation"); } diff --git a/src/main/java/simpaths/model/BenefitUnit.java b/src/main/java/simpaths/model/BenefitUnit.java index 2f704f6f4..60aa23d0f 100644 --- a/src/main/java/simpaths/model/BenefitUnit.java +++ b/src/main/java/simpaths/model/BenefitUnit.java @@ -4669,9 +4669,7 @@ private void updateChildcareCostPerWeek(int year, int age) { if (statInnovations.getDoubleDraw(0) < prob) { double score = Parameters.getRegChildcareC1b().getScore(this, Regressors.class); - double rmse = Parameters.getRMSEForRegression("C1b"); - double gauss = Parameters.getStandardNormalDistribution().inverseCumulativeProbability(statInnovations.getDoubleDraw(1)); - xChildCareWeek = Math.exp(score + rmse * gauss); + xChildCareWeek = Math.exp(score); double costCap = childCareCostCapWeekly(); if (costCap > 0.0 && costCap < getChildcareCostPerWeek()) { xChildCareWeek = costCap; diff --git a/src/main/java/simpaths/model/decisions/Expectations.java b/src/main/java/simpaths/model/decisions/Expectations.java index be82fee19..e0c3429ec 100644 --- a/src/main/java/simpaths/model/decisions/Expectations.java +++ b/src/main/java/simpaths/model/decisions/Expectations.java @@ -468,8 +468,7 @@ private double evalChildcareCostWeekly() { double probFormalChildCare = Parameters.getRegChildcareC1a().getProbability(benefitUnitProxyThisPeriod, BenefitUnit.Regressors.class); double logChildcareCostScore = Parameters.getRegChildcareC1b().getScore(benefitUnitProxyThisPeriod, BenefitUnit.Regressors.class); - double logChildcareRSME = ManagerRegressions.getRmse(RegressionName.ChildcareC1b); - childcareCostWeekly = Math.exp(logChildcareCostScore + logChildcareRSME*logChildcareRSME/2.0) * probFormalChildCare; + childcareCostWeekly = Math.exp(logChildcareCostScore) * probFormalChildCare; } return childcareCostWeekly; }