Skip to content

Corrected alignment factors time-series values #483

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
Mariia-Var merged 6 commits into from
Jun 3, 2026
Merged

Corrected alignment factors time-series values #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e67ea3
Remove old alignment workbook references
Mariia-Var May 15, 2026
c8966c2
Corrected alignment adjustment factors
Mariia-Var May 15, 2026
e5c2a5b
Merge remote-tracking branch 'origin/develop' into MV-correct_alignme…
Mariia-Var Jun 2, 2026
9cda541
Updated golden files of Integration test
Mariia-Var Jun 3, 2026
24c51e5
Potential fix for pull request finding
Mariia-Var Jun 3, 2026
73b90ab
Merge remote-tracking branch 'origin/develop' into MV-correct_alignme…
Mariia-Var Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified input/alignment_adjustment_series.xlsx
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
12 changes: 6 additions & 6 deletions src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
Loading
Loading