Skip to content

Updated reg_income.xlsx #490

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
dav-sonn merged 1 commit into from
Jun 12, 2026
Merged

Updated reg_income.xlsx #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/reg_income.xlsx
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 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.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
1,2020.0,1,0.4490644490644491,0.5430711610486891,0.9006183745583038,0.4628975265017668,0.4928571428571429,0.3298311444652908,0.42654700047236654,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.9226486961617345,0.48757763975155277,0.5,0.39576923076923076,0.46745562130177515,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.6147268869900452,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.5847328244274809,0.9290843806104129,0.49682539682539684,0.4911111111111111,0.4236343366778149,0.4947916666666667,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04872619342072718,0.04938041570024613,0.0,0.3029197080291971,0.2648949027061462,0.0,0.6109502670012225,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
2,2020.0,1,0.4968421052631579,0.516728624535316,0.8991959499702203,0.46539792387543255,0.49336283185840707,0.32237579379902875,0.42258823529411765,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.522633744855967,0.5338208409506399,0.9170299331589654,0.4921875,0.4981060606060606,0.3822746291365538,0.4681575109382596,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.06938675787930614,0.04833442666835588,0.0,0.30186972255729794,0.2792655229568481,0.6958228869629879,0.6325258626228876,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2022.0,1,0.4956369982547993,0.5676923076923077,0.928942542787286,0.4937888198757764,0.4944029850746269,0.4195906432748538,0.4913752913752914,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048714144411473786,0.04938041570024613,0.0,0.3117001828153565,0.2648949027061462,0.0,0.6076616531687877,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
10 changes: 5 additions & 5 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.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
1,2021.0,1,0.7550785426433095,0.017280071813285457,0.3768038482095136,0.10518957151081504
1,2022.0,1,0.7656365275842282,0.02423469387755102,0.29309035687167806,0.0988605623411755
2,2019.0,1,0.7128238983330583,0.0,0.0,0.15514111239478462
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
2,2020.0,1,0.7114559260482007,0.08077709611451943,0.38862307283359915,0.15673489600528226
2,2021.0,1,0.7493476842791911,0.01766824217870808,0.3622967479674797,0.11358447488584475
2,2022.0,1,0.757982642868839,0.025698682942499197,0.2967651195499297,0.10283281480268544
Loading