From 3e67ea3f27f15d32b0b8b8bf26fa95d39c95ed4a Mon Sep 17 00:00:00 2001 From: Mariia Var Date: Fri, 15 May 2026 13:35:12 +0100 Subject: [PATCH 1/4] Remove old alignment workbook references Delete the unused code that still pointed to align_employment.xlsx and align_student_under30.xlsx. --- src/main/java/simpaths/data/Parameters.java | 16 ----- .../java/simpaths/model/SimPathsModel.java | 68 ------------------- .../model/enums/TimeSeriesVariable.java | 1 - 3 files changed, 85 deletions(-) diff --git a/src/main/java/simpaths/data/Parameters.java b/src/main/java/simpaths/data/Parameters.java index 68033649f..62bd94fe1 100644 --- a/src/main/java/simpaths/data/Parameters.java +++ b/src/main/java/simpaths/data/Parameters.java @@ -420,12 +420,6 @@ else if(numberOfChildren <= 5) { private static MultiKeyCoefficientMap projectionsHighEdu; //Alignment projections for High Education private static MultiKeyCoefficientMap projectionsLowEdu; //Alignment projections for Medium Education - //Student share projections for alignment - private static MultiKeyCoefficientMap studentShareProjections; //Alignment projections for Student share of population - - //Employment alignment targets - private static MultiKeyCoefficientMap employmentAlignment; - //For marriage types: private static MultiKeyCoefficientMap marriageTypesFrequency; private static Map> marriageTypesFrequencyByGenderAndRegion; @@ -958,11 +952,6 @@ public static void loadParameters(Country country, int maxAgeModel, boolean enab projectionsHighEdu = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + "align_educLevel.xlsx", "High", 1); projectionsLowEdu = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + "align_educLevel.xlsx", "Low", 1); - studentShareProjections = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + "align_student_under30.xlsx", countryString, 1); - - //Employment alignment - employmentAlignment = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + "align_employment.xlsx", countryString, 2); - //Marriage types frequencies: marriageTypesFrequency = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + "marriageTypes2.xlsx", countryString, 2); marriageTypesFrequencyByGenderAndRegion = new LinkedHashMap>(); //Create a map of maps to store the frequencies @@ -1918,8 +1907,6 @@ public static void setCountryBenefitUnitName() { public static MultiKeyCoefficientMap getBenefitUnitVariableNames() { return benefitUnitVariableNames; } - public static MultiKeyCoefficientMap getStudentShareProjections() { return studentShareProjections; } - public static MultinomialRegression getRegEducationLevel() {return regEducationLevel;} public static MultiKeyCoefficientMap getEmploymentsFurloughedFull() { @@ -2617,9 +2604,6 @@ private static MultiKeyCoefficientMap getTimeSeriesValueMap(TimeSeriesVariable t case LowEducationRate -> { map = projectionsLowEdu; } - case EmploymentAlignment -> { - map = employmentAlignment; - } case FixedRetirementAge -> { map = fixedRetireAge; } diff --git a/src/main/java/simpaths/model/SimPathsModel.java b/src/main/java/simpaths/model/SimPathsModel.java index 173cbdd89..d86e6119d 100644 --- a/src/main/java/simpaths/model/SimPathsModel.java +++ b/src/main/java/simpaths/model/SimPathsModel.java @@ -2145,74 +2145,6 @@ public void resample(Person agent) { } - /** - * PROCESS - ALIGN THE SHARE OF EMPLOYED IN THE SIMULATED POPULATION - */ - - private void employmentAlignment() { - - //Create a nested map to store persons by gender and region - LinkedHashMap>> personsByGenderAndRegion; - personsByGenderAndRegion = new LinkedHashMap>>(); - - EnumSet regionEnumSet = EnumSet.of(Region.UKC, Region.UKD, Region.UKE, Region.UKF, Region.UKG, Region.UKH, Region.UKI, Region.UKJ, Region.UKK, Region.UKL, Region.UKM, Region.UKN); - - for (Gender gender : Gender.values()) { - personsByGenderAndRegion.put(gender, new LinkedHashMap>()); - for (Region region : regionEnumSet) { - personsByGenderAndRegion.get(gender).put(region, new LinkedHashSet()); - } - } - - //Iterate over persons and add them to the nested map above - for (Person person : persons) { - if (person.getDemAge() >= 18 && person.getDemAge() <= 64) { - personsByGenderAndRegion.get(person.getDemMaleFlag()).get(person.getRegion()).add(person); - } - } - - //For all gender and region combinations, compare the share of employed persons with the alignment target - for (Gender gender : Gender.values()) { - for (Region region : regionEnumSet) { - double numberEmployed = 0; - Set personsToIterateOver = personsByGenderAndRegion.get(gender).get(region); - - for (Person person : personsToIterateOver) { - numberEmployed += person.getEmployed(); - } - - double sizeSimulatedSet = personsToIterateOver.size(); - - double shareEmployedSimulated = numberEmployed/sizeSimulatedSet; - double shareEmployedTargeted = Parameters.getTimeSeriesValue(year, gender.toString(), region.toString(), TimeSeriesVariable.EmploymentAlignment); - - int targetNumberEmployed = (int) (shareEmployedTargeted*sizeSimulatedSet); - - - //Simulated share of employment exceeds projections => move some individuals at random to non-employment - if ((int) numberEmployed > targetNumberEmployed) { - new ResamplingAlignment().align( - personsToIterateOver, - null, - new AlignmentOutcomeClosure() { - @Override - public boolean getOutcome(Person person) { - return person.getLabC4().equals(Les_c4.EmployedOrSelfEmployed); - } - - @Override - public void resample(Person person) { - person.setLabC4(Les_c4.NotEmployed); - person.setLabourSupplyWeekly(Labour.ZERO); - } - }, - targetNumberEmployed); - } - } - } - - } - /** * * PROCESS - ALIGN THE SHARE OF STUDENTS IN THE SIMULATED POPULATION diff --git a/src/main/java/simpaths/model/enums/TimeSeriesVariable.java b/src/main/java/simpaths/model/enums/TimeSeriesVariable.java index db2a7a441..7c45c522a 100644 --- a/src/main/java/simpaths/model/enums/TimeSeriesVariable.java +++ b/src/main/java/simpaths/model/enums/TimeSeriesVariable.java @@ -3,7 +3,6 @@ public enum TimeSeriesVariable { CareProvisionAdjustment, CarerWageRate, - EmploymentAlignment, FixedRetirementAge, GDP, GDPperCapita, From c8966c22684b8812664a765a7baf7c0772504bb9 Mon Sep 17 00:00:00 2001 From: Mariia Var Date: Fri, 15 May 2026 13:37:33 +0100 Subject: [PATCH 2/4] Corrected alignment adjustment factors - reset fertility and cohabitation ajustment factors to zero --- input/alignment_adjustment_series.xlsx | Bin 19748 -> 23235 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/input/alignment_adjustment_series.xlsx b/input/alignment_adjustment_series.xlsx index 3ee0856e9c80f910430d95de0abe8038847fee7c..7a16ba69754d1a7accb988b9887bdef3dba0cbba 100644 GIT binary patch literal 23235 zcmeIaWmH{F)-{S-a1ZWIaEIWof#B}$?iw5tJZOLb!QI^n?!leln&5iR;Ym8(dD8v9 z_x}3s_!%OtN{;0lll$(Oq!E5x8Z0?6DQ&qCYjZQUj0%ob(9(oSj*}d}g2i`K3lqa!!F9PT znPI%v6zXZZ4;9p7HnC@Br8(fc+@<40T^(rXRxh;9n!86WQNcT7ckH!i-He0G=?l}i z$a0_c`!+bSBQm+%;ApDM>kva_l^_m}tU#r^N`lMmINo=*gHehP&g!t*%z;Mqqt0;PhTX9OSx0Iw7jJ$s?X1o z?q4Aln>-b%KpuUeiUW(5ix-T^m+Y_6E33Y2a8(LAEu?f<5?o%#k+~N)n(8}~n750- zAIc?jFp-S$+0npsuGH(Z74i8sj>4|(X`$!~%D2c|=Dg%s zULl6X%*nXpm1t8be))Kh3qOGrnA|Uz#J$0}yq~rNFtj>lvYq7U;m=9g-)yn6Q*X16 z+AUmyrzsJS2M|x)+U1j>MCwwhY-!CyhHX8sAzI1FW|Xc?I}}b*y4S*_&-(^OML~jg zkxL?~Gt#;C@pXzEGmNL4$Ff!zhachT+L%r$gp#K8*8p?l*9J&_I1D1TJ@Q^MpEcmN z7Pw~L7DTXpfK%<#NI-m9K$G7PfbsmaZAh$LBSBS2VwrNzqo$Ufn@dil_ZaKTx!J3` ztcIf3!Of94p3k2RZouGoDhyxEBWPm=DjG3L-x2I|Qr4u4<3K6gRt-7O7ku58(kP#A zIxCwmTz@H#@qV^x%U3#!tC>fS7zR2z{*9A?*i@cQK^4pz5BTYtkOU&A2_BN6oVW&` zy$M1qN`vRr;yvDnsM3meqUQEpiB7lpS4f76Ti*hRv7WU=><>5lS>eAJ=BS(x++XWq zplU}*7vjp?IlW!rcDg=_B%dUH-WIz$aqN2c{Y$&8Zgup{l8)sVp_68yVAH)0!#poi#~2^{#(hHEs?K&wWRNPB?>MEsblcHm2xlSrIJP7c6kJ{ZfJJOZ7_ZLs zway7FTbtFIl1s=^kpWY&Y<1Ehgsq@HtHz=zvw_>Q(gP!y`PEpqNM5%lFJp74~3iKP%283oEL^Jl14+2+^r(gvhANK$caByt>Ndi)7V&X4iQ} zZo%{6Sqaah%}6aatL8g!hi?E#{T*`z`6GG)05nbjFoy#I0}8<0U)=Q1$ot7tpa6{t z$o;?jtvPYfqKgq(^zzL^;CO4|S28(815+iqx!PT57|%PRS|irIE??cXiJV}@;Z8GB zY}h5P#TeH4!?s5DE0Dk_6>2p7ZZL(07dXnf2ZvX8<@%r+1#oi~kkq&!b1$3P7Fq;o zOBRBhCkaeT+}#Ne=lqwH3tX=bSz9T2IL(L+E9xm5}(*l{0q5`?y~2 zq*Wp2U@tsKNG94YglIad_chz!iu=EHXPAq~tX<_1>j&9dQkkNTGQzrBG;0d$94DCC zs^oA~P3X}hpqG8AKMF_+v1OK>s6X1Qc^(?tsqT@duE?l4%BWeXP^A&*VzyMbu~_N5 zzH;aF4XwZRkN14F2D1YTNDz>1JP;7C9FRLTI8TKM1 z2IDop@y34jnv1UfsY|nj3U3|!nFn28pT;onGV@7`517T-mX8VS4&H_r;X=3XKt`rw^Q;w$MfmHnA1lBnTKh0nd$cH z?8>`{M|Tp9-;$STNGeW}SPS|(4vY@JDH&Q8Qq4Q>+PJ1L{Q8{A#XY93EMV$#!0P&1 zt%7?AgYhWIF41IJ8o?LhK|IN(`&dKXIAgk4Kg0!W$bYIB>G4JVvx#EUiM~gQ6g$kR zGwN*)yG)YfIP~QUEhD0cWl8qq{wt^H!9K6Hi^pV_N1Ii?O@_&}uMUU0zE$(vb|KgK z%_#(59{TJWqPBd>)x$t;QYN=e&gM2w>kSY5b+6#>W&GFERHi)dH{e|{3>GdmTpkh# z=7TUHkvm}~i-$k#VEL8Y<6CN~eA_2k*Sy+QsA@AOzsZ4wqzhe3gTqFLY{@y@j%b!A zfoz>xeqn9a8E$*s%I8lYQNzcV^H!AS4qJXbROaKm#S1K7)6urEJGXUVKV8vw`pYuS zd82orjAO8Ca4aeUAt!qYT%$%Xt7oFk{DTiLMh+LV?br-pjV6_#L&0Vs$J*fU50BaW zJZW&+J!kaTZ*9Qq{~GFBA%D&am|@1|1~ISLchwe5g!c(By^# zh&oEKx+Px=t|6C^Y#oz}ykdoDL7jMp70wB(7-Xm+gf5zxxwZecC@v$8NR+b>kYEJ6 z-(-pIucW&Of4AbFZl73##5L9=%t;pNU@Oe=U|!xwykgWGmhn0c;Z-6T6#VlEkrOLf z>H3Pa=vIx0F|H6k&f0)L2Y zZ1;Hs6%9(X{Yy~A^YFMEj6F!Y33$;my%-ZJZj-#{;h=^r=#;sPQ;PsrsU=Q_l^Wf~6>0}css7T<)utF)#*!@fYs?0a#CRC^_BMq9v3h>y#kBBT} z$|9(a0H_dz+%BrXu3&>sJz*w&x?rKSVg-n2IC$*wh#%n*al=7b`T#$hb&0U4jkxi# zk4AW78&2$$fRDqDjs}Gr4r|DS?l28!tcH$883Edn{UUrjv4@x6%)UG<2{MI{N!#Vr zu~`;_uOMQb3vRGGsG=UvUeOD35DBvx-vm$YSv+(Ytl=Oy<(q_^H_DnrF4&@+0||gM z^|H9^{LzAT;5(XS}T_g5)2jLf=xlWlF56`ErAv_*Yzfd-MJB zEfvS(AMei;diW+D08Oro{BQ5i%)t9|+Iwx=d7$$^dB`u)5Yo-AARsVZT38z)Ia&SI zGL93OEsV5Jpve5uyRQNvJqFN-}Xu z21KMtxzV~v&cKO%e-L&~SY=HoXQNM5Q&kHmW^;QL|J-wRF3TipN))0fKj{1Mh4I3i zg)@7OmTb>t7QS(_O;&epvDEbhR@6ssO`kb7tubpzZ~l+4!`Y^wy4bB@J!gGo63)r6 z%cnxoSq|Bw*Nyk0l@ewyrA|wanapOfFfMe{5IRz8m+7b}8J26(Oy5QfsvMb|8@j(K zZ0%pkTM&?5g-t1OOT~D2oL}MEs<^|l6gP%L(0)0^*H}iwqfAw9^YckKm}>FBFF3FN zdM62~>las;)jvJk=fmfNHlFBmfL7*{)Uepq8RGn*Du95-or{xj6jlzlbJFoD{lm*D zhq|N_6wdk42WDS)J#DB#l>CiB>X!&_3FkJJNS`r z6!EnJHz>5p#dkBBRlyZx*$05@U@~J#Qk>hWQY>&xE5LmJ@MUO z;y^mPQOhR-5qTlrw{-By(ED>j0K!!uokOS;h=R}row6Wny{LJ>VL;<8l6I}5^m{H~ zN(4w}C#nrz0AS|V3%g6j!S_vDyWP;RsCeq1JKyX8Mz3(y>rSWnHf0-Lg)T9wE#=yU zYq!X*?~{qx86otQu2Gx{3gLw;H0*XKERwyH2;KVZ5v@HcyB-+yKDu~sR(S~+Jor2x zt-SyYUPTw5%wjB)5x^ia5kRGexkhn>A)y-Z*7h3CxW!!&3APQDoOZJjw3+h)6ZQv1 zwKjmS*6n5$MOk_Ze6`3B{(YIBo~Tkg#VK8_n?48=qcl@OtWRPq}My-jWD*1 z`rcH)U&lniF47nm1_*0~E+g-zOG>*Q&|)-I?q-K$+#f-zq>nA6I>DEb+fHX}K~>K? zP`g{N9O{#f>XpStuPwi_dvSeOq%?*yJ*F@^rHMke`&io zGek-oaiq^NKq=tl49{o#(`fPHAx0XQ`0bqT76X!uNjaWBcdOPqxUy3f>K%H=5Xo46 zZaSse+|s-aR|BPuiaN&`Vy_T2?B!~`q-sCP&1V^xM{eP5I?#dVkYAxc+97pNJ8*H= zlIAHw*IXoyaK9ocD> zco72GhE9JEICPSK%o=pDfn^EF1V_?G5l~a>i~?qlHSjIAOfhejx^tfj20(~oR@xB* zMnY3!U#z{(;oX&N&m#L2n_0PGNXJo^7Yu&n=E!2XwDe-Lcg|8EHP)90@{s}5)U zU^3f!U==}wa~Imn`|ZN-A&@B&{n9OS!I3~sZ0(Sgq=}wbmClc`DkuyHMmsct`ih_e z;4t&(K{)Af5!K`=g~YGCJO~#EUBUl^S7)RjcvW$wPBT!ojl1H8MZr_=s<5mF5?0@u ziw(CuIgl!|xhgXZXB>ej&Lb`2c2NcfNq8!24QE_{!B$dQUY9oks%!>>)L<8 z=55L8>=Ty87#x8J?6bvr3rx6iKmmf38^DB`8$cce(&O4F_vFuU#V@M-mGHM9FERk| z@a$;EKe*W77g;0392o&A8Y`Pa#KUxA0{>R3r_`$PU-8>Yqc|8AI#GSkEc0e)ip?*%d2AMv^ZR_LN!qa%}Y;cgw^ zpD&3w2c;oynU3G*Jz;}eEKl!iFbtdq30J9_D!RCy=;_xN?t?fI?0?bg zFo0gQT`8xPgTH&lPgh$hD(O>{7Ibi=R_a|g&(0LT$_v%QP#*Jbpw-+hobF-!YC)56 zVO_TB{ES@1Sh+B%)GTGH=fHl!PEZvi^7c7`Sq$&9tBwf_UG;Qt6o6h9#2E8!)!0Rd~9YB z^kWPqg2w~(oEd-s1shtPHpJ!zJB6WuK^8*^iXnyP4S)p;vWL(=fDwMH7XTvYi=)+K zMH$Wb4VaRL5>!AM$p=V*IJ`JN`Wnr2I?N&ogG$cn@U8%f2{8J|?qIVK;rTh$;Ujia zRz<7y8s4qP0vT&8c1H{g-fi##8AO;pp3SxkS?eY{te^p__=w|yr%fC(S+CRP>%P`K zV9-c>#N}Y&Dd@Tx)Yp2#4l7_6c{(;L*KFG?EA$R~qk@Itwij6IhS9YbZN=>_@07FG z&CKcr)@f9oq!}4guc0X~a0r8H$m>;7Mf!8>0?bYgBKntvzXd^r3?f5%UDmxftWg8H zvE|cFyE&FAh$SLV%LSQ9pI`MZbcei0h?z^Sb{cF|sG!G9er+{*sG~OxTh-Ekd!liw za%|q4IUP>hV|i%e&D2}@bTP{~B-*g&zC@)@g zq;Y6sf0Z90d|S8v&7o;d9t~uYS5dG67t6NS@&j+GX*I73_wi#kvspZ>Oa2)GZ$jrW z4>{}0FP)zZHq(13`V4Ly!g>sA)N_3uZgJWvCv2~YKJ3-0mbIBzEWWl2aaIk}TTu3h z!sLMXq+W3VJvJK7*RMJlM)1~hgwW~aIVV^AyJC}Eg6FVr-hww7JGV$VCyP8B70t)a zRhU%p(l^~)-eW(|#IhwEB+j%IM$HG(tqufR?;4iK;hJ_m@8A-2^MY?X{Ul#Je~5tx zrg@7}HQT(%q~3`f%z~dW-}o^cQ@Y~=DmDU)T-C>U`s%SdVI;xFb_4Z2?J|8`D)Ovd z;TVQ0@UvI*2V2g;(Eu!yO6kT(zp4*e#k3nf@^0|FQFo+j4^6hskQ91H)e#dodC-ZEC+4A~Ky5Sk}9{hlFejE_+835D)0MA75P+XP% za}3P>c}Mt1!ry`*#7w_`SlZ=VPle$ot*jra4ynFp0ZjP z)zO=RWohXTDKB>Ww9TqCW-*+w9;La^wfUh#i=42t%5bp3ftK;pVDzIL)x#g1DV8$~ zx0L@3XO5q6{%2xGx-n`X zUJ#inM4EUiH{g;%MzS)V5=v}o4&EPpnj)e0bwQ*$EjF7czZ5ksFD{3|7;PWUarqO} zg4ICU%StcZNwGbWG!>D~>j>>RIL(rg+xQ|_-{rc%v}yWywIpR~-KK2&*W2Gm7lQ38 zOEZtLSV`Q^I@h4PY)zP!E@&0Cx6)v1V}t>nt|Oq+O&mgv{XnCAxl#m=L!L$;n9>2i64|52&rv#eIlaLx!xV*eRddF$Z&dGf zHS_tf#;H!<2zpkPBW_=TS8!Tya-a_R!9Pw2R**KOCvK-7HI#^x^jmbyF$Iig%2kmM(6g%62_pzzwoj9&HZ6CwDo6=T zhA1~mAdZRKRNfB4r&mHyQKH8m1F88*Q#YUUgTebR2MwW)m@YWGmjOCibOCI2FqhH< zfb~@G+2V<8a><=b102<{P$k~cXZuuvvZ4XKRaooZh@bTa2yrFb718+JN+>k$<;>EZOEckJ-5lv`wDp3w!5UH#=dUJ*I<)P$TmqMjb9l)>atQQ}&qw6=hS``#>OMW!Xf}aQx%!d<>YnBq$vg3 zvKx0Cxt+eQ5(DtFGLWCO=cH6iUW`zyDxF?U>7WCh=E7pB^9c;uxW@Npmll zh;hZlJ?}aDidyx_p+(|x^THYQgGAd`tn1fp>CF#$gV&8gJjG2?5DRn@maI+0oWqIV zZ9wkn<^(h7C_Q*fIen)(!0jBUh}C=G_?S`Q2t8c}3oT-Nf|*o&f{lcN_%x?@h?%mxkQI{YyXv5`^OKcDDgLq#qOar;MGq!TmMGeeccF9;7YzcY3#M}nrQEdyz}4+bJWV0e;zR@; z5TKn@0gMhoS>lWUJswRIiN7}SgP^ygbHhj@p9tC*$sPu7_Ms2 z0t(|SIfKZ)5w~?*TcD12yQ&&-`8hrSW&>5iKPUVx2oltdjl{End;Fuq`afocJb$}u zw1aDlMrc4GZelVqL4PaMQ)^|USRu>d>Hmsy=!}A}y>h)IV=_{(2tze|#>N^t&KJrt z!3$&*sJBaYVAURvgTDS5(5Av4nA83s>*D z*|C$iP*BR8w!KlDXB?LT=Q#ceYQ<(SVCnn1!cRP(4thV~`6j-oz>T+B6|zi|s^UeF zBA=`1WX_AN53UGUPTGPi@@5hdo09EF!Mf{=OE&;3nhpY>x1j)fyYH^?UY&i=%)S(W zXC31)MzjO9y=QLJZ&q9-%$!Q!F!X%piHI8QIon13F5IA=2hiJ%0rEL3--_sJRTM98B-;vTefPsoD()O-6@k<(#+wP`6S@hK&!VWAS_G>=f0r*6i5wJ z+)jvXr<0T_M;CA|{xtwV+h!am0|6a__`-TgNmTV&hddC_Ay0tb9|QopZNuW#j;yVo zCQxy2(C8Y80|9*qpy(=i;JVTiML%`Vl^0JG4d|YeJ{~qUvjNZ=Nd%7%>bVWxs-+<|yMF|E%JAmNU8+y7MMeOMtAA>V;8GQW%6u=E&hy;d3{QXn<{NcmV zuII2lq?nBNcNx?G5!h%vqb*^;s5?I@ZQ<&##ihul@(M2P*_j0(#2~~+><)0Bx?=nK z^aVMuexRf_i%#2~y?heiyC>My=~sn7l^lc5wNPQ(1niYpV$cX~I~T}6IshWL_reLF zcAsQ4&ql?Qbj}ZH0BY+Ej;KCh!j=;X5cAvsq5Vro1H7+=|BcWF%JaWwfguALZ!0T? zpACE1Fa1vODlaYz@X}tP$#}`hz{RC!fW@U4$)4J!14yxS#>rGKkiqae4>=alk}q1+ zI!(5o@9$XN7j1&qyIOIn9z|sMr9Y;Z-$4JVgBCBJANeV{pZ}Z9I*dOd{Y!H*gjr|$ z5ha7yJGSpY#(?GSSmzh|OOF^F%Ok9QJX z^UkW?EI&ZGV%UfhTl*54%^6^SrLk38C;{xR7eM=~(CD&xk)v1{V1KbG+dVj_I!`ED z4oDBMz2-e?DvIU6k5^N6&ds>ZHlK*E8eK?y)>xQzOv##K{EciCx{Ja7z0WPJqEbSD zbn7ed{Iq08pQQ)ZRFi66Wsjvt(I-qR?Bcq;0AO0m%&G9r=o6;ppE%mPMknVNro9SQ zbO0RP|dPFFxHvUq&xw5*dTm zWT3Zej|#GTv`!4cK7w|byS#3CV{+rNL%c(%HYDA$Pk-<%myFe$>YKZZ-%F`fdR>#9 zcw+&stTT)T^f#U`BQc{)9q#+S5ZGW?XrZKOqqWBl=70tnTM%G@U6dvOT&;RftV>1* zh;<-ZBS~Ql#j!nr;GRJVvJ}U52M%v=Hzq1r?Sm?ws5^>C27hh-iMnlck1~9|;K4B( ztf!jBB9lqkZ4xOF8URLO)|-pHWf{b_15pMC!Rf$XL|wnldo%1tl+Uf~%=CPdcVpj#>0P_0S!E z_0a8AhFyR4&~pE_hn9(MV@dx((fDn4Uj1w*x?P6ZX7_E75bB^!}eX`r-c-N27HS+P}BC2Q<-`06Z%L z@$3!2GhM22HK(e_l5ZKa*?U+Qx^vj(_|D@6a#rq{&Lp5G*1K(RV;6RvwMaL~-{7s) z!85^dt?ctjSBLi@uc#+4h~-IhznH{jZ6oI#R*87h+>)(oa%XN@jt}{PqwW1!K}Hy~ zXP+ggn(^oGiwccBBJ|%4u4pT_z>`-w4krzkJ_vIJw}l(Yk~eKkmpOdAAbJ)*S5D9O zdau%f`#owJT9Ekm2`<04!B?BIRoe1eT&C~C-}&Mo;q_-HJ90}r3wJDtuc-aU{q#6A z3zvi(y}8ej&)VuW&^;z`XECKD&2H)ku;x&1sH|LWnE^}5;J~G1&yRM{9bDhIDC&y= zOUc5S8~{_y*tY3~tt>JTJSmJYz!a+hnqsD9u1KUmG&g4eqstG?9Y!RBr@sk=`3{fR ziaw9?4?sr{4dLlO!QTwnMVGPl0lMh(f0*3Kzf5k`nRgst#h6?Glxe50YYU`I6g;l3 z3fp=h>-McV*zlZ^12y$WE{6=m6-OY<^GH8&Unm2Eq&yC_hAS?>U@Ivl@5P%sNsx(q zsvXa{fT+W;%OB3QORwRR0Dr~d2(+_->r;l2AyLC?BtWP;11R>Fb=~#^wB_@ z+Z^eK?4F6H-yZNDLo5H@hNkjoo7+1pA?<%6=|61Q`a#l~um2AtX=$A!+%GgrBIPMG zoW2c3+`ENrU&+7X&=6cMDfg!$N);D2Dvo-OvziagZCejQYEO?{qTx(1yQ7{2t|f8G zwB2JA6i9WDujGTi9vR|lv++%lWzoo>X*mKK-2hMnjqao;qnmrWbNdO@pMXa9T&o7d z1OU|99YCX7xpm5xLC1H}ptW=ralaI`gFWI5bNC40H2;qzZTg=`I^%y$($W;t*qwHH zfsUHeg=S1xckkQH1ng4qr){#5Tk$<$ZlE#0D;|41y9F#-$r6TpW#DJNoiK4_U~w8? z&P-Fd3D*h-Z0CBC-G4b_5wP7T0B6kA-SodC{eLz|JHJdekAngMiNpau|NHbxh@*$T$aQO!PA}37L4LvGsBR26mp_+~kG_ z@VU~iu3www*Vs|C*dxt7h_ns6g!Cyxl*3k~2_~kvgsKmP_|aT=yDx+G6}lmL&6+UI zw-a3%6369iM0zkahix(+9GVvO9MqJ&^Qy)hl}5j}WL902fxNa_zlri0L;CW74ieSJ zI1w3fGtl&&tyI& z1Pliwv7baqecEP&Zw3>MCkw&d2`8NDnl_txNBvQ?_$2Wd0jFls-9NxWO*QGjU;wqE z~0`aDs-hLP3}B_4lcSaG3cH ziK@hAKiCzsSTDSna{XG>OY$8>MS>apo-W@`cKf?@-LD*%>l}<{wFUcS>O8Nz zRDHcK8@_Kdth9OEIe$4f=bbra@VQy>G^J((d>4!d0nUbaJpd_aVZxr z#_c6xFqCe2HQUf{fSvhpKZ54dt0!L#AuA{Ta zR!<0dy=pg;mGkjOHEKWxU1H8-ry%Q z%4jU-8^BdJrzNl7tT9m*&^bHVDxXvlCIiV;eZ43gx%-)b2c8stv?NUub$3?&ia4Ii z!G=*k@R;R0Ld@km=y)sHOY49rrw{ZHbpl$>QlkE!DI=z02M6CLA8*9Up{US+&)Z6P z$i%Xo-^W+pK1Nn9u-)LXE*)KIPc_G(?(;Z*jSsf%x`$3^3c>70fM*!o8afxO=ZC4g zZNoaUKK^z+=$ti1wA`biU9z}Q^6Zj2>r8--dU?a*a714x1wQkYHO z8vG)i=s>Sz@>OK$4v~p_Wp~a>B7ZS zll6`ms(IRnM*IsL5@F~l1EgA)GM5^b8dV*XceS=cLiyuEZj5(79VzFP`-r4W}Rb}D4UZte$HtV(MGeSbW_d z=~ktjnAt+Z+6#mw7hS%d%uEZQhl_D)h0JmWjmh=_D@ zc?S2v{LOg*v#)1)wb3()OF>pH7cr-pWf27fpN}-)oWyw1zJ=bafJ2xwr62Yp-E^tylf`o`S=I=y zNd*ip%lV$Od)aR|MFyyBYQ_^KwFu2)jbEhpGZjjzx}R4aS<1lR)MT>+rWiF-cPUnV zSBabFdI3`{0in5Gn?YI}%acRcTvn z4nbw;NWzPJF2;>PpkFy9`+B@O#QmVVKCQm+hACoD##@J)c75-=bWQF3_XuGDrz7YZ z!J_3os9cp67Ap4^o2n_eK$`-rps3|ctefF4tN#0V)a5e;Av$BWi2)YaiOrcLyBwOi z!Ky{h&0?SCF1eAu8N)~N#=YgmMAiXFRog!y!B^g4ZwnOK%2GezqiO-)gPiOOCPc(B?zxvkh%Z01Irf}>N@UrN$q$x_$z1IfM?`6$%g;wWyA<9keK%=F2RD>M1l#xy%3JF3 z3Yp`k^YeWe@*zl&8LHDndhiiOm%i{rQaIT zD1?-+UE?7~PhUD7ZpF^1O_CbF)}_OAaBIERf-N|S0i9-7TU|5{%!Nx=K?qShjBw-} zPOvg6umzckGnRDx7JD?W>B&hL19I&xA-H+H#G>(`Qn)U14)AsVrQ|B-1Q3 zbg)-w0mH7uA4E)a1cPt2%@^-BcnzRZK-|sKq$v_U5<4Sv6`{P3v*|-*@pwIDMa%T* zV4^@6V5=To+QU_FNR6KC%;ubqA9%QY;oT(Yeu)F}F;ZJw6PrOGrdI(xg(}8>^=v;x z8sQ}j)l786(j|Wr?HdL`>|qWwvX5`{UmaR)zIK*TNIY~6F*fPimVKWbI;4LJwL?5~ zcR%moi7;g#92BjHG4|Q;23i@1MbSbcFnhY6x2AaQk*X%xKz<`&T?%eUW{dmXb|NE4 z<_ubn{8*820X$;aYX&NrM_i#7;QQ1CJs3t+OkuY z^ohi1&hL@?qoM(NtSOBIiSNdI=6Z_JWZ*xU;a@@J zIinCE&Z`Q0K(wIfDdchj1l#5hG|UoY)1}zGU3Tv~X(8INp$+z`9*;*8>v>m1EUZLN2HX9Ca}6Q+q&L;* zhVYL7l_@~=J_bAk{EP?$1pNm<&Ga3Njg*`m%xz4ca5|)}>9|mj;d3nW2recs*%xbN zOSu%Wf!`O+vs>)S7gLq|(wGPpb=(g`+AsF}_!b|eIW%5b^R&^sQsx~r^tRV_z;W8W z*9Y2K)Z7HIHvDv%XmOdH?i@vimFSmC+HczknfB}D8kjYj@vVdK@4X(j`P0?+v0JAv z4yhbVuk5*NBqg%)3<4W@AMpZHo@s?kX zRLlL^Mr;2(!|Snb{5m;d+w|z}LqL+LlB*AU?qgTgN<*Q@<5~?m%_0At)j*k}Ve7>Q zNAe_YtaVr+4x!Z@^I%Rcip4sn0`{A^CQ3TtJ?>4>$*MO-bf2N^T zWbcz|p;j`XMx$VJOxAl`r5$mIgJaWoO|G`WPcXSEiF&rum3gI?RUcTE=iAnpUV5!q zUPyH+!a(UA<;%o-zHot6JoM~{nMbl=BTiH2n--^l9tm5+yyQ`L`cTi1=0-5q#q@q_ zWJGs=f*$S_lpKVg1P0!xFJ33Dijg6x&mTUET-3_0w zq&%<;FP%WDqf-+*YmQE(T0Dj^D@8b3$E7V--o_ao^96!HMvfEFep`Rr7^|Fnrh8Jcr$ z0WuBeGh!EQDayNAlyJkhTlq?%GGXPI4gQ5(3~Cw)n+ziZQiK&;S?07J>J~()V6}-+ zk^Uf}X`;6%DfpsSx3?lxoCtYq2`r!EJA%RAbql1vI;uWEBad~(b$K2TqJ1O~?tAWU zWT!tD@7$pz76RH;%X|%3k|!IAXByQT^5ecUE@=0oHUwh;HkO52 zQD8Aq_CdUupgA?4+hz`n72x7FfeIHh5+9UXj+FO(Z*`0q`jHVzrrV%nS65KEE~l9w zFenH4C5j0MxdnaXq#*m(f;3WhI5Hv#aLHMO{ZP{e0U59YOy(F;EJb02k*&@wbbIvLz?ZsTk#uPmIs!SZyM2N7{92i45HDC|*VwSN|0TddErJJ=3 zG2DU^Z_+{FoBg|U*|UZqF$#9T4fApa7BDIV3bOX5&2_fUQJyK!Ws1!ETUAYih&%(` zq}^rrM4oD9X&-gIKbOw_Gd9*AJmp)#rP_I6 zjlME_u?w%P7>4UXnBMh?D972#w1L5<3FYJx%_zNBIGv$Cq!nYo^wDP?OM=|k%AP5P zii2r^#4x;B!9>{Hc~MNsj5Pmdj9ws&DIFV9EdnwHelghI-Gq>bjoXiy{aLy+MY})6 z!t2=vFr6KtX_b&I#+h$AnaCQhq<#=+(q2W+ZNysJkI&)c362vZ2BEc4lMo%m?=B$m zz#f$cqT*y|EJ_hwM!q+;zp$hB&@j^qVIV+^zUmZw2wiCv@e7J0#3m7D@ap|~qA9dS z9bI3)xDjM>+V1DZg=O`o`!Rv1oecAB6r5e;*-@!msI@WUkjLb z-UCiCi(8MtXvnOwtBIcB=yDb0Xzu(O*0EPv2#>IG0NuBs%XbbB7(siP;K!$9IwN#l zxf>W2O5$`97xD*2n9tigu2$=~N^xl$XGKHK=x(+LZo(dJ$R40r1>ssBM9TM8;GhFe6vk;0^)oW!K zKy#YmCXz{iPs@OU#GZFBXxQ?C$Wx(s@Kq>LRl#8^?D7ItB=G|Il~B_ynd%CB>Zc+i z)GCU_AsaIJAFS@oh{9Voz6*L3LZfzDy$+m)p50yXY1jh?Z9wX(<`gJNK1&a5&=nl+ zrVbS*>jd#5Lda0z9spf~Lxhs6 z2-SP0kzgV`DOOI%j4Y~Y?iCRJNMpzB$IzC|P-Ei$L!hP8&| z@Jb;Xy4SZQZm=kql|n69`lLH=@o8b!&|&2MYnpWIZpG(7aBSKdDU|0TR3JSy?=0f7 zlcssoGTXWHAO>p!(5LmrS({oU-6R{>%UK&CHpph%^jpPtpc3GU==WQ-Edy7Y z<%ibz+Nmy~n$$W;eMGK#B6qMPPU~r?tQ=@D+k0{i>!ZudSEnpokfLobpiaX173%#Y zg(kDY<1deXRyQ+cJp#8HLTSI1(Nn8>3v^4oKszNv~PfzIWe$-Zlz^pQQl=GAd1@aM-S zr*84RDBOpR8!A;-`qzi+(s(F=gB>0rRc;~Zy2gb3`R*qeQ0x*hId-fO(pwfOWI57W z;8B~i{gP{4IBK=}30K*SIJV8DGdrBgIlIOInqoRux8f6XHK{nS9%_yPoZj{Lch&>_Nxc1b)waD7tt2o7X;PRtG{OOD%`l2GA`!4Op% zl;qbW0=SC|w^qK^FHJZ4Gu}$OtG zLSE{)%fcu4poqr7$3I}M+gY{d?J8G^e1fjTdORVuAm@J$>Iv48n27kIkv3;EruvIP z^t3GlB!0;@l@F#@2H1`e#R1)%qu}BGo_1%4r~9Rl5B8-L()7d%$i@N;e4xcEsUnBu z6dRF7zs9&3LaVsVMu@u3yQu5S%;!se7mx8#4C1?=UYk^4DfO?($KL}E4EhTbpkVZX zcJuI#WcT~z ze?5ci*HjP?ZGc_&?@#3Vz0U7vDgCOn1pkj;;%_G_{a)qw6F+`c@kae)m8Zqz->dw7 z4#BS~^q7CF@^mV}?^S+(IQmzWWx#foAOF^W{)?U-mHxfT?~iQ$suGR=$0|<`aQzpuIeDg(m%ROa^;*x!GT-wp3y1-gZv3jDIaf1moh758hZvDjZze>diSukf#0 z_1An5kYITbkiRL{->3hpxcKMk=!*X|{fE?0kcI@@;y^$!0Pk-AH)bkj;CKHI<8qgv literal 19748 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

4L z6xtIZFWYefgmcVO0w$~POxUYtJ>T8LwX|Im$b|YTG3ZV6i&G6j4#9X+X%hL_4dvHy zE^QlgEE25Ay$ooHO@_LkID+p(+E49>LGBmB7~vUpbTQV@owIsdl^7b{pC3NO)Q4iE zU^7D&rTLED#+j8d;e%n-PX#`vnRgDrR+dS#{8yj8BHzN0h_AIt!@=6NtZZu(p%cYm zVz8v9E}#aRpN18xeVk;`VECb6z?jg6FiS#VIO7o@^WN2F1fPb5<$m)KXl2r@#a1tY zURZHtwPkuc#U!_w2k+2BinErTgFX-zayZyvY^Xov)mFJO{Y+QiT zvWA+6qO^&wb6wGXSusR0$RHlgBwTCr@bLCcZ-)@04S5o6d){dtduiiPuJr$Ks8uvPv2fLfvYF zDBtkH&hych40Am;{IGzkSIoX791)wO1(Io+{}fyFi%Ri~T~!ALkWdXgQdTLO3=x~_ zxIvr<4S|ZX(tTtp9;r zIDoCbX4|zy|7$e691`nvf)v8P1iFVJXg!NlJ>--F5rkufyjSdcr}e%_x<>G8$pP2u zD>2QC`puvGC7FEz#zO(^I2ib`sa@NAkX8FAjk93^Z+t1{7w zgwT&1^5Cfu878QlpwIAGj}T!^ZQ@%sZx)*@UWW&g%qrW2C(_!SS8rOg&mjo3{cwfp zVDoz9Z_{~Vt&htdFL`QGI_YZ)0XE?&0>b8V>Ju0q=wYIx#v$-%-d7gu%gv7++_7Sm z-;ecaR(Wb@>VmecrzL%KLQ1_yI2`Ou9{JLBo>l|iKEh&{(jOA&C!_7@55`?!v*=d@Usz&zn-eiI2&ah-^Xk&ue zC6|=a&K@?rXu1!7)*PjGJ8L`4fm%*pM{f9WhM!9H^SR_^Ucz8t%9O_rNY;!FiK9rO zN6Hn?HS*#;Qfet-kHgNz%lSlBoN0S~97XEngVYQ^*;LlK_nvQMq;#Fai^qWikEZ3@ z)$10dYJfpG_Ceu+V=NDWVVa%T1r6@Fz(Hv6o|`IioiG#^vo#bOI-w3t{d+^%{lLMM z{LdH~Atf~Fw;M!`Pi(RMD8YzBuJV>TbF^d*P{0_SP%pJ^{mgA)Fuoxt=sHC5Y0&$S z@#;JJkohrH794s-#9sDPz8hY_st4g?Lgd2`FrB(Q&deW$USh65ow7<5%iwAfAoqem z${B632bQ^^V2d$o`Q2>U7M0(>1c{;BpS(YV_}R;HZobUDQ^ImWpZEf-HbqPk za~tUzH;+F=2@|m9_Ltaqk3Tj4S1IY*gAl|f+!(e^;Z;iitSpZ1%#q7wwP(7;oKLpn z2})YBOCjl$P_A(20tvj9*VWS++GSDBA!tglKRs?UsFGk~HN_$&DfY%2mV;?PGoHuL zmOWRfIVXr7MZerlz)Vrw&8iFwSvz-&oF9dSjfEoxkh#!<8DO}L9E@G%`l4^6!Sab& z7UG?ptQP(@foXz<>`1iAhKN&N2*S%RGY+E>TrqbNPan-}yBfR2mB14DOO&uuj~b`f zeFbx)TgMuWwz5QR*vM*|TJIj2^?1G142;~N`ZV+mh6%m`F&4C z9l;mViufF6SLpdPtk1#_u(cd-Wb`{672EPYd@Cbmmh0ogcW1oym`4ngYW>Gi$+_?jbnvP?+t`R2~`;pW)_(@kU2Lf)F=Df>f3>nnFx zcb%hF`BTTsjf+`*uZPvC;og9?osjN@;nVB2+d22!EjGrsmDT+%&r@!}mz<4xg?G0r z7uQq|j-NYrqGS4xlCB0#k5}g_shz^#IE^DVsf)Z;_Zwyb%d%V)N(zXsRE?j++ zI=$re@{S#^Hyvyo9j>l!7}WBFy?dPYI&V)cZ%T*nen5;amy{lEq3$Wn89r1r(O?o> zwQa?;9=6;9?=Pn3iB?PZ)~*kYTW@Tut=4RuPFp;{ek@eyunKgbL8#v2a<>3u1r zDbVK>lYGW;wp1Y+qH~7Wt;!R6aO1rO26*!@`6TDbbMdNefhjWG$0U%DCh@VyN>d`v zJV;E+bteK?8!5_N$aQM&)>?zg+IHc%mZ3xxI5C7LN=qUx{B)(t^(O+V8w+b&*~uYJ zp)`59C(7Cwl>vwbIFLI;A2@cksV_@9yQB`pO>wqtpvV!941KVn-!uQn9PaPrn~IbX z*-ltz-PavxeVY+~QW$qMi5$tI{2E9Oh4qrXr$ItLYA=E19h7>p=U6@F(#$5syzi$Z z?xkBYQjg(DvM3&P`(@nIA%WgR(Y`LnZOIgw^ORsc1C|f;!KVkXLs5wAJZ3?qAI^IS zTwZ<$;oNrXRNX2aDSN_wjTb{s%-8c_>XL4gqeAbjBCANBC=3TkDqgEF7vX_^Tm|{CM6LULCz{r^Ntu@2?PPaWE_fa>Au5yG zA1#_unF z0mXo1CSb#~^v{rOgJL5I(a^tyx&sO6uJQSVL^zo=;}JR+b8f@6nOyMMtvn{VsB=j2 z->Vm3$GBASz(ry-OE@MUKYK))8Mj}D4Vq7n!e_@spinRF{J4lJ?7DbW{3@xOyBc~mya;Juu{6;CXhdcl#nug41&RuohY{&GW0(Ksfv>;VDM&* zc&$FJ7we5D_);2ZV+v8MMq)+|$j#&0RV7W5_*jq7?3tNNgJ;AApWI67l=A~= zrkCiw@yQ$DXl>OdiDYcVwuKV!D~wlJ;IST=BX*HVtQE#!k+h%l(@zi~`JSkK>c{81 z3FVbPC3_s|8eiy?QcM0=C_6|4S58ra%IAW}@N4{8sEaJh3@p~OwdW~pk0bd`6Cf{+kvv?8w@aBA@$M{+TG9XQcMA=ed*-r+Y?LXJspeD;~AUW>rB zD>Rh}Qx~!1)8nL=w?@~F)89vfpt5G;_|P!)m<$-gc)a(&^XBmi+vh2d8$oxpDC;w9T{im2~2F?b2up=!A=4)2N(qX0dnZx31>Ui$MT`$kU zZQqQ3Z#gkU(L9e|z`DW7eeX{=l~{X$U2U9C7;Rt930~btLlpfw{K*(Q97|(5S;rkQ znW*135?LY`tjCsWqGQhZ^q;2BPKs4s#fG%`7{6k$Z>Y~NRG6bZYdFc(at6*cn-YUB zYjML;)x^Zb>KIS~PT7qFXbXPITwFJlNO2u<;kt)1=Zf??71N^D%NG1JOD zsQWB9GxR__^Vg+g;SE%ohvTbo9x?|n>y#klIjplNsaKz?staRQamW=8}1>stFN!iT=7+YjCJe$uu1_=;Gb+6TvHz5Fq zUzEMYjuvG``vUXh9oR7C0b{F-ooD#U^CZWq{%33KS$rH7Qo#RNOfp zyH^z!T~lO=?|`Z`2m7U$TB#-}M+UeU2Ni{=Xj(J;p22gX7IR4xpThhcIXB;QJ1Fat z%2urs$)t#EI>s(3c!;{K>RNb9*_{d)n{6aF`$2P>lT8UO^T*p}t19+Qpr{WTED79R7e@*1KF*nul=dAZsB6p&XkufT$~)l(p? z)b}UA-!9o)JaSh4`vr4>S+$y*JqDF9O!AAonU=d}<`yGg8h+9w45rEaM8Kf}>NPh1 z5lEB11QCJ*Y1&6mfi%V9xr)iBKpNv7ibVggwc=wSt@0_5)?IeE2o9vpf&*#IQVoWW zfi$(r>ndpy{!-_BM>pQ0zJXO@r(LC)BRD5-eB+kN0=!Ab&z2ZjHHBxeB~~yf0nZxw zRCg!B;$rSC^{PA%;Pkl)*^ii{C(VF2pX>##cI79}X$}sj1T^(6_E6zkq0GIO`5Bka@Rq@*p5sR`0+7U9jP*|16rqp#r{?dAIy8SLI#U-tQbtqN3;e98TvZuQohgnPWD|y*piV5*~z4S z4AgPH^J#hLTk;A70E7XGkbMY3eh~2R-n2p`08(5bYXBysEj$_t1SCv4cBHm9{4+Fm zz=n4+l$f(O05Ttbos`%Y8X7}LiC7W>ot8OY=qqGBVyL2zFpM%*pXysbL;?@Ye8eB4 z>LkCyYyV#YXissur;35;B8phPg=pxsVu~dBi0!I@@K~hzXm7gx3eg@^qQY`L?wT%> z*c-ndL~8*TSgtknq`@8k894^#nf>?3aVK7qT`prwu;B3$=MRNCZqw7*gU=QHrMZ@k zstvUl)+t5{uBCW0x;r1ubVt>aB(&5y8jE;wDY!b*b4Qp*O*F|0IT=DS4%+`9{Kvl% zo{LYdvH2xlMFn?XimUR)TsyM$68W~o*k#t z%yV=7s|w8=msV=k!s-LI>>C#qr>`aIJI&iuCw74^2Rs)&_v_qKmpz?fEd7}(RGh%E zW8nVc0kJ|%*zABIP;_n8jD#7-TV?4gUm&)NYDUeu<+Lk;KW=N5POw+E7=f`ixj+ulQRnWD zu|~s8CJgQ%U*lm7(5fxyn+by{DA|aC$wZhi++O}WHhtKc7be$pNOsHqHDXdm0Z1cAk>55h>GKus!TtZ=@UiT# z@bUKS)RJ4PbY-dQ`f#s@5l}H1kg-1Ui}SOK3t-NhKXIP!P7b91-#CvE zk3aeU;5_#)&hPz2Eun>;UGu%FAQ7yVDD?O*BfseRshV?3R`>RwjC{jC8+pb*j69OZ z|HH^XswEzcJXkI9WaPD;jJ$`wjsC%fqXt+lA$<6#mOwoOa1FVesBnBepk1Jp0IKg` z>F6O5puBK&DViw2XP~-U;4{DbhT3AOX1b^!`*m{m0(r+%Z!+xbo~rAdQ$w2Q#YOR# zt1;)RJLt3k$>ow`O~+k{DTT?N!-bdYrWH!sE=53%`Z^8xA(-U}tEQ)wu%SMCSTzsgSr@-}CD86{H!Y#nQTwErI4uscl6zE4*tT$-7t=f{CQ_}2-OVMm zF+hnaR>L0V^4cn(#55}g_g^ZCWGe=bUn+`JD`7&ton#PpkwlGGEItB6qV@@a*m}nv z>e-#-{kcUAvQF#%O{OWgW@xAQ#z!p_V6p%5zkXN6Fw z)?e+s`RTWpv47Zk*Rl&|u$|vbf3)*iU^_4WWan>+c=0G|f3x$CoS*r{c@?l@<5q0u zp_dcc!Zojc^YO{f4>Y?fUfhiTvh#(1*!hJ=J73-QuJ5?dFlS^TKl!ZD1$3QL>b_9& zt?7~SJr^&&-8FsHR-G!eN4BetOB3B!yg0ou?A^FT5I`+$D}Lm>8kqAS!g-Vv_L;9K ze3P8)j3wBRb`ad>DVNu`;>|!;yqaSvElq5RG>q@9VHMM7{`i-A^B+~`TD#%Qb=)>U z{}2gzc<|3P@weV@Ux7tJm@gyi`)@_>DeiN79I^ zOXm2YiIM0}Z*I$DzFV2gE>l*tvr+VAG;zELVK7m5B=M$*XE?E<=xU?Le^hI%=*6Ix z&WP4^5yfy~Wzoh4eP3tPi0Q0vPSkzGs)UGl4}%MVSeO4A>e(%s-~$>2z!#7X9f{!$ z4~2#XQ1#Y<5M%aU22ew5Z40Gafv?w1|WFg0*?U@(2D4N;zG~}@RZ(} zLgA3Vlt3`H|KRnL#pk}JR>WFOD;4oWd|U}=PsaaIPSpPB`uq>ydSW=VItl5Uzq&cW z2l4&}?ajaV7t&AW|G4x2ap(Wnxby#f|N5^O|4Z!*`p*sQe{Nv^7u>-9JBTjC2aE^@V!f7KOo4{ zD?WKuRW^Kd@AwcD#Y-EC}%1~vOy+1hpyF2RHblOyOgTx7=ebH{&Au*GhFG9m#W7Hn`2$y~3XFVc7T`QDom~;n;aNP5lWn>Q!f$Gc>8GG~!O$2%3mJ zm_qWX&Rmy{b)9ox>dJKOTI5uF zWlR;p@dkUUzjj8M|6Kew#bNlN%wGmqe6j;(*41YH{%{%N`TPE0PwM>J?YSD;hpTg; zg=v%fLKur?UK`mg>%q{&cz3?D4mpv{sH^siZB%>yXM9tvN;XpZ@p%FLoZN8sQ9WvQ zL)0eQDU9habg8kLx)cgGzE3xQ^Gu;}^>96l!}!^7)->)0V}ai|1(yU|Gx6Sd3u&Xk zsYUQgLkFp`WRK(nNj5ISnvvPDcgi=I*ZkHNbJYx}#Mf?gIJw)_hXb>x>Y&ut3TI!G ztrGgjU+xE9Vc2s!8Kqp&?G5Q`Iz9fw;-UH~mT^dR<_C6;Lx7z+D591XJ(fQRZ7o4Y(IK!Cwv{&m!@q5u^-jYLV|e5`T6Bk74!#w?;XzU%4P~ zEuHo7yVb)ojUhf1zO(1-j^d5xp>|)Z!6JIDL||>OfKRhw3}u5Tr$hn?{AEdFlPx& zsGyhhaXG-vV^HfPY4>@DOYrF&mrKN&UjoIdq<3tE#RPW~<=F`Sdz5D?Y`D1?W1>{< z)^8IOg-|n&ri%j;McS81vkYnUYU@;f#rX<$*&g=iwcKi}2irsa zVG?U1-^2Y1TC;%Iia^ju9qI+(;?fn4yqi?zFiLQ9y$dOUK@c7w zE>`n;d=vAETs8&~vl`%yd5cN8m9YCiT3ngS5!qmQ*)EDFnP#n11FhQU@u(K{P zv_l}99%NKRQ2=rhQK5|y2PSDe z1GCpRPf%h$H5N50TE8MOE$l#LP)>gS3+gFZ2-Q;n+BxLL%z9Rlk`k*TBL}&-_^^FJgY8Nk;xl@+p+3 z0>ZWj#5A57|hI+Ng5s&*87h=x=gy_=w2^jR#}5*=U{msFr&7c}G>a4D8MmO-<5gv+DaceB@51|B z6KhFb;HxrwE!ea1b&VG9GhxFCrMg_b+1KT4xj}c8S!Kn2a8$l86^^85;4JP)yw%3A zV2Gq=Uwu5|n`jR;kj31CZHd$ydq!vcQ^i1Wh0>>aQYE84hA$>^!C*l#TXH!o9X{?-VHsZNKku;`pQl{R3Fm%QiO`=9t2QvI; zIg7R$cAAB^;nYb3SoPy|sW0O9l9e97;Xkjxo($AV?gh7j_fBl^kr+7C2hg`Qvan-f zeEgmgEn^AE@=U1oxskqXK^G)T(R7(;AW~h>R@RrUD8sI^i?Hc7;t%LD52>jPrKs%b zjs$jdITk(4T{<&r9L0bNbDFoQHklf<95O--8SIf`=hJBPo2L|g44sysT3NeWsWZf= zy#~7~BPT@6bBLcMorz@9qFOUH-fS`t!}Ftv6NxFMMf~iZni09elBisuR^CMg=_a=T9V}A# zUX6la+v#dI`rhXiVu4Pd&KlM0tMm!GGc5#D&Q~EanXWP9luQ{0n=xO7XUoBo@2G=a z!^~hvyE-Ko6`$<)iMb(SAK&^(Cq6gFaGI5*S22G(9}9RB6#f-=z`6E7{X$o=-*Qh2 z6~34Uxz6&;7Z#N|a zJ_Jc>%KwDC@X{?MaR~7hT4MGc)#Bh7$kGoQ7Gr(wKdSu@MqWr9a#^8hiNRU1weYEr z_2bz#@+?I2)=TbWi~N-f*}+QEzlyR44j0>~@SV$x8zoF{bmQOv`!NQw-~xAF?sortRB#iMX>?ZWx>44$XkH3JEDj`$pbR++@6c zcgUfVLP+=!vprBjbG#gE9^i3HhHJ^FlP?jfm12?4yoq;sP(|r1Fl6x>wCgaQi&|OQ8(G@xzj3iPveSKBJHv5vmf*B9pY(Hf88RVi%0E(b%~^6WUO;N@eG5#+ z#8+GNw0!Y82^WsVwBB@L`u>5b2Gi)I=E7Ubu&SG{IOz5xn#ROia^sPY8?QHfqqFRO9W~pFn@sF_TWkUzFIeNQE6spo~cB0?{etTxwxOb2F;d z+^&3ku7;M*a*|!l%3~a{M-Bu3(uIwR-C{mEKz1SAVlg9|der=AN@DemFy7N^U zOR>Sgw2oYqNGMJNDsp^AqROc&v97=D3WW)F`#s7l+g*C@2)=5-)(x=to7yEmk}$Eu zdL*w5sO6{Mn0%Ap$s4=F;{c=(OG@g7jT26b;{fZvl1{1<=^ zA$ZY&0sc1i!0#x(Ki>K$3M6>5`Wuv|1CD_{YoJM~3omQJ%CqzoYyvdH55BkLGVt zo&*rTqx>F3{u70n{%=v9Ldw6R{2rG36NMZsk^h^~eG1b3j`Gjr@_6d|kC(U43)a6y zVR?#r{QEFS9Dfhz>!`yNGJII z{a*2RZ|Tp91fu`d^ndtHzgPZ!d;POAwfIxzf3eyAj`RE0^C!+52>{@4HX=nC7;tVA R000yGAqw{M1|=W=`aiX$Ej$1K From 9cda541b72456f356ad822b47dc593a44bdb3d0a Mon Sep 17 00:00:00 2001 From: Mariia Var Date: Wed, 3 Jun 2026 01:02:50 +0100 Subject: [PATCH 3/4] Updated golden files of Integration test - resetting alignment time-series factors have slightly changed the model output (mostly fertility process outcome) --- .../expected/AlignmentAdjustmentFactors1.csv | 16 ++++----- .../expected/EmploymentStatistics1.csv | 12 +++---- .../expected/HealthStatistics1.csv | 36 +++++++++---------- .../integrationtest/expected/Statistics1.csv | 12 +++---- .../integrationtest/expected/Statistics21.csv | 12 +++---- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv b/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv index 6d1cb2fca..ef10d43fa 100644 --- a/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv +++ b/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv @@ -1,9 +1,9 @@ run,time,id_AlignmentAdjustmentFactors1,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 -1,2019.0,1,0.5623931623931624,0.5619047619047619,0.8590878148400273,0.3333333333333333,0.44308943089430897,0.43822697265011,0.5445244410761653,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.46535641588110904,0.44388496690103335,0.4705375056413739,-0.279462622342386,0.05029585798816568,0.05113363440615968,0.0,0.281711358843025,0.3023858368396759,-0.613869665517935,0.5387792565396972,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2020.0,1,0.4572025052192067,0.5439252336448598,0.9011560693641618,0.4639175257731959,0.4928571428571429,0.3284644194756554,0.42614440773949974,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.46203656399953613,0.44281420563924695,0.4648045911203806,-0.2659197918000082,0.04826913700633837,0.04996578478889472,0.0,0.29220583809810413,0.2760101854801178,1.5824384150734823,0.6261676222379695,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2021.0,1,0.4908722109533469,0.5415162454873647,0.9236131280859715,0.4889589905362776,0.5,0.39237581825182904,0.47211350293542076,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.39809788164553633,0.46415923362147143,0.4451259300414946,0.4776386065456221,-0.25543875103684177,0.04734895191122072,0.04833442666835588,0.0,0.31303030303030305,0.27926552295684814,0.6108032645394403,0.6330322580645161,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2022.0,1,0.4772344013490725,0.5787037037037037,0.9318777292576419,0.4968051118210863,0.49166666666666664,0.4214630523579651,0.4913023037141514,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.45305412911862847,0.5097880138188646,-0.24930347300809638,0.047469879518072286,0.04938041570024613,0.0,0.3028588445503276,0.26489490270614624,-0.08224154272219575,0.6154919748778785,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2019.0,1,0.5623931623931624,0.5625990491283677,0.8589656345695815,0.3341584158415842,0.4426229508196721,0.44052863436123346,0.5452823039029936,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.46535641588110904,0.44388496690103335,0.4705375056413739,-0.279462622342386,0.05025868440502587,0.05113363440615968,0.0,0.28154170430593195,0.3023858368396759,-0.613869665517935,0.5392124746118063,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2020.0,1,0.4978813559322034,0.515828677839851,0.8992361927144535,0.4641638225255973,0.4933920704845815,0.32093198045847426,0.4190655969797074,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.46203656399953613,0.44281420563924695,0.4648045911203806,-0.2659197918000082,0.048672566371681415,0.04996578478889472,0.0,0.29518619436875565,0.2760101854801178,1.6128880808812671,0.6256224535989136,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2021.0,1,0.522633744855967,0.5334538878842676,0.9188473978241694,0.49050632911392406,0.5,0.3835774865073246,0.4631992149165849,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.39809788164553633,0.46415923362147143,0.4451259300414946,0.4776386065456221,-0.25543875103684177,0.05064870259481038,0.04833442666835588,0.0,0.30357688780189546,0.27926552295684814,0.6260778621212384,0.6321115796302303,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2022.0,1,0.4809688581314879,0.5720930232558139,0.9282768777614139,0.495253164556962,0.492156862745098,0.42316176470588235,0.4920856610800745,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.45305412911862847,0.5097880138188646,-0.24930347300809638,0.04760753987433543,0.04938041570024613,0.0,0.3075771188978736,0.26489490270614624,-0.030286161899442665,0.6137847948766724,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 \ No newline at end of file +1,2019.0,1,0.5623931623931624,0.5619047619047619,0.8590878148400273,0.3333333333333333,0.44308943089430897,0.43822697265011,0.5445244410761653,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.05029585798816568,0.05113363440615968,0.0,0.281711358843025,0.3023858368396759,0.0,0.5387792565396972,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +1,2020.0,1,0.4490644490644491,0.5430711610486891,0.9006183745583038,0.4628975265017668,0.4928571428571429,0.3294559099437148,0.4270193670288144,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.04911932522947159,0.04996578478889472,0.0,0.2927051671732523,0.2760101854801178,1.5821116748810904,0.6229102972744422,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +1,2021.0,1,0.4869215291750503,0.5420393559928444,0.9227951948432465,0.48757763975155277,0.5,0.3946153846153846,0.46794871794871795,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05611866501854141,0.04833442666835588,0.0,0.3145210494203783,0.2792655229568481,0.6144920895048563,0.632198783486476,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +1,2022.0,1,0.48047538200339557,0.5859969558599696,0.9292551600358959,0.4968454258675079,0.4911111111111111,0.4233060312732688,0.4943127962085308,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048714144411473786,0.04938041570024613,0.0,0.30343569474004256,0.2648949027061462,0.0,0.6114969135802469,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +2,2019.0,1,0.5623931623931624,0.5625990491283677,0.8589656345695815,0.3341584158415842,0.4426229508196721,0.44052863436123346,0.5452823039029936,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.05025868440502587,0.05113363440615968,0.0,0.28154170430593195,0.3023858368396759,0.0,0.5392124746118063,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +2,2020.0,1,0.4968421052631579,0.516728624535316,0.8993448481238833,0.46539792387543255,0.49336283185840707,0.32274934628315277,0.424,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.05358471843215083,0.04996578478889472,0.0,0.29526123936816523,0.2760101854801178,1.612974117630252,0.6220344491387715,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +2,2021.0,1,0.5205761316872428,0.5346715328467153,0.917028670721112,0.49226006191950467,0.4981060606060606,0.3816240945482272,0.4680954700438383,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.0693359375,0.04833442666835588,0.0,0.3032316520688614,0.2792655229568481,0.6963461123195624,0.6335985626283368,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +2,2022.0,1,0.5,0.5669781931464174,0.9274832419256551,0.49528301886792453,0.49616858237547895,0.41851986875683556,0.49280742459396754,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048666007905138337,0.04938041570024613,0.0,0.31293759512937597,0.2648949027061462,0.0,0.6077348066298343,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv index 19826eaf1..40f4062bf 100644 --- a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv +++ b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv @@ -1,9 +1,9 @@ run,time,id_EmploymentStatistics1,labEmpShare,labEmpToNotEmpShare,labNotEmpToEmpShare,labUnempShare 1,2019.0,1,0.712445288628293,0.0,0.0,0.15533900404657694 -1,2020.0,1,0.7192882213696841,0.07632730946234145,0.4062992125984252,0.15141621092155744 -1,2021.0,1,0.7567169069462647,0.016856441169903997,0.3763955342902711,0.10468545216251639 -1,2022.0,1,0.7671254930371086,0.024914356898162567,0.29037149355572406,0.09820494244546406 +1,2020.0,1,0.7179465983301645,0.07705459933888066,0.40707497360084477,0.1521864925188063 +1,2021.0,1,0.7549962990377498,0.017055655296229804,0.37520042757883487,0.1052718151163747 +1,2022.0,1,0.7653805193741297,0.024130966301690232,0.2925531914893617,0.09838617186859998 2,2019.0,1,0.7128238983330583,0.0,0.0,0.15514111239478462 -2,2020.0,1,0.712516404199475,0.07951725693661177,0.38656795346377576,0.15616797900262466 -2,2021.0,1,0.7503300330033004,0.018074343526202113,0.36666666666666664,0.1117986798679868 -2,2022.0,1,0.7626559356136821,0.02367235780873573,0.29466192170818506,0.09995975855130784 \ No newline at end of file +2,2020.0,1,0.7118686034995048,0.08054987502840263,0.3896863370547581,0.1563222185539782 +2,2021.0,1,0.749267578125,0.01794526693584567,0.3625701172870984,0.11368815104166667 +2,2022.0,1,0.7578534031413613,0.025056215868936717,0.2981843575418994,0.10258507853403141 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv index bc7752b22..ab2d0fb5d 100644 --- a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv +++ b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv @@ -2,24 +2,24 @@ run,time,id_HealthStatistics1,demLifeSatScore0to10Avg,demLifeSatScore0to10P10,de 1,2019.0,1,6.798653101737303,3.33,5.0,8.0,8.33,8.33,Total,8313.63015908381,68496.43000000333,47.53391960297742,33.416,42.19,49.52,54.79,57.73,10075,51.020747394541296,36.17,47.59,54.51,57.49,59.64,11.50302729528536,6.0,8.0,10.0,13.0,19.0 1,2019.0,1,6.82559311740912,3.33,5.0,8.0,8.33,8.33,Male,4178.113558218262,33718.430000001055,48.500955465587225,35.652,43.66,50.86,55.197500000000005,58.15,4940,51.79769838056671,39.08,49.0,54.77,57.49,59.31,10.857489878542511,6.0,8.0,10.0,12.0,17.0 1,2019.0,1,6.77273612463507,3.33,5.0,8.0,8.33,8.33,Female,4135.516600865757,34778.000000001084,46.60360662122688,31.608,40.8,48.87,54.2,57.33,5135,50.27330087633859,34.18,45.74,54.03,57.49,59.89,12.124050632911393,6.0,8.0,11.0,14.0,21.0 -1,2020.0,1,6.620750547143055,3.779919704698525,5.233206491021548,6.733308823057603,8.17063065506178,9.463024707239343,Total,8241.253820548856,67657.44984125489,45.95746762744464,32.83866992060202,39.425043675855456,46.37967471166754,52.93963038300623,58.81271290479315,10219,51.32172181435569,37.55516937775139,45.46289011822666,52.356086919490465,58.475042153950085,63.4339470157204,12.651926134337847,5.742782402250355,8.792122676148566,12.293970728316063,16.168501560117733,19.98785436940258 -1,2020.0,1,6.637606389576152,3.8184159451999298,5.299490015381481,6.749271748246258,8.150940414570025,9.466586308302135,Male,4153.954529668203,33267.68322455567,47.22862141983931,34.82339955801986,40.98349218982254,47.500410694881445,53.82660919879816,59.649314701163064,5012,52.05924889391922,39.16596672669863,46.19784549832359,52.808808045992805,58.89288736674495,63.85178400872757,11.919314795782537,5.278346567220785,8.195301759955324,11.639061952083665,15.323831964540638,18.948287966714712 -1,2020.0,1,6.604525949049183,3.7542909938761984,5.1612627475354165,6.712398015040273,8.190313687617444,9.459183136562523,Female,4087.2992908806623,34389.7666166991,44.73391801970805,31.3476775575153,38.126890509817606,45.16529691023474,51.830234772441926,57.698535261855284,5207,50.61181481939273,35.91486366889823,44.48667591974852,51.869378728424245,58.05999020625031,63.01298089104152,13.357101480763502,6.210797928803866,9.446619909682243,12.963159237168462,16.860786748427394,21.025972100196174 -1,2021.0,1,6.6269972645495825,3.872785671703136,5.226815865514426,6.713893639675902,8.166991834156136,9.457425069064628,Total,8194.164909285311,67409.81617499836,45.74228623248273,32.53388035232254,38.892834838175816,45.95678792383191,52.824583617119444,58.78592521668164,10172,51.59268885368547,37.9972442656076,44.988351045396506,52.14065321741188,58.85053984429855,64.54634729536629,12.860204717103832,5.848003945874805,9.003305960423488,12.724569872084416,16.525955667284457,19.905573091843863 -1,2021.0,1,6.65743428786115,3.9339645954492277,5.2730625289337905,6.717911971166861,8.20030266767493,9.462800031747925,Male,4107.772422075325,33147.365319260665,47.02083785166053,34.221479171102594,40.321473982257515,47.17192009825044,53.82705386726819,59.92116744196057,4979,52.17181541274111,39.26479218156785,45.717031248619406,52.55715634693674,58.998310648441596,64.76510379088934,12.266392568855066,5.275596437408333,8.557966496254549,12.142337404754137,15.857702137053412,19.3437473150315 -1,2021.0,1,6.597814530278737,3.8109663091051518,5.187076069817955,6.704770968536875,8.128114341609681,9.452951245078125,Female,4086.392487209991,34262.45085573748,44.516422856421826,31.118223339069093,37.25605973916984,44.65695056624028,51.74427010165252,57.710507660536265,5193,51.03742770646095,36.73480487734666,44.181194483190296,51.72496882010549,58.69069723278915,64.36287632817056,13.42954627037387,6.460683568402761,9.51011717079545,13.316232401572057,17.13494143192364,20.379365691565873 -1,2022.0,1,6.463388875563361,3.61869315523015,5.083590332734711,6.53162184831892,8.01705285177274,9.328581977354725,Total,8221.169154325702,66934.85519533417,45.479729912361705,32.25386622000384,38.61747074724565,45.4728742243383,52.44997236735041,58.59908141364181,10356,50.94191931500898,37.117052142304914,44.12608111089164,51.33013529495807,58.17365919336333,64.32526055080689,12.804724585074235,5.774628865325765,9.070629036602275,12.741704993229549,16.37520856817555,19.901719612403255 -1,2022.0,1,6.488635306137396,3.6474819413170954,5.116505257360913,6.549077057656427,8.037805809374863,9.341827591201206,Male,4117.727933767086,32851.96055497364,46.60486430376953,33.36678552973327,39.730041617343645,46.56902885675077,53.43240892312547,59.78449012951627,5063,51.64737006019959,38.12239994895629,44.90136516847476,51.957597094541036,58.54307918449458,64.87917754397607,12.25063538973118,5.4263415053653095,8.612676774591522,12.20062915985358,15.725921033523093,19.287329450318488 -1,2022.0,1,6.439239493739054,3.595767918371492,5.057154809892923,6.518604906559031,7.993041249797759,9.324963022690959,Female,4103.441220558604,34082.89464036081,44.403486680980784,31.042863698751333,37.61149192938774,44.441778079501596,51.34218571819926,57.42456228308562,5293,50.26712295700777,36.106539444890245,43.332547976170645,50.71093495042631,57.74165888778904,64.04083423085133,13.334736600192674,6.193124577589115,9.60853723978057,13.31729385072847,16.94653394398081,20.452875566930782 +1,2020.0,1,6.614806277820939,3.7652355184266857,5.222159166466565,6.73130080543587,8.167188927274207,9.45956341274334,Total,8122.234182597935,66670.63247415725,45.90342611199893,32.76041987699348,39.425043675855456,46.32990279244976,52.889580175608465,58.779144471354584,10079,51.314342379913974,37.465146285572544,45.45385183126206,52.34846463570141,58.46412703157919,63.46259609758929,12.66129172949517,5.742782402250355,8.795173831748784,12.318044450919373,16.18488573396826,20.002347795486234 +1,2020.0,1,6.626682939869295,3.805744796504718,5.29191430833556,6.7436549444174805,8.14092961555648,9.448738725825232,Male,4089.700484077567,32755.693771773927,47.16050603926155,34.72060242044466,40.92513830937019,47.45773118565858,53.81656104438177,59.635697316209274,4943,51.998524755031596,39.09571334878134,46.15503257361284,52.75851350330392,58.80535525171222,63.8502526991901,11.931928480528107,5.295914143632904,8.215790931227666,11.645461286448139,15.335487311411011,18.97702901756019 +1,2020.0,1,6.603375915573099,3.7461330212911594,5.148107115427289,6.7153196174055685,8.193749301404642,9.471154701795063,Female,4032.5336985203794,33914.938702383435,44.69358458542929,31.334291564943996,38.157554028392056,45.15482563930577,51.82957716526933,57.61215428517951,5136,50.65587012909507,35.8760350944908,44.56128969365746,51.917407081210044,58.11668037935321,63.0865913427466,13.363247052634469,6.193221791258625,9.427872920776764,12.977155665563702,16.890748644600226,20.980411232741655 +1,2021.0,1,6.611655149658419,3.8628555893623755,5.222120335689433,6.7095704449233935,8.142232393005877,9.417434441271515,Total,8156.61753999513,66995.90163148876,45.69566709643756,32.45516358093217,38.87405983603978,45.901177664056846,52.75675898731781,58.75349022257982,10133,51.55096723075602,37.93485262724087,44.96105706987642,52.10947487040213,58.81202144677866,64.4353735547788,12.86972755062471,5.792211815704172,9.032797458734567,12.727740886322138,16.529523780072335,19.98479791441045 +1,2021.0,1,6.654289235536718,3.9160058856568685,5.266355327560401,6.738916812395925,8.203073631808438,9.462538650692277,Male,4079.115603466579,32952.040294377824,46.97320952281268,34.12550007799661,40.29171310693995,47.099174898448425,53.83401531909051,59.791115077297924,4952,52.04523090318215,39.12879168094947,45.64323395301296,52.467442690378284,58.870663338717485,64.49604686696033,12.293347339167104,5.201998480829695,8.608814351758165,12.154837481448393,15.879269423573962,19.461438362160578 +1,2021.0,1,6.570905488730111,3.784065602831976,5.173713729142071,6.68403775670342,8.086581747741425,9.367968579269563,Female,4077.501936528548,34043.861337110706,44.47459199599183,31.073933089580763,37.25982990604585,44.60862716316909,51.7118062130922,57.72929548136844,5181,51.07854999357153,36.741831292975306,44.19240025129689,51.74356051880231,58.763136326279266,64.38445031464674,13.420631778985733,6.394677337482969,9.507171185812087,13.290422574140345,17.130870431259655,20.424006333716136 +1,2022.0,1,6.459690058036056,3.6079702611587123,5.08081240181248,6.532069642427167,8.001919844836074,9.337537342635692,Total,8074.548513238369,65688.58820016866,45.47117344207359,32.238677750263726,38.65104181818477,45.47798121988921,52.485383593420295,58.60638612175104,10169,50.94556337236834,37.075140709171855,44.09975548697967,51.30038729860026,58.2208107693433,64.35477317872903,12.82955630961602,5.805021342228207,9.055200285774957,12.7404315092765,16.431735022502448,19.93060679776495 +1,2022.0,1,6.490948026621022,3.628183333772721,5.102270902250162,6.559616883895012,8.034049957582962,9.361019640912986,Male,4046.396788664368,32292.466432439585,46.62000860623988,33.443531575995934,39.730041617343645,46.602759360907704,53.45414622756339,59.76875867585145,4975,51.605943974511,38.089352291347815,44.875524992391,51.88949612485328,58.60570999984539,64.76416751293903,12.287128226063336,5.393530234863877,8.599990818027766,12.229801943348066,15.814146927155242,19.389938089234814 +1,2022.0,1,6.429750051545874,3.591411965597947,5.061247247543556,6.508698175450156,7.96507806086835,9.317256142226789,Female,4028.1517245739556,33396.121767729266,44.3707778044669,30.86055220587854,37.58549593894383,44.4776084895734,51.32581597939195,57.32777413476521,5194,50.31302708132846,36.10000413040933,43.40401836845294,50.70320454688626,57.911514672894484,64.04049658459974,13.349113436238063,6.2719284093892895,9.590357916964301,13.283508298491999,16.9376504076224,20.510093407640518 2,2019.0,1,6.799095596985654,3.33,5.0,8.0,8.33,8.33,Total,8323.349559890836,68562.08000000333,47.54007040856779,33.425,42.19,49.52,54.79,57.73,10084,51.027703292344626,36.18,47.605000000000004,54.51,57.49,59.64,11.495934153113843,6.0,8.0,10.0,13.0,19.0 2,2019.0,1,6.828700485044678,3.33,5.0,8.0,8.33,8.33,Male,4185.2461878088,33788.410000001066,48.517956750202266,35.67,43.66,50.864999999999995,55.197500000000005,58.15,4948,51.791240905416245,39.079,49.0,54.77,57.49,59.31,10.851657235246565,6.0,8.0,10.0,12.0,17.0 2,2019.0,1,6.770574376947251,3.33,5.0,8.0,8.33,8.33,Female,4138.103372082248,34773.67000000108,46.59797897196263,31.616000000000003,40.7925,48.835,54.2,57.33,5136,50.29211448598103,34.271,45.74,54.03,57.49,59.89,12.116627725856699,6.0,8.0,11.0,14.0,21.0 -2,2020.0,1,6.652348986342871,3.78863137067592,5.254495597644885,6.770027881654459,8.224565036291214,9.489608230818108,Total,8214.300443033942,67621.12744617529,45.9735889365658,32.8474628554956,39.43959062433013,46.33133378105401,52.961344842917555,58.80778673810136,10165,51.41441529851103,37.53280079418867,45.47243442152702,52.4481399546413,58.535546429689035,63.527991555228496,12.883073203739853,5.937607180853644,9.01641609162973,12.551675493916262,16.39027902745431,20.212246019316662 -2,2020.0,1,6.710193102304532,3.8834311428201187,5.369686180379435,6.8306410942688744,8.24132342434648,9.515741996635677,Male,4127.600955208361,33517.41454601114,47.19097513648826,34.722472930143326,41.003509230546115,47.49037709363454,53.802015026063486,59.673187364086395,4995,51.88622861446534,38.953557109399824,45.96518375485177,52.68506730517995,58.699011277649504,63.685346528739075,12.093742540403184,5.457704255587799,8.402857952227029,11.838114263466492,15.410292944239545,19.137582698541845 -2,2020.0,1,6.596462843358648,3.740802670708417,5.155075236317794,6.7132761558207275,8.198811331111852,9.46929589738788,Female,4086.699487825556,34103.71290016421,44.797410199890514,31.354448740837604,38.28101586829355,45.245863319452084,51.93415242684019,57.74577386521147,5170,50.9585724526326,36.17194245135745,44.80500584020315,52.17644471214091,58.32869026730736,63.34610429350056,13.64568571116098,6.486751867713098,9.751246494204764,13.281973246048455,17.169523696603456,21.23954038168728 -2,2021.0,1,6.640260009994773,3.8779221157658164,5.23329763836543,6.735854141167473,8.177425505101422,9.47016828986768,Total,8129.132364073368,67026.78454088724,45.83751179563051,32.52808735848124,38.95669200124223,46.07284161082353,52.849323591295466,58.91538000484853,10094,51.5025041176782,37.788926308663136,44.88364038462232,52.01659711287732,58.725263108022475,64.51192028069534,13.063388505165873,5.990420527625142,9.2075696779696,12.932194695284505,16.728005573918075,20.171354646424714 -2,2021.0,1,6.742878846223155,3.9930259314847087,5.348908868135866,6.8271048183916845,8.30087764274258,9.558016469248763,Male,4057.8016165100757,33343.5358945735,47.00196965532995,34.13338323472363,40.28857306358945,47.23824174539338,53.78807421825695,59.87609872973616,4945,51.81662506636827,38.76405717816392,45.377762681200466,52.24493701243166,58.6378816800496,64.47522357209857,12.255938754128634,5.171235908239521,8.564665985303037,12.120307251952784,15.870534215812711,19.312599169499148 -2,2021.0,1,6.541706864694839,3.7639876606935605,5.130422411763632,6.64829644677062,8.064951990033641,9.33913800529912,Female,4071.3307475633223,33683.248646313725,44.71918899193769,31.2803511448533,37.5957363916055,44.912579953240275,51.898686522979574,57.85979236986111,5149,51.200828434774365,36.99961967207335,44.35608454702074,51.82512134323664,58.791433680004545,64.53761228725341,13.838847627107837,6.93931249991858,9.975973415774536,13.718488268006896,17.529341841271048,20.84187547639379 -2,2022.0,1,6.485204962796243,3.6326483005023005,5.105649087006172,6.563705869888347,8.014347250908436,9.395243689677375,Total,8247.825908320072,67251.57546419704,45.54443113884584,32.282609882735684,38.64560066226272,45.59142972473724,52.51077814570169,58.65087991340941,10370,51.05726729214477,37.22045875891165,44.23207027933084,51.36430214239873,58.25304657127107,64.51913322105771,12.986700357542968,5.911931606843135,9.248907543220431,12.860617456152859,16.61711748456339,20.094263931900397 -2,2022.0,1,6.5591784383944685,3.742290416341691,5.17770725500086,6.6078832151322455,8.106775685489513,9.465095873082413,Male,4116.450082967318,33255.034682659956,46.576861703858896,33.24300787244653,39.69683696637759,46.63598747509423,53.41405606726437,59.77576265178582,5070,51.60385236475749,38.124757256212845,44.943056835638565,51.95198988742004,58.5086432976995,64.81874657875066,12.243248736196588,5.328131729220268,8.519061622540747,12.17114934348253,15.788434581443228,19.326331609397798 -2,2022.0,1,6.414441656893826,3.5558456961928493,5.038573411236054,6.522354784859681,7.936437424727948,9.296924060146125,Female,4131.375825352753,33996.540781537275,44.55680416438925,31.246614669735084,37.7579616916335,44.575675008891764,51.55897670316021,57.67769691479481,5300,50.53440194909847,36.20747382791068,43.54543336178553,50.809633861292035,58.06155098193838,64.28151495755468,13.697888984000695,6.551844577312786,9.926515456965506,13.654476403134396,17.340366063748217,20.78926458712023 \ No newline at end of file +2,2020.0,1,6.648790403612972,3.7983695000228566,5.247428877536995,6.765453938693191,8.214569954104112,9.498397166986376,Total,8160.523970175109,67119.53912447295,45.99266482254266,32.821783768474845,39.461025021565824,46.35410937959559,53.02358448781876,58.835433726929615,10095,51.43392355566378,37.64004187077226,45.519656409098765,52.44772412348234,58.54473483932033,63.56787563972361,12.891241611668004,5.941239718920905,9.038214182406618,12.561652076455049,16.389742385253584,20.209999590600944 +2,2020.0,1,6.702122202626283,3.8879612847729885,5.348589940680837,6.8156422092581455,8.229292733365684,9.522610106957654,Male,4098.126318497242,33215.71763621586,47.22849202285219,34.747877759176475,41.05400091483066,47.5476118356395,53.86249506436657,59.6908719208839,4956,51.91277957421135,38.9945168300227,46.05912908011382,52.68552387774127,58.71409676267968,63.78261288665822,12.09681131937212,5.465454750723371,8.409656342447645,11.851678288503715,15.415025233216248,19.120846574353234 +2,2020.0,1,6.5973577521418765,3.752745435962728,5.154152833450976,6.711522847836678,8.192529032539117,9.474410230609504,Female,4062.397651677836,33903.821488257105,44.80084547933732,31.299839260810792,38.26705188189283,45.26115460765929,51.946682591602524,57.74689782848656,5139,50.97211961950472,36.26331609664513,44.927483108460294,52.18264236825294,58.36347553214964,63.3381980500193,13.657382208791748,6.517946352244499,9.786980804629348,13.296050659163345,17.16345568379975,21.229257231262174 +2,2021.0,1,6.631287679133615,3.883261161734364,5.216708477773616,6.722507271816023,8.16926901961195,9.447273217295852,Total,8267.448721995332,68003.85514951522,45.80402254302271,32.48647532582605,38.936908079835234,46.03498659307995,52.81212437024774,58.906811140603786,10255,51.59047140279496,37.85711167349786,45.01833283555787,52.08706985815784,58.84079517484475,64.56285232362237,13.092153683149728,6.07831935728023,9.270172251798023,12.931184927196197,16.73011876679543,20.252218506787877 +2,2021.0,1,6.742569477375246,4.022672591545094,5.334846660303073,6.819951385038663,8.295124039640903,9.546422511912066,Male,4120.082366505448,33813.985929036855,47.03471109674549,34.07962265492657,40.348440610166364,47.32840968744233,53.816406583010384,59.94509758569303,5015,51.86155350567446,38.85862267126504,45.40391976874746,52.328485150762816,58.74719285395685,64.45373962895418,12.300142202537062,5.218549419494089,8.672003761040989,12.10795252162202,15.852963633700186,19.46648452710797 +2,2021.0,1,6.524784202381323,3.7529909163616257,5.116659101920391,6.63202000718066,8.045250382033414,9.330247331650067,Female,4147.366355489902,34189.86922047813,44.62617844055702,31.280525580617784,37.481817048259785,44.75594184166033,51.77970855977166,57.80692749782618,5240,51.331029275707046,37.00052896518403,44.510329857039245,51.93341905277687,58.92958915446562,64.60789355108751,13.850157037209385,6.941045654688935,9.975525387886835,13.709151416170435,17.53247821828921,20.89274407748055 +2,2022.0,1,6.49485459981958,3.6344664647608234,5.098028742832679,6.564072890352545,8.03063143505382,9.406133257326047,Total,8102.129805349514,66169.57866296188,45.54508923087904,32.21338860455661,38.67070726791199,45.569389607397284,52.5870680452947,58.7033626847891,10188,51.033119401938514,37.18195456408301,44.1882873245048,51.32093110530256,58.33901880860271,64.51956666511936,12.996007696485565,5.937835865661806,9.245214795576187,12.914365591387968,16.604284638648807,20.127843833184865 +2,2022.0,1,6.576024139361841,3.7582936287184476,5.171512681308358,6.651076971923019,8.134037012541988,9.486908631365223,Male,4038.38455569659,32728.87214160388,46.613489495024815,33.10085322126523,39.598017694792816,46.638969691049624,53.556485478667625,59.966177045631085,4977,51.53644736354717,38.07454817342117,44.8735989359306,51.850984403755255,58.51001194888701,64.73401554066339,12.277615806906802,5.3622944593315145,8.611532470437123,12.175063182053751,15.809541348327947,19.442017580814156 +2,2022.0,1,6.417329979151441,3.5665809946476976,5.031621919469906,6.497047858551481,7.954107801535328,9.314003619484717,Female,4063.7452496529136,33440.70652135816,44.52466548982069,31.247751554361763,37.75860039292136,44.54520739536181,51.46919319543207,57.58229193704942,5211,50.5523933867924,36.16281645738655,43.573460526666544,50.83731342844708,58.13605550862925,64.40158397528673,13.682140192059052,6.5485365469227235,9.911335628389768,13.668687551686856,17.24898890229864,20.757339717540358 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv index b9345e9cb..96ba35a73 100644 --- a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv +++ b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv @@ -1,9 +1,9 @@ run,time,id_Statistics1,edi_p50,sIndex_p50,statYHhDispEquivNatGini,statYMktNatGini,yHhDispEquivP50,yHhQuintilesC5P20,yHhQuintilesC5P40,yHhQuintilesC5P60,yHhQuintilesC5P80,yLabP20,yLabP40,yLabP60,yLabP80 1,2019.0,1,15256.953965109053,0.0,0.0,0.0,15456.781759590931,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2020.0,1,16063.269391569822,0.0,0.0,0.0,16074.565454914327,5.994758780381151,7.393700990590142,8.080801266076895,8.647537996276645,556.0535903919002,1428.2782103203886,2373.567367252097,3959.9436655449053 -1,2021.0,1,16428.42766481459,0.0,0.0,0.0,16431.272736785475,6.25454813251385,7.492572994709025,8.141351120715449,8.669003250539848,716.125815409487,1505.2342817986791,2451.031208467749,4124.458288347928 -1,2022.0,1,16723.86865429823,0.0,0.0,0.0,16722.553361865073,6.329422830421304,7.517117357847595,8.159016824608619,8.69947177213025,704.6141664880955,1518.971317922587,2499.3043286329507,4143.906309315343 +1,2020.0,1,16017.875413763875,0.0,0.0,0.0,16025.78909016308,5.975730539439618,7.381070828732318,8.073427570055065,8.645695057327014,609.403627389382,1469.141405159927,2401.5176840440963,3996.456622653555 +1,2021.0,1,16354.51086138939,0.0,0.0,0.0,16358.913014905334,6.227870463281269,7.492111986282805,8.13608070151509,8.664200853259567,737.3156983816176,1523.79416549561,2464.3681424805504,4150.759607270258 +1,2022.0,1,16690.411161774107,0.0,0.0,0.0,16690.411161774107,6.318883652232151,7.514412811740821,8.160250057938411,8.710171469689,771.5590174571798,1576.4285263414033,2551.7197279883662,4207.964709427611 2,2019.0,1,15256.926298340906,0.0,0.0,0.0,15450.417507924612,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2020.0,1,16484.3464161893,0.0,0.0,0.0,16504.430774297536,5.8284256265137735,7.420502937428444,8.169331124198012,8.778179962472056,598.4566969501215,1620.7426405262938,2731.4687649871457,4702.10565861142 -2,2021.0,1,16980.04396706059,0.0,0.0,0.0,16987.577552444032,6.20543568557222,7.53915907289091,8.242021677242038,8.815072330677403,816.4011963231156,1795.5075463740689,2956.5802957669907,4955.626343431599 -2,2022.0,1,17212.881002112896,0.0,0.0,0.0,17212.881002112896,6.305398764736624,7.573593988143731,8.260899811129066,8.84388227052596,773.083379156368,1780.5441979089017,2971.307912479575,5004.688012048182 \ No newline at end of file +2,2020.0,1,16431.943854802594,0.0,0.0,0.0,16453.618220334713,5.818391825850994,7.4120169593935445,8.163204871228126,8.77411874493853,634.2126456275846,1637.96284465107,2748.1796360023063,4713.014918106409 +2,2021.0,1,16957.07532931993,0.0,0.0,0.0,16966.740717782483,6.217847826271187,7.5392475592455455,8.241424114366975,8.813522210911874,753.6728440357319,1746.9474393607386,2900.445917723555,4887.21702162078 +2,2022.0,1,17161.478625887503,0.0,0.0,0.0,17162.301567662555,6.26366135568786,7.556009619907757,8.251258095747177,8.844448670386775,852.6944985072745,1835.8327951279102,3017.709599769617,5057.2303575567375 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv index b7bea2fdc..6288b8b65 100644 --- a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv +++ b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv @@ -1,9 +1,9 @@ run,time,id_Statistics21,demDsbl18to29Share,demDsbl30to54Share,demDsbl55to74Share,demMarried18to29Share,demMarried30to54Share,demMarried55to74Share,demNChild18to29Avg,demNChild30to54Avg,demNChild55to74Avg,demPop18to29N,demPop30to54N,demPop55to74N,healthScore18to29Avg,healthScore30to54Avg,healthScore55to74Avg,labNoWork18to29Share,labNoWork18to54Share,labNoWork30to54Share,labNoWork55to74Share,labWorkFullTime18to29Share,labWorkFullTime30to54Share,labWorkFullTime55to74Share,labWorkPartTime18to29Share,labWorkPartTime30to54Share,labWorkPartTime55to74Share,statInvestLoss18to29Avg,statInvestLoss30to54Avg,statInvestLoss55to74Avg,statYDisp18to29Avg,statYDisp30to54Avg,statYDisp55to74Avg,statYDispGrossOfLosses18to29Avg,statYDispGrossOfLosses30to54Avg,statYDispGrossOfLosses55to75Avg,statYInvest18to29Avg,statYInvest30to54Avg,statYInvest55to74Avg,statYLab18to29Avg,statYLab30to54Avg,statYLab55to74Avg,statYPens18to29Avg,statYPens30to54Avg,statYPens55to74Avg,wealth18to29Avg,wealth30to54Avg,wealth55to74Avg,x18to29Avg,x18to54Avg,x30to54Avg,x55to74Avg,xToLeisureRatio 1,2019.0,1,0.05811554332874828,0.09130434782608696,0.06236811254396248,0.2620357634112792,0.6720496894409937,0.5969519343493552,0.29332874828060523,0.9503105590062112,0.07409144196951935,2908.0,6440.0,4265.0,3.69050894085282,3.4482919254658384,3.092379835873388,0.0021834914718019127,-0.0201199603173437,-0.02022802981366459,0.036602920750293144,0.561554332874828,0.6751552795031056,0.2797186400937866,0.09353507565337002,0.140527950310559,0.08253223915592028,0.0,0.0,0.0,-220.98483429553175,-459.2130693789786,-563.0006789520651,1065.2273871330394,1640.3078493710213,1515.844915690792,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN -1,2020.0,1,0.05762594893029676,0.09580012262415696,0.0698478561549101,0.4392684610075914,0.7633353770692827,0.6456892577224528,0.3233264320220842,0.9668914776210914,0.0818349469801752,2898.0,6524.0,4338.0,3.587646652864044,3.391937461679951,3.0518672199170123,0.008549642581090422,-0.03472901860465116,-0.0414546712446352,0.016650019455970555,0.5024154589371981,0.743408951563458,0.32134624250806826,0.14630779848171152,0.09350091968117719,0.06085753803596127,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.138119366421,-1107.7977115375543,-1342.8712716121024,-1403.8462604199615,-2.0815536320511017 -1,2021.0,1,0.05276030747728861,0.08489542989930286,0.05090909090909091,0.4437456324248777,0.7755228505034857,0.6552272727272728,0.3413696715583508,0.9660728117738188,0.08431818181818182,2862.0,6455.0,4400.0,3.5628930817610063,3.364058869093726,3.0770454545454546,-0.021273570999301217,-0.0695849455566086,-0.08030002850503486,-0.022282563636363606,0.5377358490566038,0.7931835786212239,0.3584090909090909,0.14081062194269742,0.082571649883811,0.06272727272727273,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0780379012871,-1107.7644214116592,-1342.8565545145082,-1403.8442920330176,-1.0425592600559874 -1,2022.0,1,0.05803571428571429,0.09431092181320352,0.05558076225045372,0.39663461538461536,0.7588986918162458,0.654491833030853,0.33413461538461536,0.9637967751749316,0.0852994555353902,2912.0,6574.0,4408.0,3.4330357142857144,3.3002738059020382,2.9593920145190564,-0.017864462637362633,-0.08477753795883114,-0.09502243918466687,-0.04601915825771319,0.5267857142857143,0.8024034073623365,0.3797640653357532,0.14835164835164835,0.08807423182233039,0.06510889292196008,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.065033286826,-1107.7773722038787,-1342.8856261992355,-1403.8065814263734,1.2594818265071412 +1,2020.0,1,0.05788005578800558,0.0962708690903417,0.07024029574861368,0.43235704323570434,0.7603370260571072,0.6448706099815157,0.32391910739191077,0.9753471680449368,0.08133086876155268,2868.0,6409.0,4328.0,3.584030683403068,3.3867998127633014,3.0499075785582255,0.010829385355648535,-0.03269728651231163,-0.040868719488219685,0.01646008465804072,0.49860529986053,0.7414573256358247,0.32162661737523107,0.14783821478382148,0.09486659385239507,0.06076709796672828,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.1253033385323,-1107.798049097802,-1342.878666623434,-1403.849348866661,-2.028132400574429 +1,2021.0,1,0.054206265399507216,0.08271144278606965,0.05204545454545455,0.4343541006687786,0.7762748756218906,0.6556818181818181,0.3350932770151355,0.974502487562189,0.08477272727272728,2841.0,6432.0,4400.0,3.552270327349525,3.3666044776119404,3.078409090909091,-0.016433541393875428,-0.06719383425729542,-0.08078858109452736,-0.01819165454545446,0.5311510031678986,0.7925995024875622,0.355,0.14255543822597677,0.08364427860696518,0.06204545454545454,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0882343136345,-1107.755465486301,-1342.8363701288931,-1403.8435746078512,-1.0063929650563206 +1,2022.0,1,0.05931905931905932,0.09259259259259259,0.05759637188208617,0.3776763776763777,0.7573918456271398,0.6532879818594104,0.31905931905931906,0.9554933084344849,0.08752834467120181,2849.0,6426.0,4410.0,3.435240435240435,3.3062558356676,2.956462585034014,-0.021561778834678857,-0.08164493613445378,-0.0934336888888889,-0.04218928390022669,0.5240435240435241,0.8015873015873016,0.3764172335600907,0.1547911547911548,0.0873015873015873,0.06462585034013606,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0418198870248,-1107.7686527563578,-1342.8857628895557,-1403.8094498212508,3.2757647315505363 2,2019.0,1,0.05807560137457045,0.09109248913718188,0.0625732364659011,0.26082474226804125,0.6719428926132837,0.5978439184438715,0.2934707903780069,0.9497206703910615,0.07429107101007734,2910.0,6444.0,4267.0,3.689347079037801,3.450651769087523,3.089289899226623,0.0019464395189003336,-0.020478632743557712,-0.020652807448789584,0.036303999203187276,0.5618556701030928,0.675667287399131,0.28005624560581205,0.09347079037800687,0.1404407200496586,0.0824935551910007,0.0,0.0,0.0,-220.29699124714057,-458.1635502021104,-560.3573828031367,1065.9152301814306,1641.3573685478896,1518.4882118397204,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN -2,2020.0,1,0.05974296630774575,0.0965952857803112,0.07161007161007162,0.43730461965960404,0.7610537667539671,0.6474936474936475,0.323723515109413,0.9707287012786936,0.08316008316008316,2879.0,6491.0,4329.0,3.5800625217089266,3.377753812971807,3.0353430353430353,0.018856783292809987,-0.028078123614862394,-0.03446314848251425,0.019551420697620725,0.49947898575894406,0.7410260360499152,0.32155232155232155,0.13893713094824592,0.08889231243259899,0.05775005775005775,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.1170947628652,-1107.7944102659778,-1342.8799505205716,-1403.8486159631293,-0.9360064047972398 -2,2021.0,1,0.05324400564174894,0.08503986243551664,0.0570324926153147,0.43582510578279265,0.7755197748944818,0.6555328334469439,0.33180535966149505,0.9624824136313898,0.09088843444671665,2836.0,6397.0,4401.0,3.558885754583921,3.3732999843676725,3.060668029993183,-0.0144478334273625,-0.0625561035939563,-0.07557809685790215,-0.014234134560327183,0.5405500705218618,0.7897451930592465,0.35219268348102706,0.1311706629055007,0.08128810379865561,0.06089525107930016,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0676462766917,-1107.7466491884177,-1342.8345306930705,-1403.8575419191038,-0.7311082040563939 -2,2022.0,1,0.05986159169550173,0.09063306512828298,0.06067466606293865,0.3813148788927336,0.758463640504023,0.6565542223228436,0.3391003460207612,0.9544557461666919,0.0912383971021055,2890.0,6587.0,4417.0,3.4283737024221455,3.3113708820403827,2.9470228661987776,-0.012623293771626298,-0.08009925956527997,-0.0918986788522848,-0.039226344894724874,0.5128027681660899,0.8000607256717778,0.37740547883178627,0.15709342560553632,0.08729315318050707,0.06067466606293865,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0491006748614,-1107.774090616804,-1342.891780357179,-1403.8187757545545,1.7696141582517548 \ No newline at end of file +2,2020.0,1,0.05886450714036921,0.09736719115126967,0.07085160396953612,0.4287704632532219,0.7569714908864309,0.6478190630048465,0.3333333333333333,0.9691540738432778,0.08331410108469882,2871.0,6419.0,4333.0,3.582723789620341,3.3782520641844522,3.039464574198015,0.018471088784395684,-0.027211412009102265,-0.03302275606792335,0.017132129102238713,0.49773598049460116,0.7379654151737031,0.3237941380106162,0.14106583072100312,0.09051254089422028,0.05792753288714517,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.1061329211112,-1107.7901177566039,-1342.8783564911928,-1403.8521133348154,-0.934928925220003 +2,2021.0,1,0.05331010452961672,0.0888445603805432,0.056676490591702565,0.4397212543554007,0.7738223108792389,0.6588075266379506,0.35400696864111497,0.969157587847169,0.09000226705962366,2870.0,6517.0,4411.0,3.562369337979094,3.370415835507135,3.057129902516436,-0.0138072393728223,-0.06300491888679516,-0.07258224054012583,-0.016018111131262724,0.5400696864111498,0.7862513426423201,0.3545681251416912,0.13101045296167246,0.08178609789780573,0.06030378598957153,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0804674583025,-1107.7528128341778,-1342.8376768905243,-1403.8649689256058,-0.6340316899668181 +2,2022.0,1,0.0633356790992259,0.09200930954228084,0.059904697072838665,0.3694581280788177,0.7491078355314197,0.6560018152938507,0.3289936664320901,0.9402637703646237,0.08963013387792149,2842.0,6445.0,4407.0,3.4440534834623504,3.308456167571761,2.9512139777626505,-0.007751730541871948,-0.0754884031254564,-0.08693424918541505,-0.040447311867483515,0.5073891625615764,0.7920868890612878,0.3769003857499433,0.15763546798029557,0.09030256012412723,0.06240072611754028,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0719213185639,-1107.8033422928634,-1342.9235450839235,-1403.8230586933678,3.7453773311172247 \ No newline at end of file From 24c51e54a102e6df07d7b74f0569963dd2552097 Mon Sep 17 00:00:00 2001 From: Mariia Var Date: Wed, 3 Jun 2026 17:08:42 +0100 Subject: [PATCH 4/4] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- documentation/wiki/developer-guide/repository-guide.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/wiki/developer-guide/repository-guide.md b/documentation/wiki/developer-guide/repository-guide.md index b718e96cd..8e59bc8c3 100644 --- a/documentation/wiki/developer-guide/repository-guide.md +++ b/documentation/wiki/developer-guide/repository-guide.md @@ -354,10 +354,10 @@ After running, output Excel files are placed in `input/` (overwriting the existi | Script | Output file | |--------|------------| | `01_employment_shares_initpopdata.do` | `input/alignment_targets_employment.xlsx` — employment shares by benefit-unit subgroup and year | -| `01_inSchool_targets_initpopdata.do` | `input/alignment_targets_inSchool.xlsx` — school participation rates by year | -| `03_calculate_partneredShare_initialPop_BUlogic.do` | `input/alignment_targets_partnered_share.xlsx` — partnership shares by year | -| `03_calculate_partnership_target.do` | Supplementary partnership targets | -| `02_person_risk_employment_stats.do` | `employment_risk_emp_stats.csv` — person-level at-risk diagnostics used for employment alignment group construction | +| `02_inSchool_targets_initpopdata.do` | `input/alignment_targets_inSchool.xlsx` — school participation rates by year | +| `03a_calculate_partneredShare_initialPop_BUlogic.do` | `input/alignment_targets_partnered_share.xlsx` — partnership shares by year | +| `03b_calculate_partnership_target.do` | Supplementary partnership targets | +| `90_person_risk_employment_stats.do` | `employment_risk_emp_stats.csv` — person-level at-risk diagnostics used for employment alignment group construction | Population projection targets (`align_popProjections.xlsx`) and fertility/mortality projections (`projections_*.xlsx`) come from ONS published projections and are not generated by these scripts.