Skip to content
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.

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

Experimental #49

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
9f8913b
minor updates to input data
justin-ven Jan 18, 2024
a25bf3f
debugging updates
justin-ven Mar 8, 2024
71b1871
remove flat region search, which didn't really work
justin-ven Mar 9, 2024
08d31ec
minor updates to replicate previous results
justin-ven Mar 11, 2024
2537e7c
cross-model validation (with SIDD)
justin-ven Mar 18, 2024
d53c6ed
more debugging
justin-ven Mar 19, 2024
0ed775a
minor push
justin-ven Mar 21, 2024
4974142
change grid size ready for merge to development branch
justin-ven Mar 22, 2024
1a5fb66
remove hard-code on start year
justin-ven Mar 22, 2024
a457efb
minor adjustments for csv writing
justin-ven Mar 23, 2024
a788ba0
new routines to report imperfect tax matches
justin-ven Mar 24, 2024
320b145
fix issues with race conditions on imperfectMatches
justin-ven Mar 25, 2024
9c64ede
more effort on extending input dataset
justin-ven Mar 25, 2024
cd5ffb3
working update
justin-ven Mar 26, 2024
730f0fa
tax database augmentation
justin-ven Mar 28, 2024
3c8f294
refining database extension code
justin-ven Apr 3, 2024
69d1bc4
Update .gitignore
justin-ven Apr 3, 2024
9fc5c26
minor update - debug of carer expectations
justin-ven Apr 4, 2024
ec26a8b
minor updates
justin-ven Apr 4, 2024
685c55b
remove redundant code
justin-ven Apr 4, 2024
3df59cc
minor tweaks
justin-ven Apr 4, 2024
5265542
Merge branch 'experimental' of https://github.com/justin-ven/SimPaths…
justin-ven Apr 4, 2024
1278cdd
minor update
justin-ven Apr 4, 2024
0668f06
bug fix on marital status in expectations
justin-ven Apr 4, 2024
893c736
check of wage offer 1 state conducted - warning message removed
justin-ven Apr 4, 2024
481c78d
tax database matches added to simulated population
justin-ven Apr 4, 2024
f0b5fde
bug fix to tax database reporting
justin-ven Apr 4, 2024
7a870ea
minor formatting
justin-ven Apr 5, 2024
4f3ef4a
minor formatting
justin-ven Apr 5, 2024
d5d5d25
bug corrected in population alignment
justin-ven Apr 5, 2024
60f8456
bug fixes to database extension
justin-ven Apr 6, 2024
2527c3f
intermediate
justin-ven Apr 6, 2024
b987152
first complete draft
justin-ven Apr 6, 2024
dcb9b90
minor update
justin-ven Apr 6, 2024
1e71aa3
minor review
justin-ven Apr 6, 2024
cf3fb73
improvements to tax database extension routines
justin-ven Apr 8, 2024
cb6679c
allow for substantial negative income in evaluation of taxes and exte…
justin-ven Apr 8, 2024
8f39dc5
expand tax database key function to account for near zero incomes
justin-ven Apr 8, 2024
1942dca
fix problem with matching keys for negative incomes
justin-ven Apr 9, 2024
88080ec
default to screen imperfect matches rather than read them
justin-ven Apr 10, 2024
9e21ceb
merge in changes from development branch
justin-ven Apr 16, 2024
e54add4
update input data
justin-ven Apr 16, 2024
3069813
edits resulting from input data updating
justin-ven Apr 19, 2024
40ae0aa
fix bug in benefitunit, and remove files from git tracking
justin-ven Apr 20, 2024
030b946
add in unemployment parameters
justin-ven Apr 20, 2024
b7f5596
add new catch to report error
justin-ven Apr 20, 2024
e2372cd
low wage offers for reference person introduced into model
justin-ven Apr 20, 2024
fb80568
update missing unemployment parameters
justin-ven Apr 20, 2024
ebd4510
update programs to compile input data
justin-ven Apr 20, 2024
a34f3d2
Merge branch 'experimental' of https://github.com/justin-ven/SimPaths…
justin-ven Apr 20, 2024
8459a49
debug low wage offer
justin-ven Apr 20, 2024
62d75b1
update model parameters other than wages and income
justin-ven Apr 22, 2024
3a59d0a
update model with new estimates
justin-ven Apr 22, 2024
801885d
resolve minor issues in new model structure
justin-ven Apr 23, 2024
ba5484c
minor revisions to model parameters
justin-ven Apr 23, 2024
6b30b12
amendment of multi-run to accommodate alternative experiments
justin-ven Apr 25, 2024
0ef440a
Update CESUtility.java
justin-ven Apr 25, 2024
09845cd
complete multi-run adjustment for interetemporal elasticitly
justin-ven Apr 25, 2024
009324d
update Statistics2 for preference parameter calibration
justin-ven Apr 25, 2024
b4ddbfe
Merge branch 'experimental' of https://github.com/justin-ven/SimPaths…
justin-ven Apr 25, 2024
6bf1ce3
clean-up of labour hours
justin-ven Apr 25, 2024
4624d98
completed update for estimates
justin-ven Apr 25, 2024
d6f1ff1
finalise uk update of data and parameters
justin-ven Apr 25, 2024
70befd9
two files added to git repo to address failure of compile test
justin-ven Apr 26, 2024
6f67108
stop saving imperfect tax matches
justin-ven Apr 26, 2024
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
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ input/~$scenario_uprating_factor.xlsx
/input/*.db
input/tax_donor_population_UK.csv
input/input.mv.db
input/DatabaseCountryYear.xlsx
input/EUROMODpolicySchedule.xlsx

input/input.mv.db.new
input/input.mv.db.old
input/input.mv.db.original
dependency-reduced-pom.xml
.idea/vcs.xml
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.

7 changes: 0 additions & 7 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

33 changes: 0 additions & 33 deletions .idea/dataSources.local.xml

This file was deleted.

18 changes: 6 additions & 12 deletions .idea/dataSources.xml

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

19 changes: 0 additions & 19 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/jpa-buddy.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/sqldialects.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/validation.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

58 changes: 58 additions & 0 deletions config/config - intertemporal elasticity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# This file can be used to override defaults for multirun arguments.
# These will be overridden by command-line arguments

maxNumberOfRuns: 3
executeWithGui: false
randomSeed: 12345
startYear: 2019
endYear: 2020
popSize: 170000

# For arguments to pass to the SimPathsModel itself:
# Current model defaults can be overridden by uncommenting/changing
model_args:
# maxAge: 130
# fixTimeTrend: true
# timeTrendStopsIn: 2017
# fixRandomSeed: true
# sIndexTimeWindow: 5
# sIndexAlpha: 2
# sIndexDelta: 0
# savingRate: 0
# initialisePotentialEarningsFromDatabase: true
# useWeights: false
# useSBAMMatching:
# projectMortality: true
# alignFertility: true
# labourMarketCovid19On: false
# projectFormalChildcare: true
# donorPoolAveraging: true
# projectSocialCare: false
# enableIntertemporalOptimisations: false
# useSavedBehaviour: false
# readGrid: "laptop serial"
# saveBehaviour: true
# employmentOptionsOfPrincipalWorker: 3
# employmentOptionsOfSecondaryWorker: 3
# responsesToEducation: true
# responsesToRetirement: false
# responsesToHealth: true
# responsesToDisability: false
# minAgeForPoorHealth: 50
# responsesToRegion: false

innovation_args:
randomSeedInnov: false
intertemporalElasticityInnov: true

collector_args:
# calculateGiniCoefficients: false
# exportToDatabase: false
# exportToCSV: true
# persistStatistics: true
# persistStatistics2: true
# persistPersons: false
# persistBenefitUnits: false
# persistHouseholds: false
# dataDumpStartTime: 0L
# dataDumpTimePeriod: 1.0
58 changes: 58 additions & 0 deletions config/config - random seed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# This file can be used to override defaults for multirun arguments.
# These will be overridden by command-line arguments

maxNumberOfRuns: 5
executeWithGui: false
randomSeed: 12345
startYear: 2018
endYear: 2025
popSize: 75000

# For arguments to pass to the SimPathsModel itself:
# Current model defaults can be overridden by uncommenting/changing
model_args:
# maxAge: 130
# fixTimeTrend: true
# timeTrendStopsIn: 2017
# fixRandomSeed: true
# sIndexTimeWindow: 5
# sIndexAlpha: 2
# sIndexDelta: 0
# savingRate: 0
# initialisePotentialEarningsFromDatabase: true
# useWeights: false
# useSBAMMatching:
# projectMortality: true
# alignFertility: true
# labourMarketCovid19On: false
# projectFormalChildcare: true
# donorPoolAveraging: true
# projectSocialCare: false
# enableIntertemporalOptimisations: false
# useSavedBehaviour: false
# readGrid: "laptop serial"
# saveBehaviour: true
# employmentOptionsOfPrincipalWorker: 3
# employmentOptionsOfSecondaryWorker: 3
# responsesToEducation: true
# responsesToRetirement: false
# responsesToHealth: true
# responsesToDisability: false
# minAgeForPoorHealth: 50
# responsesToRegion: false

innovation_args:
# randomSeedInnov: false
# intertemporalElasticityInnov: true

collector_args:
# calculateGiniCoefficients: false
# exportToDatabase: false
# exportToCSV: true
# persistStatistics: true
# persistStatistics2: true
# persistPersons: false
# persistBenefitUnits: false
# persistHouseholds: false
# dataDumpStartTime: 0L
# dataDumpTimePeriod: 1.0
4 changes: 4 additions & 0 deletions config.yml → config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ model_args:
# minAgeForPoorHealth: 50
# responsesToRegion: false

innovation_args:
# randomSeedInnov: false
# intertemporalElasticityInnov: true

collector_args:
# calculateGiniCoefficients: false
# exportToDatabase: false
Expand Down
Binary file modified input/DatabaseCountryYear.xlsx
Binary file not shown.
Binary file modified input/EUROMODpolicySchedule.xlsx
Binary file not shown.
Binary file not shown.
Loading
Loading