From f6fc55b573bc7355d88325425002dda4354bccd5 Mon Sep 17 00:00:00 2001 From: Mariia Var Date: Fri, 28 Aug 2026 12:35:18 +0100 Subject: [PATCH] Rename AlignmentStatistics variables to align* convention Apply the Alignment module naming convention to all 30 variables in AlignmentStatistics: fields, accessors and @Column names now carry the align prefix (e.g. shareCohabitingSim -> alignPartnerSimShare). CSV columns are sorted alphabetically by field name, so the headers in AlignmentStatistics.csv are both renamed and reordered; the expected integration-test file is updated to match, with values unchanged. --- .../data/statistics/AlignmentStatistics.java | 302 +++++++++--------- .../expected/AlignmentStatistics.csv | 4 +- 2 files changed, 153 insertions(+), 153 deletions(-) diff --git a/src/main/java/simpaths/data/statistics/AlignmentStatistics.java b/src/main/java/simpaths/data/statistics/AlignmentStatistics.java index f443cc51b..fdeff4166 100644 --- a/src/main/java/simpaths/data/statistics/AlignmentStatistics.java +++ b/src/main/java/simpaths/data/statistics/AlignmentStatistics.java @@ -28,205 +28,205 @@ public class AlignmentStatistics { // ------------------------------------------------------------------ // Partnership // ------------------------------------------------------------------ - @Column(name = "partnership_adj_factor") - private double partnershipAdjFactor; + @Column(name = "align_partner_adj") + private double alignPartnerAdj; - @Column(name = "share_cohabiting_sim") - private double shareCohabitingSim; + @Column(name = "align_partner_sim_share") + private double alignPartnerSimShare; - @Column(name = "share_cohabiting_tgt") - private double shareCohabitingTgt; + @Column(name = "align_partner_tgt_share") + private double alignPartnerTgtShare; // ------------------------------------------------------------------ // Fertility // ------------------------------------------------------------------ - @Column(name = "fertility_adj_factor") - private double fertilityAdjFactor; + @Column(name = "align_fert_adj") + private double alignFertAdj; - @Column(name = "fertility_rate_sim") - private double fertilityRateSim; + @Column(name = "align_fert_rate_sim") + private double alignFertRateSim; - @Column(name = "fertility_rate_tgt") - private double fertilityRateTgt; + @Column(name = "align_fert_rate_tgt") + private double alignFertRateTgt; // ------------------------------------------------------------------ // In-school // ------------------------------------------------------------------ - @Column(name = "in_school_adj_factor") - private double inSchoolAdjFactor; + @Column(name = "align_in_school_adj") + private double alignInSchoolAdj; - @Column(name = "in_school_share_sim") - private double inSchoolShareSim; + @Column(name = "align_in_school_sim_share") + private double alignInSchoolSimShare; - @Column(name = "in_school_share_tgt") - private double inSchoolShareTgt; + @Column(name = "align_in_school_tgt_share") + private double alignInSchoolTgtShare; // ------------------------------------------------------------------ // Utility adjustment factors (one per occupancy type) // ------------------------------------------------------------------ - @Column(name = "utility_adj_single_males") - private double utilityAdjSingleMales; + @Column(name = "align_util_adj_single_m") + private double alignUtilAdjSingleM; - @Column(name = "utility_adj_ac_males") - private double utilityAdjACMales; + @Column(name = "align_util_adj_ac_m") + private double alignUtilAdjACM; - @Column(name = "utility_adj_single_females") - private double utilityAdjSingleFemales; + @Column(name = "align_util_adj_single_f") + private double alignUtilAdjSingleF; - @Column(name = "utility_adj_ac_females") - private double utilityAdjACFemales; + @Column(name = "align_util_adj_ac_f") + private double alignUtilAdjACF; - @Column(name = "utility_adj_couples") - private double utilityAdjCouples; + @Column(name = "align_util_adj_couple") + private double alignUtilAdjCouple; - @Column(name = "utility_adj_single_dep_males") - private double utilityAdjSingleDepMales; + @Column(name = "align_util_adj_m_with_dep") + private double alignUtilAdjMWithDep; - @Column(name = "utility_adj_single_dep_females") - private double utilityAdjSingleDepFemales; + @Column(name = "align_util_adj_f_with_dep") + private double alignUtilAdjFWithDep; // ------------------------------------------------------------------ // Employment shares — simulated // ------------------------------------------------------------------ - @Column(name = "emp_share_sim_single_males") - private double empShareSimSingleMales; + @Column(name = "align_emp_sim_single_m_share") + private double alignEmpSimSingleMShare; - @Column(name = "emp_share_sim_single_females") - private double empShareSimSingleFemales; + @Column(name = "align_emp_sim_single_f_share") + private double alignEmpSimSingleFShare; - @Column(name = "emp_share_sim_ac_males") - private double empShareSimACMales; + @Column(name = "align_emp_sim_ac_m_share") + private double alignEmpSimACMShare; - @Column(name = "emp_share_sim_ac_females") - private double empShareSimACFemales; + @Column(name = "align_emp_sim_ac_f_share") + private double alignEmpSimACFShare; - @Column(name = "emp_share_sim_couples") - private double empShareSimCouples; + @Column(name = "align_emp_sim_couples_share") + private double alignEmpSimCouplesShare; - @Column(name = "emp_share_sim_single_dep_males") - private double empShareSimSingleDepMales; + @Column(name = "align_emp_sim_m_with_dep_share") + private double alignEmpSimMWithDepShare; - @Column(name = "emp_share_sim_single_dep_females") - private double empShareSimSingleDepFemales; + @Column(name = "align_emp_sim_f_with_dep_share") + private double alignEmpSimFWithDepShare; // ------------------------------------------------------------------ // Employment shares — target // ------------------------------------------------------------------ - @Column(name = "emp_share_tgt_single_males") - private double empShareTgtSingleMales; + @Column(name = "align_emp_tgt_single_m_share") + private double alignEmpTgtSingleMShare; - @Column(name = "emp_share_tgt_single_females") - private double empShareTgtSingleFemales; + @Column(name = "align_emp_tgt_single_f_share") + private double alignEmpTgtSingleFShare; - @Column(name = "emp_share_tgt_ac_males") - private double empShareTgtACMales; + @Column(name = "align_emp_tgt_ac_m_share") + private double alignEmpTgtACMShare; - @Column(name = "emp_share_tgt_ac_females") - private double empShareTgtACFemales; + @Column(name = "align_emp_tgt_ac_f_share") + private double alignEmpTgtACFShare; - @Column(name = "emp_share_tgt_couples") - private double empShareTgtCouples; + @Column(name = "align_emp_tgt_couples_share") + private double alignEmpTgtCouplesShare; - @Column(name = "emp_share_tgt_single_dep_males") - private double empShareTgtSingleDepMales; + @Column(name = "align_emp_tgt_m_with_dep_share") + private double alignEmpTgtMWithDepShare; - @Column(name = "emp_share_tgt_single_dep_females") - private double empShareTgtSingleDepFemales; + @Column(name = "align_emp_tgt_f_with_dep_share") + private double alignEmpTgtFWithDepShare; // ------------------------------------------------------------------ // Getters and setters // ------------------------------------------------------------------ - public double getPartnershipAdjFactor() { return partnershipAdjFactor; } - public void setPartnershipAdjFactor(double v) { partnershipAdjFactor = v; } + public double getAlignPartnerAdj() { return alignPartnerAdj; } + public void setAlignPartnerAdj(double v) { alignPartnerAdj = v; } - public double getShareCohabitingSim() { return shareCohabitingSim; } - public void setShareCohabitingSim(double v) { shareCohabitingSim = v; } + public double getAlignPartnerSimShare() { return alignPartnerSimShare; } + public void setAlignPartnerSimShare(double v) { alignPartnerSimShare = v; } - public double getShareCohabitingTgt() { return shareCohabitingTgt; } - public void setShareCohabitingTgt(double v) { shareCohabitingTgt = v; } + public double getAlignPartnerTgtShare() { return alignPartnerTgtShare; } + public void setAlignPartnerTgtShare(double v) { alignPartnerTgtShare = v; } - public double getFertilityAdjFactor() { return fertilityAdjFactor; } - public void setFertilityAdjFactor(double v) { fertilityAdjFactor = v; } + public double getAlignFertAdj() { return alignFertAdj; } + public void setAlignFertAdj(double v) { alignFertAdj = v; } - public double getFertilityRateSim() { return fertilityRateSim; } - public void setFertilityRateSim(double v) { fertilityRateSim = v; } + public double getAlignFertRateSim() { return alignFertRateSim; } + public void setAlignFertRateSim(double v) { alignFertRateSim = v; } - public double getFertilityRateTgt() { return fertilityRateTgt; } - public void setFertilityRateTgt(double v) { fertilityRateTgt = v; } + public double getAlignFertRateTgt() { return alignFertRateTgt; } + public void setAlignFertRateTgt(double v) { alignFertRateTgt = v; } - public double getInSchoolAdjFactor() { return inSchoolAdjFactor; } - public void setInSchoolAdjFactor(double v) { inSchoolAdjFactor = v; } + public double getAlignInSchoolAdj() { return alignInSchoolAdj; } + public void setAlignInSchoolAdj(double v) { alignInSchoolAdj = v; } - public double getInSchoolShareSim() { return inSchoolShareSim; } - public void setInSchoolShareSim(double v) { inSchoolShareSim = v; } + public double getAlignInSchoolSimShare() { return alignInSchoolSimShare; } + public void setAlignInSchoolSimShare(double v) { alignInSchoolSimShare = v; } - public double getInSchoolShareTgt() { return inSchoolShareTgt; } - public void setInSchoolShareTgt(double v) { inSchoolShareTgt = v; } + public double getAlignInSchoolTgtShare() { return alignInSchoolTgtShare; } + public void setAlignInSchoolTgtShare(double v) { alignInSchoolTgtShare = v; } - public double getUtilityAdjSingleMales() { return utilityAdjSingleMales; } - public void setUtilityAdjSingleMales(double v) { utilityAdjSingleMales = v; } + public double getAlignUtilAdjSingleM() { return alignUtilAdjSingleM; } + public void setAlignUtilAdjSingleM(double v) { alignUtilAdjSingleM = v; } - public double getUtilityAdjACMales() { return utilityAdjACMales; } - public void setUtilityAdjACMales(double v) { utilityAdjACMales = v; } + public double getAlignUtilAdjACM() { return alignUtilAdjACM; } + public void setAlignUtilAdjACM(double v) { alignUtilAdjACM = v; } - public double getUtilityAdjSingleFemales() { return utilityAdjSingleFemales; } - public void setUtilityAdjSingleFemales(double v) { utilityAdjSingleFemales = v; } + public double getAlignUtilAdjSingleF() { return alignUtilAdjSingleF; } + public void setAlignUtilAdjSingleF(double v) { alignUtilAdjSingleF = v; } - public double getUtilityAdjACFemales() { return utilityAdjACFemales; } - public void setUtilityAdjACFemales(double v) { utilityAdjACFemales = v; } + public double getAlignUtilAdjACF() { return alignUtilAdjACF; } + public void setAlignUtilAdjACF(double v) { alignUtilAdjACF = v; } - public double getUtilityAdjCouples() { return utilityAdjCouples; } - public void setUtilityAdjCouples(double v) { utilityAdjCouples = v; } + public double getAlignUtilAdjCouple() { return alignUtilAdjCouple; } + public void setAlignUtilAdjCouple(double v) { alignUtilAdjCouple = v; } - public double getUtilityAdjSingleDepMales() { return utilityAdjSingleDepMales; } - public void setUtilityAdjSingleDepMales(double v) { utilityAdjSingleDepMales = v; } + public double getAlignUtilAdjMWithDep() { return alignUtilAdjMWithDep; } + public void setAlignUtilAdjMWithDep(double v) { alignUtilAdjMWithDep = v; } - public double getUtilityAdjSingleDepFemales() { return utilityAdjSingleDepFemales; } - public void setUtilityAdjSingleDepFemales(double v) { utilityAdjSingleDepFemales = v; } + public double getAlignUtilAdjFWithDep() { return alignUtilAdjFWithDep; } + public void setAlignUtilAdjFWithDep(double v) { alignUtilAdjFWithDep = v; } - public double getEmpShareSimSingleMales() { return empShareSimSingleMales; } - public void setEmpShareSimSingleMales(double v) { empShareSimSingleMales = v; } + public double getAlignEmpSimSingleMShare() { return alignEmpSimSingleMShare; } + public void setAlignEmpSimSingleMShare(double v) { alignEmpSimSingleMShare = v; } - public double getEmpShareSimSingleFemales() { return empShareSimSingleFemales; } - public void setEmpShareSimSingleFemales(double v) { empShareSimSingleFemales = v; } + public double getAlignEmpSimSingleFShare() { return alignEmpSimSingleFShare; } + public void setAlignEmpSimSingleFShare(double v) { alignEmpSimSingleFShare = v; } - public double getEmpShareSimACMales() { return empShareSimACMales; } - public void setEmpShareSimACMales(double v) { empShareSimACMales = v; } + public double getAlignEmpSimACMShare() { return alignEmpSimACMShare; } + public void setAlignEmpSimACMShare(double v) { alignEmpSimACMShare = v; } - public double getEmpShareSimACFemales() { return empShareSimACFemales; } - public void setEmpShareSimACFemales(double v) { empShareSimACFemales = v; } + public double getAlignEmpSimACFShare() { return alignEmpSimACFShare; } + public void setAlignEmpSimACFShare(double v) { alignEmpSimACFShare = v; } - public double getEmpShareSimCouples() { return empShareSimCouples; } - public void setEmpShareSimCouples(double v) { empShareSimCouples = v; } + public double getAlignEmpSimCouplesShare() { return alignEmpSimCouplesShare; } + public void setAlignEmpSimCouplesShare(double v) { alignEmpSimCouplesShare = v; } - public double getEmpShareSimSingleDepMales() { return empShareSimSingleDepMales; } - public void setEmpShareSimSingleDepMales(double v) { empShareSimSingleDepMales = v; } + public double getAlignEmpSimMWithDepShare() { return alignEmpSimMWithDepShare; } + public void setAlignEmpSimMWithDepShare(double v) { alignEmpSimMWithDepShare = v; } - public double getEmpShareSimSingleDepFemales() { return empShareSimSingleDepFemales; } - public void setEmpShareSimSingleDepFemales(double v) { empShareSimSingleDepFemales = v; } + public double getAlignEmpSimFWithDepShare() { return alignEmpSimFWithDepShare; } + public void setAlignEmpSimFWithDepShare(double v) { alignEmpSimFWithDepShare = v; } - public double getEmpShareTgtSingleMales() { return empShareTgtSingleMales; } - public void setEmpShareTgtSingleMales(double v) { empShareTgtSingleMales = v; } + public double getAlignEmpTgtSingleMShare() { return alignEmpTgtSingleMShare; } + public void setAlignEmpTgtSingleMShare(double v) { alignEmpTgtSingleMShare = v; } - public double getEmpShareTgtSingleFemales() { return empShareTgtSingleFemales; } - public void setEmpShareTgtSingleFemales(double v) { empShareTgtSingleFemales = v; } + public double getAlignEmpTgtSingleFShare() { return alignEmpTgtSingleFShare; } + public void setAlignEmpTgtSingleFShare(double v) { alignEmpTgtSingleFShare = v; } - public double getEmpShareTgtACMales() { return empShareTgtACMales; } - public void setEmpShareTgtACMales(double v) { empShareTgtACMales = v; } + public double getAlignEmpTgtACMShare() { return alignEmpTgtACMShare; } + public void setAlignEmpTgtACMShare(double v) { alignEmpTgtACMShare = v; } - public double getEmpShareTgtACFemales() { return empShareTgtACFemales; } - public void setEmpShareTgtACFemales(double v) { empShareTgtACFemales = v; } + public double getAlignEmpTgtACFShare() { return alignEmpTgtACFShare; } + public void setAlignEmpTgtACFShare(double v) { alignEmpTgtACFShare = v; } - public double getEmpShareTgtCouples() { return empShareTgtCouples; } - public void setEmpShareTgtCouples(double v) { empShareTgtCouples = v; } + public double getAlignEmpTgtCouplesShare() { return alignEmpTgtCouplesShare; } + public void setAlignEmpTgtCouplesShare(double v) { alignEmpTgtCouplesShare = v; } - public double getEmpShareTgtSingleDepMales() { return empShareTgtSingleDepMales; } - public void setEmpShareTgtSingleDepMales(double v) { empShareTgtSingleDepMales = v; } + public double getAlignEmpTgtMWithDepShare() { return alignEmpTgtMWithDepShare; } + public void setAlignEmpTgtMWithDepShare(double v) { alignEmpTgtMWithDepShare = v; } - public double getEmpShareTgtSingleDepFemales() { return empShareTgtSingleDepFemales; } - public void setEmpShareTgtSingleDepFemales(double v) { empShareTgtSingleDepFemales = v; } + public double getAlignEmpTgtFWithDepShare() { return alignEmpTgtFWithDepShare; } + public void setAlignEmpTgtFWithDepShare(double v) { alignEmpTgtFWithDepShare = v; } // ------------------------------------------------------------------ @@ -238,7 +238,7 @@ public void update(SimPathsModel model) { int year = model.getYear() - 1; // year just simulated (consistent with annual collector exports) // --- Partnership --- - setPartnershipAdjFactor( + setAlignPartnerAdj( Parameters.getTimeSeriesValue(year, TimeSeriesVariable.PartnershipAdjustment) + model.getPartnershipAdjustment(year)); long numPersonsCohabEligible = model.getPersons().stream() @@ -247,12 +247,12 @@ public void update(SimPathsModel model) { long numPersonsPartnered = model.getPersons().stream() .filter(p -> Dcpst.Partnered.equals(p.getDemPartnerStatus())) .count(); - setShareCohabitingSim(numPersonsCohabEligible > 0 + setAlignPartnerSimShare(numPersonsCohabEligible > 0 ? (double) numPersonsPartnered / numPersonsCohabEligible : 0.0); - setShareCohabitingTgt(Parameters.getTargetShare(year, TargetShares.Partnership)); + setAlignPartnerTgtShare(Parameters.getTargetShare(year, TargetShares.Partnership)); // --- Fertility --- - setFertilityAdjFactor( + setAlignFertAdj( Parameters.getTimeSeriesValue(year, TimeSeriesVariable.FertilityAdjustment) + model.getFertilityAdjustment(year)); long numFertile = model.getPersons().stream() @@ -261,11 +261,11 @@ public void update(SimPathsModel model) { long numBirths = model.getPersons().stream() .filter(p -> p.getDemAge() < 1) .count(); - setFertilityRateSim(numFertile > 0 ? (double) numBirths / numFertile : 0.0); - setFertilityRateTgt(Parameters.getFertilityRateByYear(year)); + setAlignFertRateSim(numFertile > 0 ? (double) numBirths / numFertile : 0.0); + setAlignFertRateTgt(Parameters.getFertilityRateByYear(year)); // --- In-school --- - setInSchoolAdjFactor(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.InSchoolAdjustment)); + setAlignInSchoolAdj(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.InSchoolAdjustment)); long numStudents = model.getPersons().stream() .filter(p -> p.getDemAge() >= Parameters.MIN_AGE_TO_LEAVE_EDUCATION && p.getDemAge() <= Parameters.MAX_AGE_TO_STAY_IN_CONTINUOUS_EDUCATION @@ -277,17 +277,17 @@ public void update(SimPathsModel model) { && p.getDemAge() <= Parameters.MAX_AGE_TO_STAY_IN_CONTINUOUS_EDUCATION && p.getLabC4() != null) .count(); - setInSchoolShareSim(numInSchoolAge > 0 ? (double) numStudents / numInSchoolAge : 0.0); - setInSchoolShareTgt(Parameters.getTargetShare(year, TargetShares.Students)); + setAlignInSchoolSimShare(numInSchoolAge > 0 ? (double) numStudents / numInSchoolAge : 0.0); + setAlignInSchoolTgtShare(Parameters.getTargetShare(year, TargetShares.Students)); // --- Utility adjustment factors --- - setUtilityAdjSingleMales(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleMales)); - setUtilityAdjACMales(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentACMales)); - setUtilityAdjSingleFemales(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleFemales)); - setUtilityAdjACFemales(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentACFemales)); - setUtilityAdjCouples(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentCouples)); - setUtilityAdjSingleDepMales(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleDepMen)); - setUtilityAdjSingleDepFemales(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleDepWomen)); + setAlignUtilAdjSingleM(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleMales)); + setAlignUtilAdjACM(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentACMales)); + setAlignUtilAdjSingleF(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleFemales)); + setAlignUtilAdjACF(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentACFemales)); + setAlignUtilAdjCouple(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentCouples)); + setAlignUtilAdjMWithDep(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleDepMen)); + setAlignUtilAdjFWithDep(Parameters.getTimeSeriesValue(year, TimeSeriesVariable.UtilityAdjustmentSingleDepWomen)); // --- Employment shares --- double[] totSM = new double[2]; // [count, fracEmployed sum] @@ -327,20 +327,20 @@ public void update(SimPathsModel model) { } } - setEmpShareSimSingleMales( totSM[0] > 0 ? totSM[1] / totSM[0] : 0.0); - setEmpShareSimSingleFemales(totSF[0] > 0 ? totSF[1] / totSF[0] : 0.0); - setEmpShareSimACMales( totACM[0] > 0 ? totACM[1] / totACM[0] : 0.0); - setEmpShareSimACFemales( totACF[0] > 0 ? totACF[1] / totACF[0] : 0.0); - setEmpShareSimCouples( totCou[0] > 0 ? totCou[1] / totCou[0] : 0.0); - setEmpShareSimSingleDepMales( totSDM[0] > 0 ? totSDM[1] / totSDM[0] : 0.0); - setEmpShareSimSingleDepFemales(totSDF[0] > 0 ? totSDF[1] / totSDF[0] : 0.0); - - setEmpShareTgtSingleMales( Parameters.getTargetShare(year, TargetShares.EmploymentSingleMales)); - setEmpShareTgtSingleFemales(Parameters.getTargetShare(year, TargetShares.EmploymentSingleFemales)); - setEmpShareTgtACMales( Parameters.getTargetShare(year, TargetShares.EmploymentACMales)); - setEmpShareTgtACFemales( Parameters.getTargetShare(year, TargetShares.EmploymentACFemales)); - setEmpShareTgtCouples( Parameters.getTargetShare(year, TargetShares.EmploymentCouples)); - setEmpShareTgtSingleDepMales( Parameters.getTargetShare(year, TargetShares.EmploymentSingleDepMales)); - setEmpShareTgtSingleDepFemales(Parameters.getTargetShare(year, TargetShares.EmploymentSingleDepFemales)); + setAlignEmpSimSingleMShare( totSM[0] > 0 ? totSM[1] / totSM[0] : 0.0); + setAlignEmpSimSingleFShare(totSF[0] > 0 ? totSF[1] / totSF[0] : 0.0); + setAlignEmpSimACMShare( totACM[0] > 0 ? totACM[1] / totACM[0] : 0.0); + setAlignEmpSimACFShare( totACF[0] > 0 ? totACF[1] / totACF[0] : 0.0); + setAlignEmpSimCouplesShare( totCou[0] > 0 ? totCou[1] / totCou[0] : 0.0); + setAlignEmpSimMWithDepShare( totSDM[0] > 0 ? totSDM[1] / totSDM[0] : 0.0); + setAlignEmpSimFWithDepShare(totSDF[0] > 0 ? totSDF[1] / totSDF[0] : 0.0); + + setAlignEmpTgtSingleMShare( Parameters.getTargetShare(year, TargetShares.EmploymentSingleMales)); + setAlignEmpTgtSingleFShare(Parameters.getTargetShare(year, TargetShares.EmploymentSingleFemales)); + setAlignEmpTgtACMShare( Parameters.getTargetShare(year, TargetShares.EmploymentACMales)); + setAlignEmpTgtACFShare( Parameters.getTargetShare(year, TargetShares.EmploymentACFemales)); + setAlignEmpTgtCouplesShare( Parameters.getTargetShare(year, TargetShares.EmploymentCouples)); + setAlignEmpTgtMWithDepShare( Parameters.getTargetShare(year, TargetShares.EmploymentSingleDepMales)); + setAlignEmpTgtFWithDepShare(Parameters.getTargetShare(year, TargetShares.EmploymentSingleDepFemales)); } } diff --git a/src/test/java/simpaths/integrationtest/expected/AlignmentStatistics.csv b/src/test/java/simpaths/integrationtest/expected/AlignmentStatistics.csv index 9651197fc..c61ee15c0 100644 --- a/src/test/java/simpaths/integrationtest/expected/AlignmentStatistics.csv +++ b/src/test/java/simpaths/integrationtest/expected/AlignmentStatistics.csv @@ -1,4 +1,4 @@ -run,time,id_AlignmentStatistics,empShareSimACFemales,empShareSimACMales,empShareSimCouples,empShareSimSingleDepFemales,empShareSimSingleDepMales,empShareSimSingleFemales,empShareSimSingleMales,empShareTgtACFemales,empShareTgtACMales,empShareTgtCouples,empShareTgtSingleDepFemales,empShareTgtSingleDepMales,empShareTgtSingleFemales,empShareTgtSingleMales,fertilityAdjFactor,fertilityRateSim,fertilityRateTgt,inSchoolAdjFactor,inSchoolShareSim,inSchoolShareTgt,partnershipAdjFactor,shareCohabitingSim,shareCohabitingTgt,utilityAdjACFemales,utilityAdjACMales,utilityAdjCouples,utilityAdjSingleDepFemales,utilityAdjSingleDepMales,utilityAdjSingleFemales,utilityAdjSingleMales +run,time,id_AlignmentStatistics,alignEmpSimACFShare,alignEmpSimACMShare,alignEmpSimCouplesShare,alignEmpSimFWithDepShare,alignEmpSimMWithDepShare,alignEmpSimSingleFShare,alignEmpSimSingleMShare,alignEmpTgtACFShare,alignEmpTgtACMShare,alignEmpTgtCouplesShare,alignEmpTgtFWithDepShare,alignEmpTgtMWithDepShare,alignEmpTgtSingleFShare,alignEmpTgtSingleMShare,alignFertAdj,alignFertRateSim,alignFertRateTgt,alignInSchoolAdj,alignInSchoolSimShare,alignInSchoolTgtShare,alignPartnerAdj,alignPartnerSimShare,alignPartnerTgtShare,alignUtilAdjACF,alignUtilAdjACM,alignUtilAdjCouple,alignUtilAdjFWithDep,alignUtilAdjMWithDep,alignUtilAdjSingleF,alignUtilAdjSingleM 1,2019.0,1,0.5017182130584192,0.567524115755627,0.877972027972028,0.3619047619047619,0.43356643356643354,0.4658780709736124,0.5353901996370236,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.049877149877149876,0.05113363440615968,0.0,0.2955160999097201,0.3023858368396759,0.0,0.5256896326317165,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 1,2020.0,1,0.43312101910828027,0.5306122448979592,0.9078327444051826,0.47128378378378377,0.48026315789473684,0.3220149253731343,0.4368347987043036,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.049367402629620444,0.04996578478889472,0.0,0.2982028632348462,0.2760101854801178,1.6784928515650515,0.6225113858165257,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 1,2021.0,1,0.45417515274949083,0.5142314990512334,0.9229081334113517,0.4868421052631579,0.48084291187739464,0.38556067588325654,0.4810187409899087,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.04747700720855083,0.04833442666835588,0.0,0.333027803238619,0.2792655229568481,0.6593871275540656,0.6310886862022123,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 @@ -6,4 +6,4 @@ run,time,id_AlignmentStatistics,empShareSimACFemales,empShareSimACMales,empShare 2,2019.0,1,0.5008576329331046,0.567524115755627,0.8775831873905429,0.3632075471698113,0.43617021276595747,0.46504559270516715,0.5347826086956522,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.049926217412690606,0.05113363440615968,0.0,0.29627403846153844,0.3023858368396759,0.0,0.525599947688485,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 2,2020.0,1,0.461038961038961,0.5132382892057027,0.9080357142857143,0.4685430463576159,0.4911504424778761,0.323781168589505,0.42994505494505497,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.049838026414153996,0.04996578478889472,0.0,0.3029286150091519,0.2760101854801178,1.7347871913004633,0.6206357477853048,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 2,2021.0,1,0.4891304347826087,0.5209923664122137,0.9225455614344503,0.484375,0.4885057471264368,0.39113971980310486,0.4810187409899087,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05320735952262556,0.04833442666835588,0.0,0.31098867462503826,0.2792655229568481,0.8022430892446019,0.630488278720373,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2022.0,1,0.48518518518518516,0.5364667747163695,0.9302117506710409,0.49449035812672176,0.4955555555555556,0.4186558942343004,0.48984302862419205,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04865398863917016,0.04938041570024613,0.0,0.31907794965119807,0.2648949027061462,0.0,0.6119383825417202,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 \ No newline at end of file +2,2022.0,1,0.48518518518518516,0.5364667747163695,0.9302117506710409,0.49449035812672176,0.4955555555555556,0.4186558942343004,0.48984302862419205,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04865398863917016,0.04938041570024613,0.0,0.31907794965119807,0.2648949027061462,0.0,0.6119383825417202,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0