Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6d19248
Merge remote-tracking branch 'upstream/main' into develop
justin-ven Jul 18, 2025
0ff80df
Merge remote-tracking branch 'upstream/develop' into develop
justin-ven Jul 18, 2025
586719a
Merge remote-tracking branch 'upstream/develop' into develop
justin-ven Jul 18, 2025
fc762c2
first draft of lifetime incomes
justin-ven Jul 30, 2025
e548733
add comments
justin-ven Jul 30, 2025
5b13e36
Update .gitignore
justin-ven Jul 30, 2025
4141963
Merge branch 'develop' of https://github.com/justin-ven/SimPaths into…
justin-ven Jul 30, 2025
cec3299
implement parallelisation
justin-ven Jul 30, 2025
1d9f7f1
organise lifetime income output in unique folder
justin-ven Aug 1, 2025
0580b13
Add disposable income to input data and improve lifetime income integ…
justin-ven Aug 3, 2025
2c7205e
intermediate
justin-ven Aug 5, 2025
ebe9b10
update input data
justin-ven Aug 5, 2025
fa53d6d
preliminary complete
justin-ven Aug 5, 2025
d9a30e3
debugged income history
justin-ven Aug 5, 2025
ace660f
remove treeset to avoid crash
justin-ven Aug 6, 2025
16f7879
parallelise lifetime income donors
justin-ven Aug 6, 2025
56b4c9a
working
justin-ven Aug 6, 2025
3164338
minor tweek
justin-ven Aug 6, 2025
4b63619
add lifetime income measure to person object
justin-ven Aug 7, 2025
767a33e
lifetime incomes paper
justin-ven Aug 10, 2025
751225d
fix bug with lifetime income and amend code to use Double.isNaN
justin-ven Aug 13, 2025
215aead
implement new checkFinite method
justin-ven Aug 18, 2025
8afd9ef
Update lifetime incomes.yml
justin-ven Aug 18, 2025
fdc0039
Merge remote-tracking branch 'upstream/develop' into develop
justin-ven Aug 18, 2025
e56e8d9
temp
justin-ven Aug 18, 2025
5816aa4
Delete uk_2029_std.txt
justin-ven Aug 18, 2025
d76352f
Update EUROMODpolicySchedule.xlsx
justin-ven Aug 18, 2025
3efd4bd
replace missing in training directory
justin-ven Aug 18, 2025
d55cc1f
fix files for training directory
justin-ven Aug 18, 2025
dcc88c3
allow for suppression of lifetime incomes
justin-ven Aug 18, 2025
808e581
update output files for integration test
justin-ven Aug 19, 2025
25c9e25
Merge remote-tracking branch 'upstream/develop' into develop
justin-ven Nov 11, 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
117 changes: 6 additions & 111 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -227,115 +227,10 @@ analysis/test_base_noalign.dta
analysis/test_naive_noalign.dta
analysis/test1.dta
analysis/test2.dta
input/InitialPopulations/base/population_initial_UK_2010.csv
input/InitialPopulations/base/population_initial_UK_2011.csv
input/InitialPopulations/base/population_initial_UK_2012.csv
input/InitialPopulations/base/population_initial_UK_2013.csv
input/InitialPopulations/base/population_initial_UK_2014.csv
input/InitialPopulations/base/population_initial_UK_2015.csv
input/InitialPopulations/base/population_initial_UK_2016.csv
input/InitialPopulations/base/population_initial_UK_2017.csv
input/InitialPopulations/base/population_initial_UK_2018.csv
input/InitialPopulations/base/population_initial_UK_2019.csv
input/InitialPopulations/base/population_initial_UK_2020.csv
input/InitialPopulations/base/population_initial_UK_2021.csv
.idea/dataSources.xml
input/EUROMODoutput/expanded/uk_2011_std.txt
input/EUROMODoutput/expanded/uk_2012_std.txt
input/EUROMODoutput/expanded/uk_2013_std.txt
input/EUROMODoutput/expanded/uk_2014_std.txt
input/EUROMODoutput/expanded/uk_2015_std.txt
input/EUROMODoutput/expanded/uk_2016_std.txt
input/EUROMODoutput/expanded/uk_2017_std.txt
input/EUROMODoutput/expanded/uk_2018_std.txt
input/EUROMODoutput/expanded/uk_2019_std.txt
input/EUROMODoutput/expanded/uk_2020_std.txt
input/EUROMODoutput/expanded/uk_2021_std.txt
input/EUROMODoutput/expanded/uk_2022_std.txt
input/EUROMODoutput/expanded/uk_2023_std.txt
input/EUROMODoutput/expanded/uk_2024_std.txt
input/EUROMODoutput/expanded/uk_2025_std.txt
input/EUROMODoutput/expanded/uk_2026_std.txt
input/EUROMODoutput/expanded/uk_2027_std.txt
input/EUROMODoutput/initial/uk_2011_std.txt
input/EUROMODoutput/initial/uk_2012_std.txt
input/EUROMODoutput/initial/uk_2013_std.txt
input/EUROMODoutput/initial/uk_2014_std.txt
input/EUROMODoutput/initial/uk_2015_std.txt
input/EUROMODoutput/initial/uk_2016_std.txt
input/EUROMODoutput/initial/uk_2017_std.txt
input/EUROMODoutput/initial/uk_2018_std.txt
input/EUROMODoutput/initial/uk_2019_std.txt
input/EUROMODoutput/initial/uk_2020_std.txt
input/EUROMODoutput/initial/uk_2021_std.txt
input/EUROMODoutput/initial/uk_2022_std.txt
input/EUROMODoutput/initial/uk_2023_std.txt
input/EUROMODoutput/initial/uk_2024_std.txt
input/EUROMODoutput/initial/uk_2025_std.txt
input/EUROMODoutput/initial/uk_2026_std.txt
input/EUROMODoutput/initial/uk_2027_std.txt
input/EUROMODoutput/testing/uk_2015_std.txt
input/EUROMODoutput/testing/uk_2019_std.txt
input/InitialPopulations/current/population_initial_UK_2011.csv
input/InitialPopulations/current/population_initial_UK_2012.csv
input/InitialPopulations/current/population_initial_UK_2013.csv
input/InitialPopulations/current/population_initial_UK_2014.csv
input/InitialPopulations/current/population_initial_UK_2015.csv
input/InitialPopulations/current/population_initial_UK_2016.csv
input/InitialPopulations/current/population_initial_UK_2017.csv
input/InitialPopulations/current/population_initial_UK_2018.csv
input/InitialPopulations/current/population_initial_UK_2019.csv
input/InitialPopulations/current/population_initial_UK_2020.csv
input/InitialPopulations/current/population_initial_UK_2021.csv
input/InitialPopulations/testing/population_initial_UK_2019.csv
input/EUROMODoutput/testing/uk_2015_std.txt
input/EUROMODoutput/testing/uk_2019_std.txt
input/EUROMODoutput/extended/uk_2015_std.txt
input/EUROMODoutput/extended/uk_2019_std.txt
input/EUROMODoutput/extended/uk_2020_std.txt
input/EUROMODoutput/extended/uk_2021_std.txt
input/EUROMODoutput/extended/uk_2022_std.txt
input/EUROMODoutput/extended/uk_2023_std.txt
input/EUROMODoutput/extended/uk_2024_std.txt
input/EUROMODoutput/extended/uk_2025_std.txt
input/EUROMODoutput/testing/DatabaseCountryYear.xlsx
input/EUROMODoutput/testing/EUROMODpolicySchedule.xlsx
input/EUROMODoutput/sc expanded/uk_2011_std.txt
input/EUROMODoutput/sc expanded/uk_2012_std.txt
input/EUROMODoutput/sc expanded/uk_2013_std.txt
input/EUROMODoutput/sc expanded/uk_2014_std.txt
input/EUROMODoutput/sc expanded/uk_2015_std.txt
input/EUROMODoutput/sc expanded/uk_2016_std.txt
input/EUROMODoutput/sc expanded/uk_2017_std.txt
input/EUROMODoutput/sc expanded/uk_2018_std.txt
input/EUROMODoutput/sc expanded/uk_2019_std.txt
input/EUROMODoutput/sc expanded/uk_2020_std.txt
input/EUROMODoutput/sc expanded/uk_2021_std.txt
input/EUROMODoutput/sc expanded/uk_2022_std.txt
input/EUROMODoutput/sc expanded/uk_2023_std.txt
input/EUROMODoutput/sc expanded/uk_2024_std.txt
input/EUROMODoutput/sc expanded/uk_2025_std.txt
input/EUROMODoutput/sc expanded/uk_2026_std.txt
input/EUROMODoutput/sc expanded/uk_2027_std.txt
input/EUROMODoutput/current/DatabaseCountryYear.xlsx
input/EUROMODoutput/current/EUROMODpolicySchedule.xlsx
input/EUROMODoutput/current/uk_2011_std.txt
input/EUROMODoutput/current/uk_2012_std.txt
input/EUROMODoutput/current/uk_2013_std.txt
input/EUROMODoutput/current/uk_2014_std.txt
input/EUROMODoutput/current/uk_2015_std.txt
input/EUROMODoutput/current/uk_2016_std.txt
input/EUROMODoutput/current/uk_2017_std.txt
input/EUROMODoutput/current/uk_2018_std.txt
input/EUROMODoutput/current/uk_2019_std.txt
input/EUROMODoutput/current/uk_2020_std.txt
input/EUROMODoutput/current/uk_2021_std.txt
input/EUROMODoutput/current/uk_2022_std.txt
input/EUROMODoutput/current/uk_2023_std.txt
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/InitialPopulations/current/*
input/InitialPopulations/testing/*
*.dta
input/lifetime_incomes/*
input/initialPopulations/standard/*
input/EUROMODoutput/standard/*
input/initialPopulations/test/*
input/EUROMODoutput/test/*
input/EUROMODoutput/expanded/*
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.

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

maxNumberOfRuns: 1
executeWithGui: false
randomSeed: 606
startYear: 2019
endYear: 2099
popSize: 75000

# Arguments passed to the SimPathsModel
model_args:
projectSocialCare: false
lifetimeIncomeGenerate: true
lifetimeIncomeStartBirthYear: 1939
lifetimeIncomeEndBirthYear: 2023
lifetimeIncomeEndAge: 80
lifetimeIncomeCohortSize: 3000
lifetimeIncomeWriteToCSV: false
lifetimeIncomeRandomSeed: 505
lifetimeIncomeAge0StdDev: 0.9
lifetimeIncomeImpute: true
enableIntertemporalOptimisations: false
responsesToLowWageOffer: false
responsesToEducation: false
responsesToHealth: false
responsesToDisability: false
useSavedBehaviour: false
readGrid: "first"


# Arguments that alter processing of the SimPathsMultiRun object
innovation_args:
randomSeedInnov: false
# intertemporalElasticityInnov: false
# labourSupplyElasticityInnov: true

collector_args:
# calculateGiniCoefficients: false
# exportToDatabase: false
# exportToCSV: true
# persistStatistics: true
# persistStatistics2: true
# persistPersons: false
# persistBenefitUnits: false
# persistHouseholds: false
# dataDumpStartTime: 0L
# dataDumpTimePeriod: 1.0
13 changes: 11 additions & 2 deletions config/programming test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,21 @@ maxNumberOfRuns: 1
executeWithGui: false
randomSeed: 606
startYear: 2019
endYear: 2032
popSize: 5000
endYear: 2099
popSize: 75000

# Arguments passed to the SimPathsModel
model_args:
projectSocialCare: false
lifetimeIncomeGenerate: false
lifetimeIncomeStartBirthYear: 1939
lifetimeIncomeEndBirthYear: 2023
lifetimeIncomeEndAge: 80
lifetimeIncomeCohortSize: 3000
lifetimeIncomeWriteToCSV: false
lifetimeIncomeRandomSeed: 505
lifetimeIncomeAge0StdDev: 0.9
lifetimeIncomeImpute: true
enableIntertemporalOptimisations: false
responsesToLowWageOffer: false
responsesToEducation: false
Expand Down
Loading