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

Ssm paper snapshot #401

Draft
wants to merge 482 commits into
base: 231-SF12_PCS
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
482 commits
Select commit Hold shift + click to select a range
5937e5b
removing column from repl
RobertClay Nov 23, 2023
6187755
another repl ttypo
RobertClay Nov 23, 2023
6ffe540
reducing scottish synthpop size
RobertClay Nov 23, 2023
5ff8a33
tweak to repl
RobertClay Nov 23, 2023
6924f85
add baseline to scotland scaled target
RobertClay Nov 23, 2023
2348d9f
typo in file path
RobertClay Nov 24, 2023
028bc70
adding region argument to aggregator
RobertClay Nov 24, 2023
e3f01bc
error fix
RobertClay Nov 24, 2023
5c798b5
another bug fix in aggregatr
RobertClay Nov 24, 2023
18b17ab
verbosity for bug fixing
RobertClay Nov 24, 2023
78257cb
verbosity for bug fixing
RobertClay Nov 24, 2023
0b4b93f
verbosity for bug fixing
RobertClay Nov 24, 2023
cdac6bc
verbosity for bug fixing
RobertClay Nov 24, 2023
0961fe7
verbosity for bug fixing
RobertClay Nov 24, 2023
dc5fa68
verbosity for bug fixing
RobertClay Nov 24, 2023
47cf163
verbosity for bug fixing
RobertClay Nov 24, 2023
a96d68f
verbosity for bug fixing
RobertClay Nov 24, 2023
9bebbf4
verbosity for bug fixing
RobertClay Nov 24, 2023
87e5b02
verbosity for bug fixing
RobertClay Nov 24, 2023
8283cf4
verbosity for bug fixing
RobertClay Nov 24, 2023
f0a0a6d
verbosity for bug fixing
RobertClay Nov 24, 2023
ed096b0
verbosity for bug fixing
RobertClay Nov 24, 2023
0d58f50
adding all needed makefiles for 25_UC interventions and some slight b…
RobertClay Nov 24, 2023
7e9a66f
debugging spatial subsetting again for edinburgh..
RobertClay Nov 24, 2023
cad3366
debugging spatial subsetting again for edinburgh..
RobertClay Nov 24, 2023
384e098
debugging spatial subsetting again for scotland..
RobertClay Nov 24, 2023
c9fad4f
debugging for single mothers
RobertClay Nov 24, 2023
ff52f0b
debugging young mothers again
RobertClay Nov 24, 2023
27626a2
debugging young mothers again
RobertClay Nov 24, 2023
91ed90d
slight change to aggregation logic to ensure all aloive members of ho…
RobertClay Nov 24, 2023
2af1c91
fix make command
RobertClay Nov 24, 2023
2620bf8
debugging lineplot
RobertClay Nov 24, 2023
e4dacc3
debugging lineplot
RobertClay Nov 24, 2023
59ed5ee
debugging all income uplifts together
RobertClay Nov 24, 2023
e859b9d
fixing priority lineplot macros
RobertClay Nov 24, 2023
85eb84d
fixing priority lineplot macros
RobertClay Nov 24, 2023
2f99799
fixing priority lineplot macros
RobertClay Nov 24, 2023
91f5f41
debugging many priority subgroups
RobertClay Nov 24, 2023
0eaf45c
debugging for multiple priority subgruops
RobertClay Nov 24, 2023
7b1d0aa
debugging for multiple priority subgruops
RobertClay Nov 24, 2023
c0a68d6
debugging for multiple priority subgruops
RobertClay Nov 24, 2023
eb546d6
updating maps formatting
RobertClay Nov 24, 2023
3ad9958
updating maps formatting
RobertClay Nov 24, 2023
5701500
bugfix maps
RobertClay Nov 24, 2023
d7bf7f6
bugfixing maps
RobertClay Nov 24, 2023
c086c4b
debugging
RobertClay Nov 24, 2023
582bba1
debugging
RobertClay Nov 24, 2023
3ecff69
debugging
RobertClay Nov 24, 2023
72e163a
fix mangled map merge
RobertClay Nov 24, 2023
8ea266a
bug fixing mangled merge from dev
RobertClay Nov 24, 2023
a5a6da5
debugging_maps
RobertClay Nov 24, 2023
be518db
bug fixing maps
RobertClay Nov 24, 2023
67b0408
bug fixing maps
RobertClay Nov 24, 2023
4e8efc9
bug fixing maps
RobertClay Nov 24, 2023
f951f0d
debugging quintiles script for baselines
RobertClay Nov 24, 2023
a049591
debugging quintiles script for baselines
RobertClay Nov 24, 2023
763953b
debugging quintiles script for baselines
RobertClay Nov 24, 2023
cc8dd48
fixing baseline quintiles
RobertClay Nov 24, 2023
a554e1d
bug in deciles baseline glasgw macro
RobertClay Nov 27, 2023
fa9092e
debugging incremental uplift
RobertClay Nov 27, 2023
bdcb4ec
testing wierd bug in SF12
RobertClay Nov 27, 2023
3ff9465
error in incremental lineplot
RobertClay Nov 27, 2023
d100f6c
error in incremental lineplot
RobertClay Nov 27, 2023
4a89e70
error in incremental lineplot
RobertClay Nov 27, 2023
7ccc5f5
error in incremental lineplot
RobertClay Nov 27, 2023
f736ef9
replacing pidp with old pidp in long models
RobertClay Nov 27, 2023
81581fd
adding alternate file source to handovers for teswting
RobertClay Nov 27, 2023
d72e56b
adding paper plots
RobertClay Nov 27, 2023
a849cd4
Merge branch 'development' into 283_child_uplift_generalised
RobertClay Nov 30, 2023
a5f60a5
debugging modules
RobertClay Nov 30, 2023
5181003
removing mice for now
RobertClay Nov 30, 2023
87860f1
another error
RobertClay Nov 30, 2023
f229b08
trying to fix na nutrition error
RobertClay Nov 30, 2023
9b49fd0
trying to fix na nutrition error
RobertClay Nov 30, 2023
baa5f95
trying to fix na nutrition error
RobertClay Nov 30, 2023
f7e78c2
trying to fix na nutrition error
RobertClay Nov 30, 2023
d350e9b
trying to fix na nutrition error
RobertClay Nov 30, 2023
993d52e
trying to fix na nutrition error
RobertClay Nov 30, 2023
c5e1ddb
trying to fix na nutrition error
RobertClay Nov 30, 2023
ec8e8fb
trying to fix na nutrition error
RobertClay Nov 30, 2023
01e139f
bug fix sadness
RobertClay Nov 30, 2023
a59c8ba
bug fix sadness
RobertClay Nov 30, 2023
63e19c3
bug fix sadness
RobertClay Nov 30, 2023
e463e8e
think I've cracked it
RobertClay Nov 30, 2023
faa6fae
success
RobertClay Dec 1, 2023
e53c9de
success now running commands and sleeeeeeeep
RobertClay Dec 1, 2023
1199ac2
too aggressive complete case.
RobertClay Dec 1, 2023
fb5ff2a
fully disabling mice imputation
RobertClay Dec 1, 2023
ed80cbc
only doing child uplift lineplot macros for now
RobertClay Dec 1, 2023
cf73a6b
fixing lineplot
RobertClay Dec 1, 2023
13c3a6c
fix dodgy start in 2020
RobertClay Dec 1, 2023
c836b9e
fix dodgy start in 2020
RobertClay Dec 1, 2023
b5935d8
add other ss plots back in
RobertClay Dec 1, 2023
223f8b6
some fixes required for variable types in modules for running on arc34
RobertClay Dec 1, 2023
ae575f7
Merge branch '283_child_uplift_generalised' of https://github.com/Lee…
RobertClay Dec 1, 2023
12319f7
adding different plot to social sciences with UC and RP on seperate c…
RobertClay Dec 1, 2023
94b752b
Merge branch '283_child_uplift_generalised' of https://github.com/Lee…
RobertClay Dec 1, 2023
c7457e9
typo
RobertClay Dec 1, 2023
0f3191a
trying to fix 2020 thats come back aaaaaa
RobertClay Dec 1, 2023
c7d78a0
starting analysis notebook, fullgeneration of lsoas and datazones for…
RobertClay Dec 7, 2023
658f833
forgot a couple of things
RobertClay Dec 7, 2023
11a869d
turning off mice for paper plots
RobertClay Dec 8, 2023
bf5dc84
turning off mice for paper plots
RobertClay Dec 8, 2023
046e8a1
turning off mice for paper plots
RobertClay Dec 8, 2023
e3b5b58
fix type cast
RobertClay Dec 8, 2023
7eb9b6f
bug fix in new dynamic subsetter fix
RobertClay Dec 11, 2023
523e90d
getting sf-12 auc working on aggregator
RobertClay Dec 11, 2023
1cb8564
fix zoneid name change
RobertClay Dec 11, 2023
e4b3d48
fix zoneid name change
RobertClay Dec 11, 2023
94ffae0
fix zoneid name change
RobertClay Dec 11, 2023
9d3bab8
fix household upscsaling code name
RobertClay Dec 11, 2023
9498f95
scot pop to 10%
RobertClay Dec 11, 2023
453700c
scotland setup fix
RobertClay Dec 11, 2023
19ae973
type cast issue..?'
RobertClay Dec 11, 2023
e1be8e6
adding a few things to scot pop
RobertClay Dec 11, 2023
84b0eaa
bug in mice
RobertClay Dec 11, 2023
0cbca52
bug in mice
RobertClay Dec 11, 2023
a90c0f2
mice imputation bugs
RobertClay Dec 11, 2023
af75b5f
mice imputation bugs
RobertClay Dec 11, 2023
ce9f662
mice imputation bugs
RobertClay Dec 11, 2023
aad2480
mice imputation bugs
RobertClay Dec 11, 2023
670e482
mice imputation bugs
RobertClay Dec 11, 2023
fb97417
mice imputation bugs
RobertClay Dec 11, 2023
e6c6a8c
mice imputation bugs
RobertClay Dec 11, 2023
e24ab6b
mice imputation bugs
RobertClay Dec 11, 2023
bd1470b
adding ICER graphs
RobertClay Dec 11, 2023
a6e342e
adding sf12 icer to lineplots for testing
RobertClay Dec 12, 2023
550fe12
trying different conversion to icer
RobertClay Dec 12, 2023
206af4e
trying different conversion to icer
RobertClay Dec 12, 2023
20b7f01
trying different conversion to icer
RobertClay Dec 12, 2023
bf415fd
trying different conversion to icer
RobertClay Dec 12, 2023
6a6d63d
trying different conversion to icer
RobertClay Dec 12, 2023
0104840
trying different conversion to icer
RobertClay Dec 12, 2023
3ade23b
trying different conversion to icer
RobertClay Dec 12, 2023
db167d3
trying different conversion to icer
RobertClay Dec 12, 2023
7297b97
trying different conversion to icer
RobertClay Dec 12, 2023
0c6774d
trying different conversion to icer
RobertClay Dec 12, 2023
b2decc2
trying different conversion to icer
RobertClay Dec 12, 2023
d279692
icer for living wage and energy downlift
RobertClay Dec 12, 2023
cd82dcb
more testing of icer..
RobertClay Dec 12, 2023
ada1c45
more testing of icer..
RobertClay Dec 12, 2023
3852be6
more testing of icer..
RobertClay Dec 12, 2023
9ed1b3d
more testing of icer..
RobertClay Dec 12, 2023
a50e0fa
more testing of icer..
RobertClay Dec 12, 2023
8f10160
lifting some make restrictions
RobertClay Dec 12, 2023
cbc03dd
lifting some make restrictions
RobertClay Dec 12, 2023
ad73471
lifting some make restrictions
RobertClay Dec 12, 2023
75c0591
lifting some make restrictions
RobertClay Dec 12, 2023
3bb645a
lifting some make restrictions
RobertClay Dec 12, 2023
dcc2efb
lifting some make restrictions
RobertClay Dec 12, 2023
523c7be
lifting some make restrictions
RobertClay Dec 12, 2023
dd79b10
lifting some make restrictions
RobertClay Dec 12, 2023
774b507
lifting some make restrictions
RobertClay Dec 12, 2023
12c4e9c
lifting some make restrictions
RobertClay Dec 12, 2023
d61f9c7
lifting some make restrictions
RobertClay Dec 12, 2023
961e8c8
lifting some make restrictions
RobertClay Dec 12, 2023
da09b32
lifting some make restrictions
RobertClay Dec 12, 2023
8a48967
lifting some make restrictions
RobertClay Dec 12, 2023
d8100b2
lifting some make restrictions
RobertClay Dec 12, 2023
5b57b36
lifting some make restrictions
RobertClay Dec 12, 2023
4266bce
lifting some make restrictions
RobertClay Dec 12, 2023
9d41876
lifting some make restrictions
RobertClay Dec 12, 2023
aca5842
lifting some make restrictions
RobertClay Dec 12, 2023
4a221bc
lifting some make restrictions
RobertClay Dec 12, 2023
ef789a2
lifting some make restrictions
RobertClay Dec 12, 2023
8c17bc4
lifting some make restrictions
RobertClay Dec 12, 2023
734e624
lifting some make restrictions
RobertClay Dec 12, 2023
12f8660
lifting some make restrictions
RobertClay Dec 12, 2023
b942ec4
ICER working for now. need to focus on numbers uplift and costs per h…
RobertClay Dec 13, 2023
fd8e5b8
generating summary statistics over time for paper
RobertClay Dec 15, 2023
f357219
generating summary statistics over time for paper
RobertClay Dec 15, 2023
f36b050
taking setup off UC makefiles for quick run on scot pop
RobertClay Dec 15, 2023
951344d
adding children into pop total
RobertClay Dec 19, 2023
37cc09c
change to 100 runs
RobertClay Dec 19, 2023
5c94b7c
wierd missing council tax command?
RobertClay Dec 19, 2023
5671242
turn MICE off for paper2 runs
RobertClay Dec 19, 2023
780b8df
adding variables for new living wage to run
RobertClay Dec 19, 2023
5f90de3
strong fix for int type casting to nkids. adding s7 labour state to i…
RobertClay Dec 20, 2023
4ea7a26
adding small test pop option for my sanity
RobertClay Dec 20, 2023
bbf7d91
Merge branch '283_child_uplift_generalised' of https://github.com/Lee…
RobertClay Dec 20, 2023
db426d2
missing variable
RobertClay Dec 20, 2023
3f6b0d9
fixing is test
RobertClay Dec 20, 2023
542f235
fixing is test
RobertClay Dec 20, 2023
5a39b5f
update aggregator to match new living wage criteria
RobertClay Dec 21, 2023
e2da8df
adding age to living wage parameters
RobertClay Dec 21, 2023
449efe6
removing unemployed from who_bloew_living_wage
RobertClay Dec 21, 2023
270fd66
adding in job hours to aggregate
RobertClay Dec 21, 2023
98a73ff
adding new living wage intervention because new modules are messing u…
RobertClay Dec 21, 2023
566b0c6
test relative poverty bug
RobertClay Dec 24, 2023
77c33f0
trying different weighting formula
RobertClay Dec 28, 2023
f5515ec
trying different weighting formula
RobertClay Dec 28, 2023
8c13926
revert poverty line and minor fixes
RobertClay Dec 28, 2023
9710e34
fix cigs ZIP
RobertClay Dec 28, 2023
eff9051
change intervntion back to act on every wave
RobertClay Dec 28, 2023
e21d748
typo
RobertClay Dec 28, 2023
3b92f2a
intervention adjust
RobertClay Dec 28, 2023
74e8293
weighted nanmean
RobertClay Dec 28, 2023
4cee3d4
facepalm...
RobertClay Dec 28, 2023
5f037de
relative poverty use fixed value..
RobertClay Dec 29, 2023
a81d0a4
trying stability fixes for relative poverty
RobertClay Dec 29, 2023
507ad2e
test income fix
RobertClay Dec 29, 2023
2474f0b
bug
RobertClay Dec 29, 2023
e03206d
testing rp bug
RobertClay Dec 29, 2023
526bad4
another test..
RobertClay Dec 29, 2023
ceae97c
another test..
RobertClay Dec 29, 2023
9812bf9
r
RobertClay Dec 29, 2023
c203764
asd
RobertClay Dec 29, 2023
75280fc
as
RobertClay Dec 30, 2023
8aa4d9b
test intervention
RobertClay Dec 30, 2023
f7b0d46
test more income noise
RobertClay Dec 30, 2023
c38c979
error in cumsum sf12
RobertClay Jan 4, 2024
d3567ef
trying again to fix cumsum error
RobertClay Jan 4, 2024
1dc9774
trying again to fix cumsum error
RobertClay Jan 4, 2024
be9d8d6
adding in lineplot uncertainty for sf_12 improvement per personi
RobertClay Jan 5, 2024
78e102b
fixing aggregator
RobertClay Jan 5, 2024
901152b
fixing aggregator
RobertClay Jan 5, 2024
b26e1e5
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
6ce9378
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
64cda1a
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
88b25d1
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
bfd645e
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
555bd40
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
3f55ff6
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
2dcb73f
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
4661a8c
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
9215afd
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
e84d3d4
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
d29789d
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
d038065
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
20f338c
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
c04f028
adding in another plot for scaled by cost and unscaled
RobertClay Jan 5, 2024
21ec52e
change lineplots to percentage
RobertClay Jan 12, 2024
553093d
fixing lineplots and moving to safety branch
RobertClay Feb 9, 2024
09ebca0
adding in default config 25-50-5 increments
RobertClay Feb 9, 2024
78db848
adding plot for 25_50_by_5 default config for ssm paper
RobertClay Feb 9, 2024
b4201c7
removing region tag
RobertClay Feb 9, 2024
65e830e
removing region tag
RobertClay Feb 9, 2024
c12b404
removing region tag
RobertClay Feb 9, 2024
dcbdff6
adding csvs for table
RobertClay Feb 9, 2024
40a9410
getting ssm paper table data
RobertClay Feb 9, 2024
d6fa171
getting ssm paper table data
RobertClay Feb 9, 2024
1348573
getting ssm paper table data
RobertClay Feb 9, 2024
5f15489
getting ssm paper table data
RobertClay Feb 9, 2024
50b1f12
getting ssm paper table data
RobertClay Feb 9, 2024
55ab2cf
bug fixing
RobertClay Feb 9, 2024
28a34d5
adding table maker back in
RobertClay Feb 12, 2024
81d4f9d
making 25-50 plot incase its needed working on this branch
RobertClay Feb 12, 2024
306a446
Added targets to run SCP interventions from £10-£100 in £10 increment…
ld-archer Feb 26, 2024
e617c15
Cast nkids column to float before updating population_view as int col…
ld-archer Feb 26, 2024
6562a52
Corrected the path variable for Scotland Scaled Data so the Makefile …
ld-archer Feb 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
Prev Previous commit
Next Next commit
reducing scottish synthpop size
RobertClay committed Nov 23, 2023

Verified

This commit was signed with the committer’s verified signature.
mih Michael Hanke
commit 6ffe540fb7e2686967f596a090459e60a0ebcf41
2 changes: 1 addition & 1 deletion minos/data_generation/Makefile
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ $(DATADIR)/replenishing/glasgow_scaled/replenishing_pop_2019-2070.csv: $(GLASGOW

# synthetic input for glasgow with spatial component.
$(SCOTLANDSCALEDDATA)/2020_US_cohort.csv: $(FINALDATA)/2020_US_cohort.csv $(DATAGEN)/US_utils.py $(DATAGEN)/US_household_upscaling.py
$(PYTHON) $(DATAGEN)/US_household_upscaling.py -r 'scotland' -p 100
$(PYTHON) $(DATAGEN)/US_household_upscaling.py -r 'scotland' -p 20

$(DATADIR)/replenishing/scotland_scaled/replenishing_pop_2019-2070.csv: $(SCOTLANDSCALEDDATA)/2020_US_cohort.csv $(TRANSITION_DATA)/education_state/nnet/education_state_2018_2019.rds $(DATAGEN)/US_utils.py $(DATAGEN)/generate_repl_pop.py $(PERSISTJSON)/*.json $(MODULES)/r_utils.py
$(PYTHON) $(DATAGEN)/generate_repl_pop.py --region 'scotland'