Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
4f90b15
Initial set of updates for HU
pbronka Nov 15, 2024
339c7b3
Second set of updates for HU
pbronka Nov 20, 2024
a311af4
Update population projections
pbronka Nov 20, 2024
446ad74
Third set of updates for HU
pbronka Nov 21, 2024
8231ca8
Update Labour.java
pbronka Nov 22, 2024
36de250
Further updates to estimated parameters
pbronka Nov 22, 2024
739f87e
Partnership process update
pbronka Nov 22, 2024
ec5d013
Update fertility estimates
pbronka Nov 22, 2024
d99aca9
Update health and education estimates
pbronka Nov 26, 2024
2294c99
Update employment selection parameters
pbronka Nov 27, 2024
226edb0
Update income processes
pbronka Nov 27, 2024
350d3db
Update leave parental home process
pbronka Nov 27, 2024
3f55517
Update home ownership estimates
pbronka Nov 27, 2024
59a8046
Update retirement process estimates
pbronka Nov 27, 2024
8a8f885
Minor file updates
pbronka Nov 27, 2024
fc1f245
Small updates to Excel files
pbronka Nov 28, 2024
e0466f0
Complete update of the estimates
pbronka Nov 28, 2024
7ec9f28
Beta version
pbronka Nov 28, 2024
0954a8b
Update education process
pbronka Nov 29, 2024
5cf91c3
Update health process
pbronka Nov 29, 2024
5540f5f
Update education and health estimates
pbronka Nov 29, 2024
fd55347
Updates
pbronka Nov 29, 2024
068bbf9
Beta v1
pbronka Nov 30, 2024
ad5840a
Restore variables required for validation
pbronka Dec 1, 2024
e7ad113
Update U1a and HO1a, add partnership alignment
pbronka Dec 5, 2024
d969a30
Update SimPathsObserver.java
pbronka Dec 5, 2024
2c6e224
Correct definition of fertility rate fed to regression
pbronka Dec 5, 2024
4a00999
New key function for Hungary
pbronka Dec 6, 2024
b634872
Update education process
pbronka Dec 6, 2024
7accbde
Beta v2
pbronka Dec 6, 2024
4a30dde
Update reg_education.xlsx
pbronka Dec 7, 2024
9147619
Update SimPathsModel.java
pbronka Dec 7, 2024
53c35ad
Update SimPathsModel.java
pbronka Dec 9, 2024
882e296
Student share alignment
pbronka Feb 25, 2025
1d774dc
Change country to PL
pbronka Feb 26, 2025
b460a79
First set of model updates for PL
pbronka Feb 26, 2025
68fcbe1
Second set of updates for PL
pbronka Feb 27, 2025
8edf513
Working version of PL model
pbronka Feb 28, 2025
decc7c7
Introduce alignment of retirement status. Correct liwwh.
pbronka Feb 28, 2025
450c4e4
Education process E2a update
pbronka Mar 1, 2025
851cc56
Update align_popProjections.xlsx
pbronka Mar 1, 2025
49a01ba
Update population projections. Add liwwh var.
pbronka Mar 1, 2025
d05a483
Update health process H1a
pbronka Mar 2, 2025
6c7b639
Typo
pbronka Mar 2, 2025
1361a53
Introduce student status alignment method
pbronka Mar 3, 2025
11d431a
Retirement process updates
pbronka Mar 6, 2025
b240595
Introduce disability alignment procedure
pbronka Mar 6, 2025
c2d7028
Update fertility and retirement processes.
pbronka Mar 6, 2025
d5ef399
Introduce macro shocks: population
pbronka Mar 10, 2025
dc08881
Update employment alignment targets
pbronka Mar 10, 2025
1d54de7
Update initial population and alignment process
pbronka Mar 10, 2025
8ebcd64
Updates to activity alignment
pbronka Mar 19, 2025
5e7c13a
Update scenario_macro_shocks.xlsx
pbronka Mar 20, 2025
9e673cc
Update macro scenarios
pbronka Mar 20, 2025
9f2ef01
Update regression coefficients
pbronka Mar 21, 2025
670da85
Update scenario_macro_shocks.xlsx
pbronka Mar 21, 2025
a9ce5f6
Update Parameters.java
pbronka Mar 21, 2025
e84b4f7
Activity alignment procedure for macro shocks
pbronka Mar 22, 2025
db6c2f9
Update estimates and macro shock employment
pbronka Mar 24, 2025
5d40041
Update system_bu_names.xlsx
pbronka Mar 25, 2025
a0b5de8
Update ActivityAlignmentMacroShock.java
pbronka Mar 26, 2025
3ae6119
Update scenario_macro_shocks.xlsx
pbronka Mar 29, 2025
45b7cd3
Default parameters update
pbronka Apr 10, 2025
efe3289
Update SimPathsModel.java
pbronka Apr 11, 2025
d576011
Initial updates for Italy
pbronka Apr 11, 2025
7aa464e
Update parameters
pbronka Apr 11, 2025
1b31737
Update parameters except labour supply
pbronka Apr 14, 2025
4800584
Draft of gender-specific labour market enum
pbronka Apr 14, 2025
62b464f
Update labour supply
pbronka Apr 14, 2025
138ca48
Working model for IT
pbronka Apr 15, 2025
cadfe66
Update SimPathsMultiRun.java
pbronka Apr 15, 2025
2c97433
Update education exit conditions
pbronka Apr 23, 2025
fab4e57
inSchool function has been modified to correctly analyse individuals …
Mariia-Var May 1, 2025
dc258a1
inSchool function has been modified to correctly analyse individuals …
Mariia-Var May 1, 2025
a153bdb
fixed bug in reg_education.xlsx
Mariia-Var May 1, 2025
b5d02a9
Update partnership alignment targets
pbronka May 6, 2025
ae0851c
At risk of work / partnership alignment filtering conditions update
pbronka May 6, 2025
347074a
Update BenefitUnit.java
pbronka May 6, 2025
33d3a18
Limit the number of candidates used in matching
pbronka May 9, 2025
db37a4d
Revert previous implementation of single donor matching. Add limits o…
pbronka May 12, 2025
53c9840
Update matching parameters
pbronka May 13, 2025
f9b9278
Update thresholds
pbronka May 13, 2025
2470d22
Introduce revised activity status alignment procedure
pbronka May 28, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -336,3 +336,5 @@ input/EUROMODoutput/current/uk_2024_std.txt
input/EUROMODoutput/current/uk_2025_std.txt
input/EUROMODoutput/current/uk_2026_std.txt
input/EUROMODoutput/current/uk_2027_std.txt
input/tax_donor_population_HU.csv
input/tax_donor_population_PL.csv
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions config/default.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# This file can be used to override defaults for multirun arguments.
# Arguments of the SimPathsMultiRun object overridden by the command-line

maxNumberOfRuns: 1
maxNumberOfRuns: 3
executeWithGui: false
randomSeed: 606
startYear: 2019
endYear: 2026
startYear: 2011
endYear: 2025
popSize: 170000

# Arguments passed to the SimPathsModel
Expand Down
Binary file modified input/DatabaseCountryYear.xlsx
Binary file not shown.
Binary file modified input/EUROMODpolicySchedule.xlsx
Binary file not shown.
Binary file modified input/align_educLevel.xlsx
Binary file not shown.
Binary file modified input/align_popProjections.xlsx
Binary file not shown.
Binary file modified input/align_student_under30.xlsx
Binary file not shown.
Binary file modified input/policy parameters.xlsx
Binary file not shown.
Binary file modified input/projections_fertility.xlsx
Binary file not shown.
Binary file modified input/projections_mortality.xlsx
Binary file not shown.
Binary file modified input/reg_RMSE.xlsx
Binary file not shown.
Binary file modified input/reg_education.xlsx
Binary file not shown.
Binary file modified input/reg_employmentSelection.xlsx
Binary file not shown.
Binary file modified input/reg_fertility.xlsx
Binary file not shown.
Binary file modified input/reg_health.xlsx
Binary file not shown.
Binary file modified input/reg_home_ownership.xlsx
Binary file not shown.
Binary file modified input/reg_income.xlsx
Binary file not shown.
Binary file modified input/reg_labourSupplyUtility.xlsx
Binary file not shown.
Binary file modified input/reg_leaveParentalHome.xlsx
Binary file not shown.
Binary file modified input/reg_partnership.xlsx
Binary file not shown.
Binary file modified input/reg_retirement.xlsx
Binary file not shown.
Binary file modified input/reg_wages.xlsx
Binary file not shown.
Binary file removed input/scenario_employments_furloughed.xlsx
Binary file not shown.
Binary file added input/scenario_macro_shocks.xlsx
Binary file not shown.
Binary file modified input/scenario_parametricMatching.xlsx
Binary file not shown.
Binary file modified input/scenario_retirementAgeFixed.xlsx
Binary file not shown.
Binary file modified input/system_bu_names.xlsx
Binary file not shown.
Binary file modified input/time_series_factor.xlsx
Binary file not shown.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>com.github.jasmineRepo</groupId>
<artifactId>JAS-mine-core</artifactId>
<version>4.3.11</version>
<version>4.3.15</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Loading
Loading