Skip to content

Merging in multiple pull requests #294

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
justin-ven merged 5 commits into from
Nov 24, 2025
Merged

Merging in multiple pull requests #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b21ed35
merging of changes suggested by Andy Baxter in #223
justin-ven Nov 17, 2025
94bde8b
merged Daria's changes
justin-ven Nov 17, 2025
ba044a2
minor refresh
justin-ven Nov 18, 2025
15b17f7
new edits from daria
justin-ven Nov 18, 2025
b1d4ab4
combined pull requests
justin-ven Nov 24, 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
114 changes: 4 additions & 110 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,121 +227,15 @@ 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/*
.idea/*
*.dta
src/main/java/simpaths/data/startingpop/DataParser.new
src/main/java/simpaths/data/startingpop/DataParser.old
input/EUROMODoutput/limit/*
input/InitialPopulations/limit/*
input/InitialPopulations/baseline/*
input/EUROMODoutput/baseline/*
.Rproj.user
/input/EUROMODoutput/test
/input/InitialPopulations/test
Binary file modified input/DatabaseCountryYear.xlsx
View file
Open in desktop
Binary file not shown.
56 changes: 37 additions & 19 deletions input/InitialPopulations/compile/00_master.do
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,32 +36,39 @@ set matsize 1000
*************************************************************************************/

* Working directory
*global dir_work "C:\MyFiles\99 DEV ENV\JAS-MINE\data work\initial_populations"
*global dir_work "C:\Users\Patryk\Documents\SP_prep_pop"
global dir_work "D:\Dasha\ESSEX\ESPON 2024\UK\initial_populations"
global dir_work "C:\MyFiles\99 DEV ENV\JAS-MINE\data work\initial_populations"
*global dir_work "D:\Dasha\ESSEX\_SimPaths\_SimPaths_UK\initial_populations"

* Directory which contains do files
* Directory containing do files
global dir_do "${dir_work}/do"
*global dir_do "C:\Users\Patryk\git\SimPathsFork\input\InitialPopulations\compile"

* Directory which contains data files
* Directory containing processed data
global dir_data "${dir_work}/data"

* Directory which contains log files
* Directory containing log files
global dir_log "${dir_work}/log"

* Directory which contains UKHLS data
*global dir_ukhls_data "J:\01 DATA\UK\ukhls\wave14\stata\stata13_se\ukhls"
global dir_ukhls_data "D:\Dasha\UK-original-data\USoc\UKDA-6614-stata\stata\stata13_se\ukhls"
*global dir_ukhls_data "C:\Users\Patryk\Documents\SP_prep_pop\ukhls\UKDA-6614-stata\stata\stata13_se\ukhls"
* Directory containing UKHLS data
global dir_ukhls_data "J:\01 DATA\UK\ukhls\wave14\stata\stata13_se\ukhls"
*global dir_ukhls_data "D:\Dasha\UK-original-data\USoc\UKDA-6614-stata\stata\stata13_se\ukhls" //original_data

* Directory which contains WAS data
*global dir_was_data "J:\01 DATA\UK\was\wave8\stata\stata13_se"
global dir_was_data "D:\Dasha\UK-original-data\WAS\UKDA-7215-stata\stata\stata13_se"
*global dir_was_data "C:\Users\Patryk\Documents\WAS\UKDA-7215-stata\stata\stata13_se"
* Directory containing BHPS data
global dir_bhps_data "J:\01 DATA\UK\ukhls\wave14\stata\stata13_se\bhps"
*global dir_bhps_data "D:\Dasha\UK-original-data\USoc\UKDA-6614-stata\stata\stata13_se\bhps" //original_data_bhps

* Directory which contains original initial popultions
global dir_ipop_orig "${dir_work}/original_initial_populations"
* Directory containing WAS data
global dir_was_data "J:\01 DATA\UK\was\wave8\stata\stata13_se"
*global dir_was_data "D:\Dasha\UK-original-data\WAS\UKDA-7215-stata\stata\stata13_se"

* Directory containing processed employment history data
global dir_data_emphist "${dir_data}/emphist"

* Directory containing employment history do-files
global dir_do_emphist "${dir_do}/do_emphist"

* Directory containing employment history log files
global dir_log_emphist "${dir_log}/emphist"


/**************************************************************************************
Expand Down Expand Up @@ -89,10 +96,19 @@ wave 13 m 2021-2023
wave 14 n 2022-2024
*/
global UKHLSwaves "a b c d e f g h i j k l m n" /*all waves*/
global UKHLSwaves_numbers "1 2 3 4 5 6 7 8 9 10 11 12 13 14" //ukhls_all_waves_numbers

global UKHLS_panel_waves "b c d e f g h i j k l m n"
global UKHLS_panel_waves_numbers "2 3 4 5 6 7 8 9 10 11 12 13 14" //ukhls_waves_numbers
global UKHLS_waves_prefixed "b_ c_ d_ e_ f_ g_ h_ i_ j_ k_ l_ m_ n_"
global BHPS_waves "l m n o p q r"

* waves reporting social care module in ukhls - ADL questions added from wave 7 and then every other wave (from 2016)
global scRecWaves "g i k m"

* waves reporting social care provided in ukhls (from 2015)
global scProvWaves "f g h i j k l m"
global scProvWaves "f g h i j k l m n"

global firstSimYear = 2010
global lastSimYear = 2023
global wealthStartYear = 2015
Expand All @@ -102,9 +118,9 @@ global wealthEndYear = 2019
/**************************************************************************************
* ROUTE TO WORKER FILES
*************************************************************************************/
* Prepare simulated and observed data
* prepare simulated and observed data
do "${dir_do}/01_prepare_UKHLS_pooled_data.do"
* Process UKHLS data
* process UKHLS data
do "${dir_do}/02_create_UKHLS_variables.do"
* add social care
do "${dir_do}/03_social_care_received.do"
Expand All @@ -119,7 +135,9 @@ forvalues year = $wealthStartYear / $wealthEndYear {
global yearWealth = `year'
do "${dir_do}/08_wealth_to_ukhls.do"
}
* check data and slice into initial populations
do "${dir_do}/09_finalise_input_data.do"
* descriptives for initial populations and full sample
do "${dir_do}/10_check_yearly_data.do"


Expand Down
4 changes: 2 additions & 2 deletions input/InitialPopulations/compile/01_prepare_UKHLS_pooled_data.do
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ foreach w of global UKHLSwaves {
local waveno=strpos("abcdefghijklmnopqrstuvwxyz","`w'")

if (`waveno'<13) {
use pidp `w'_ivfho `w'_ivfio `w'_hhorig `w'_buno_dv `w'_dvage `w'_sex `w'_depchl `w'_hidp `w'_pno `w'_pns1pid `w'_pns2pid `w'_month `w'_intdaty_dv ///
use pidp `w'_ivfho `w'_ivfio `w'_hhorig `w'_memorig `w'_buno_dv `w'_dvage `w'_sex `w'_depchl `w'_hidp `w'_pno `w'_pns1pid `w'_pns2pid `w'_month `w'_intdaty_dv ///
`w'_mnspid `w'_fnspid `w'_ppid `w'_ppno `w'_sppid `w'_sex_dv `w'_mastat_dv `w'_gor_dv `w'_age_dv /* `w'_hgbioad1 `w'_hgbioad2 */ ///
`w'_intdatd_dv `w'_intdatm_dv `w'_intdaty_dv `w'_ethn_dv using `w'_indall.dta, clear
}
else {
use pidp `w'_ivfho `w'_ivfio `w'_hhorig `w'_buno_dv `w'_dvage `w'_sex `w'_depchl `w'_hidp `w'_pno `w'_pns1pid `w'_pns2pid `w'_month `w'_intdaty_dv ///
use pidp `w'_ivfho `w'_ivfio `w'_hhorig `w'_memorig `w'_buno_dv `w'_dvage `w'_sex `w'_depchl `w'_hidp `w'_pno `w'_pns1pid `w'_pns2pid `w'_month `w'_intdaty_dv ///
`w'_mnspid `w'_fnspid `w'_ppid `w'_ppno `w'_sppid `w'_sex_dv `w'_mastat_dv `w'_gor_dv `w'_age_dv `w'_hgbioad1 `w'_hgbioad2 ///
`w'_intdatd_dv `w'_intdatm_dv `w'_intdaty_dv `w'_ethn_dv using `w'_indall.dta, clear
}
Expand Down
Loading