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

SF_12_PCS #243

Open
wants to merge 242 commits into
base: development
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
a90f159
Renamed all instances of SF_12 to SF_12_MCS, and added the SF_12_PCS …
ld-archer May 16, 2023
3589510
Embarassing fix here. Forgot to remove missing values from the raw da…
ld-archer May 17, 2023
71ee05d
Fixed typo in the cross-validation notebook, and updated the util fun…
ld-archer May 17, 2023
6536b40
Fixed typo in outcomes/Makefile where AGG_VAR was not supplied as an …
ld-archer May 17, 2023
70245f3
Added a variable for the save.path in cross_validation.Rmd so it only…
ld-archer May 17, 2023
c427a7b
Forgot to add PCS module to cross_validation.yaml
ld-archer May 17, 2023
20066ec
Merged all development changes into this branch for a fresh start on …
ld-archer Jul 6, 2023
faf7fcb
Fixed some references to SF_12 -> SF_12_MCS, and fixed the PCS sectio…
ld-archer Jul 6, 2023
e6c1583
Formatted the housing_tenure variable to replace numbers with strings
ld-archer Jul 6, 2023
f80b203
Running SF_12_PCS through complete_case
ld-archer Jul 6, 2023
f5f42c7
Added PCS to a lot of models, as well as some other additional variab…
ld-archer Jul 6, 2023
9b4452c
Fit model for urban and added it to US_complete_case. Fixed formattin…
ld-archer Jul 6, 2023
eeaee17
Added heating to complete_case vars
ld-archer Jul 6, 2023
73651b8
Minor formatting fixes for some JSONs, added docstring to a US_format…
ld-archer Jul 7, 2023
0ef36d1
Added housing_tenure module and amended config files
ld-archer Jul 7, 2023
ed5e35e
Formatting changes to S7Labour module
ld-archer Jul 7, 2023
c9e5d4e
Functionalised the handovers plots in utils_validation_vis.R and upda…
ld-archer Jul 7, 2023
49d8979
Added auditc vars to format_raw
ld-archer Jul 7, 2023
909fd4e
Added the AUDITC score using auditc vars from US. Calculated the 3 it…
ld-archer Jul 10, 2023
3e47ef2
Dropped variables used to calculate auditc score
ld-archer Jul 10, 2023
e0357b4
Added script for testing auditc variable
ld-archer Jul 10, 2023
5598497
Estimated a model for auditc, and modified the estimate_transitions.R…
ld-archer Jul 10, 2023
e2d009e
Updated alcohol module and added back to the module list in all defau…
ld-archer Jul 10, 2023
4a361f3
Added a section for alcohol to both handovers and cross_validation_de…
ld-archer Jul 10, 2023
47107b8
Forgot to add auditc to both alcohol module and replenishment (oops).…
ld-archer Jul 10, 2023
a811400
Defined factor levels for auditc in estimate_transitions.R
ld-archer Jul 10, 2023
5e18bec
Added alcohol to the physical wellbeing model and module, and updated…
ld-archer Jul 11, 2023
5e16cf7
Added exercise variables to US_format_raw
ld-archer Jul 11, 2023
de7f685
Forgot to add one of the exercise variables
ld-archer Jul 12, 2023
0ccb964
Added function to calculate whether someone meets the government crit…
ld-archer Jul 12, 2023
815f126
Added model for active in model_definitions_default.txt, and modified…
ld-archer Jul 12, 2023
eeb52dd
Added the physical activity module
ld-archer Jul 12, 2023
d5d5f15
Added physical activity module into all the relevant config files
ld-archer Jul 12, 2023
7458eb4
Added physical activity module to RunPipeline, and added active varia…
ld-archer Jul 12, 2023
ccafb23
Added docstring for generate_physical_activity_binary in generate_com…
ld-archer Jul 13, 2023
4a1019b
Added code to force cross-validation runs to the final year model for…
ld-archer Jul 13, 2023
480e2fd
Run physical activity through complete case
ld-archer Jul 13, 2023
b31a78c
Added active var to handovers and cross-validation
ld-archer Jul 13, 2023
416440d
Started a notebook for physical activity documentation
ld-archer Jul 13, 2023
5861f80
Material Deprivation proxy variable generated
ld-archer Oct 2, 2023
56f03fc
Merged changes from development, particularly interested in the newer…
ld-archer Oct 2, 2023
f071bfa
Got GLMM Beta models working for material deprivation
ld-archer Oct 5, 2023
b6d1cbd
Changed matdep proxy to a 3 level ordinal and fit a CLM model to it. …
ld-archer Oct 5, 2023
2193acb
Fixed dependency for CV runs and updated CV vis script with material …
ld-archer Oct 6, 2023
0b091f2
First stab at chronic disease module
ld-archer Oct 9, 2023
9a757d1
Tried to force chron_disease predictions to an absorbing type (i.e. n…
ld-archer Oct 10, 2023
c9cd8e2
Ran chron_disease var through complete case
ld-archer Oct 17, 2023
5b2b208
Moved hcond variables from forward fill to forward monotonic fill as …
ld-archer Oct 17, 2023
0cdcbdc
PCS in a reasonable state, chron_disease seems to be much happier wit…
ld-archer Oct 19, 2023
df1d7a7
Addition of chron_disease to cross validation scripts, and small twea…
ld-archer Oct 19, 2023
2b6ea89
Changed the target for generating All Child Uplift lineplots back to …
ld-archer Oct 19, 2023
f34b6a5
Testing something
ld-archer Oct 20, 2023
f244b3a
Changed alcohol module (auditc var) to a CLM model instead of NNET
ld-archer Oct 20, 2023
b0a36ca
Fixed interventions by changing the boost reset logic, and changed al…
ld-archer Oct 24, 2023
36f266d
Few fixes for the transition model formulae and the alcohol module sw…
ld-archer Oct 27, 2023
cdd55a5
Implemented utility score and QALY calculations, using the Energy Cri…
ld-archer Oct 30, 2023
22eff99
Added cost effectiveness calculations to QALY comparison energyCrises…
ld-archer Oct 31, 2023
875260d
Added run_id to QALY_calculation outputs for plotting confidence. Imp…
ld-archer Nov 1, 2023
389a77b
Switched living wage intervention to all pop under threshold instead …
ld-archer Nov 1, 2023
af68299
Updated the scripts for QALY comparison of living wage and energy cri…
ld-archer Nov 1, 2023
d5d3cee
Added a new R package to environment for better representing £ values…
ld-archer Nov 1, 2023
d3f830a
Added standard error bars, see how this works before moving to 95% co…
ld-archer Nov 1, 2023
4a77d49
Created a temporary combined target to make QALY comparisons easier o…
ld-archer Nov 1, 2023
7aa1262
Updated transition models to match latest versions in development
ld-archer Nov 1, 2023
bfb3b34
Updates to QALY comparison script for living wage
ld-archer Nov 2, 2023
2fb89ab
Seeded mortality to negate the potential effect in QALY calculations
ld-archer Nov 2, 2023
b9ae61f
Added some combined targets to save myself the pain of remembering ar…
ld-archer Nov 2, 2023
928092a
Forgot to update the config in the new combined target...
ld-archer Nov 2, 2023
76b9865
More mistakes in config name...
ld-archer Nov 2, 2023
201b3ab
More updates to QALY comparisons script, and additions to Makefile fo…
ld-archer Nov 2, 2023
8b22f8a
Included some diagnostic histograms in QALY comparison scripts
ld-archer Nov 6, 2023
8ed90c4
Remove a line that was left by accident
ld-archer Nov 6, 2023
17f6109
Fixed another typo
ld-archer Nov 6, 2023
f76ff77
Another one...
ld-archer Nov 6, 2023
32d0b5e
New visualisation script for comparing energyDownlift with energyDown…
ld-archer Nov 6, 2023
d385224
Started a utils script for visualising qaly outputs
ld-archer Nov 6, 2023
e245135
Removed the 1st and 100th percentiles from some outputs
ld-archer Nov 7, 2023
eed706d
Merging development and fixing issue where time is updated twice with…
ld-archer Nov 7, 2023
1c6ad41
Fixing the problem introduced when merging the new ageing module into…
ld-archer Nov 8, 2023
dcceee4
Added targets for calculating qalys on glasgow synthetic simulation runs
ld-archer Nov 8, 2023
84f8637
Added diagnostic SF12 plots to QALY comparison scripts, and changed p…
ld-archer Nov 9, 2023
326c98c
Fixed mistake in one of the qaly scripts
ld-archer Nov 9, 2023
4012a19
Updated the configs with some new packages
ld-archer Nov 9, 2023
35a1567
Added arc4 combined target for running qaly simulations with syntheti…
ld-archer Nov 9, 2023
a6ef137
Fixed typo...
ld-archer Nov 9, 2023
2e3043c
Cast type of chron disease variable to int
ld-archer Nov 9, 2023
c805741
Trying to fix the type problem with chron_disease on arc
ld-archer Nov 9, 2023
c80dbcb
Now fixing type issue for matdep
ld-archer Nov 9, 2023
4ed97f3
Different attempt at fixing type problem with matdep
ld-archer Nov 9, 2023
453939c
Point to the right location for qaly outputs, remove some debugging s…
ld-archer Nov 10, 2023
c9138d4
Merge branch 'development' into 231-SF12_PCS
ld-archer Nov 10, 2023
f8c3e83
Merge uk synthpop stuff from development
ld-archer Nov 10, 2023
aa2f87d
Switch to visualise glasgow synthetic runs
ld-archer Nov 10, 2023
e75b54c
Added new make targets for the uk synthetic QALY calculations, and po…
ld-archer Nov 13, 2023
1c47123
Fixed the path to the output directory for arc
ld-archer Nov 13, 2023
1e54b72
Updated all config files to the latest set of modules
ld-archer Nov 13, 2023
a3b52e7
Changed the way components are read in to the model from config. Inst…
ld-archer Nov 13, 2023
18cd987
Updated the way configs get the components for a current run. Now the…
ld-archer Nov 14, 2023
87e31a3
Attempting to fix weird bug where PCS doesnt transition. Think this w…
ld-archer Nov 14, 2023
3454ed0
Added make target for running uk qaly scenarios on arc, and updated p…
ld-archer Nov 14, 2023
003d6cd
Fixed typo in new make target
ld-archer Nov 14, 2023
acd9705
Added setup calls for arc4 qaly scenarios targets
ld-archer Nov 14, 2023
b5d7ba0
Changing dependency for replenishing pops to `transition_default` as …
ld-archer Nov 14, 2023
f9b7eb3
Deal with duplicate pidps in uk repl pop
ld-archer Nov 14, 2023
6523b7f
Trying a 5% version of the uk population
ld-archer Nov 14, 2023
470479e
Added a function to calculate the total cost of the intervention (int…
ld-archer Nov 14, 2023
9cb77ff
Fixed some typos in living wage QALY comparison script
ld-archer Nov 16, 2023
b400b4b
Wrote a generic version of the QALY_comparison.Rmd notebook, where ke…
ld-archer Nov 20, 2023
63f511e
Changing back to individual scripts and make targets for now as could…
ld-archer Nov 20, 2023
942162b
Fix issue in QALY_comparison script where something was left in that …
ld-archer Nov 20, 2023
d64c633
Added dependency to household upscaling, and some WIP stuff on the ms…
ld-archer Nov 23, 2023
3a75b8f
Changed a filename
ld-archer Nov 23, 2023
8ca2ab4
Removed lots of unnecessary columns to reduce data size (ran out of R…
ld-archer Nov 23, 2023
6d6e6ab
Fixed problem with US_household_upscaling where SIMD deciles were bei…
ld-archer Nov 24, 2023
98a7698
Created a new script to handle upscaling to uk individual population …
ld-archer Nov 24, 2023
7e63146
Fixed some Make targets that were duplicated, and changed some output…
ld-archer Nov 24, 2023
a0f2ca2
Fixed dependency of uk synthetic qaly runs
ld-archer Nov 24, 2023
f03aacc
Fixes to some make targets and dependencies
ld-archer Nov 24, 2023
e31d29a
Reduced the RAM impact of upscaling populations by switching the scri…
ld-archer Nov 25, 2023
bf746bd
Fixed problem with replenishing dir for uk scaled data not set correc…
ld-archer Nov 25, 2023
8d76b7e
Cast vars to factor in the handovers_ordinal() function in validation
ld-archer Nov 26, 2023
496bfd6
Modified the intervention cost function to print out the cost in the …
ld-archer Nov 27, 2023
2e9243d
Small fix for matdep model to not run for 2020
ld-archer Dec 13, 2023
facfc5b
Adjusting values in QALY calculation by weight. Currently SF_12 MCS, …
ld-archer Jan 5, 2024
8fd436a
Drop zero weight records before calculating population means
ld-archer Jan 5, 2024
53506e8
Handle boost_amount reweight separately so it doesnt break baseline c…
ld-archer Jan 5, 2024
2b220ea
Remove something I added earlier by mistake
ld-archer Jan 5, 2024
6d904cc
Merged changes from development into 231
ld-archer Feb 5, 2024
50576d3
Removed chron_disease and matdep from PCS model
ld-archer Feb 5, 2024
911e770
Fixed some merge conflict stuff that was missed at time of merge
ld-archer Feb 5, 2024
90dacb7
Removed variable from replenishing columns list that has been removed…
ld-archer Feb 5, 2024
3ce5288
Added capital letter to FinancialSituation module name to work with c…
ld-archer Feb 5, 2024
9885e7b
Added some missing dependencies to environment file
ld-archer Feb 5, 2024
981c946
Fixed year range of some PCS vars for new 2021 data
ld-archer Feb 5, 2024
f8b6685
Copied heating var information from 2020 to 2021 for kick off year
ld-archer Feb 5, 2024
f56d07e
Ignored lines beginning with # in transition estimation scripts so co…
ld-archer Feb 6, 2024
c3d51b3
Fixed complete case year range for chron_disease variable
ld-archer Feb 6, 2024
51e7901
Added Matdep to the PCS model, and testing LMM models for PCS
ld-archer Feb 6, 2024
7f4ec8a
Fix for new components txt file in RunPipeline
ld-archer Feb 6, 2024
5110aab
Added new super setup command to chron_disease
ld-archer Feb 6, 2024
484d950
Added a max_ncigs plot to handovers and small change in tobacco.py
ld-archer Feb 6, 2024
bdbf85a
Removed ChronicDisease and MaterialDeprivation from components list, …
ld-archer Feb 7, 2024
808e037
Testing PCS with different model types (currently RandomForest), and …
ld-archer Feb 7, 2024
fb09577
Testing different PCS models, currently on LMM with log transformatio…
ld-archer Feb 9, 2024
8446e3d
Changed some prediction function arguments in r_utils and updated the…
ld-archer Feb 9, 2024
caffce5
Merge branch 'development' into 231-SF12_PCS
ld-archer Feb 9, 2024
d7931d2
Tuning the noise in the physical wellbeing prediction step, and remov…
ld-archer Feb 12, 2024
ae95c04
Some fixes for running interventions on synthetic data
ld-archer Feb 12, 2024
bff549e
Fixed path problem in synthetic uk replenishing pop generation
ld-archer Feb 12, 2024
fb019a9
Fixed problem with household upscaling where I was using the wrong ye…
ld-archer Feb 13, 2024
17705a6
Fixed synthetic pop preparation for uk scaled simulation
ld-archer Feb 14, 2024
2f94881
Changed MCS to use log-normal LMM model
ld-archer Feb 14, 2024
74fdf19
Fixed issue with intervention not being correctly added to the compon…
ld-archer Feb 14, 2024
aded0e9
Tweaked component priorities to separate intervention from pathways (…
ld-archer Feb 15, 2024
e5c95bc
Increased runs to 100 and increased memory to 18GB for uk synthetic runs
ld-archer Feb 15, 2024
68bef77
Adding ability to define the output subdirectory to a script used for…
ld-archer Feb 16, 2024
0898729
Typo in filepath
ld-archer Feb 16, 2024
d40b349
Fixed another mistake in path to html files
ld-archer Feb 16, 2024
836cfdf
Fixed another typo in path to log files (not crucial for now)
ld-archer Feb 16, 2024
449db89
Fixed cv transitions targets in transition Makefile. Also changed the…
ld-archer Feb 19, 2024
e9018fe
Merging latest changes from development
ld-archer Feb 23, 2024
48fc9b5
Removing a bad assertion that was left in by mistake and adding a com…
ld-archer Feb 23, 2024
e7abc99
Handle cases in child_ages where a new baby is born to a childless ho…
ld-archer Feb 26, 2024
41b3a0a
Fixed the child_ages problem in a better way
ld-archer Feb 26, 2024
58fc89a
Changed a method in nkidsFertilityAgeSpecificRates to static and fixe…
ld-archer Feb 26, 2024
4a84e1c
Separated QALY outcomes targets into their own file - Makefile.QALY
ld-archer Feb 27, 2024
64c1e03
Changed all references from SF_12 to SF_12_MCS in outcomes scripts
ld-archer Feb 27, 2024
559c614
Added a generic QALY comparison RNotebook with parameters for the exp…
ld-archer Feb 27, 2024
d826f03
Changed arc4 all child uplifts target to default config
ld-archer Feb 28, 2024
5762a05
Made a new combined target for running a selection of SCP scenarios f…
ld-archer Feb 29, 2024
f3ce485
Slight tweak to the QALY calculation and tidied up the QALY outcomes …
ld-archer Feb 29, 2024
1431dd8
Renamed the new Makefiles from Makefile.<something> to <something>.Ma…
ld-archer Feb 29, 2024
3ae59b3
Stopped tracking a script that is only used for local testing
ld-archer Feb 29, 2024
6be9c32
Added some combined targets for calculating and visualising QALYs for…
ld-archer Feb 29, 2024
6848591
Remove calls to open the QALY notebooks in firefox as they caused fai…
ld-archer Feb 29, 2024
15cf0d2
Changed fertility and tobacco module from a fixed common random numbe…
ld-archer Mar 1, 2024
734f14f
Changed year range to include the jump off year
ld-archer Mar 1, 2024
6556e14
Fixed QALY calculation for first year of sim (problem with no dead pe…
ld-archer Mar 1, 2024
de2c3af
Updated the QALY calculation functions in R to move away from smoothe…
ld-archer Mar 4, 2024
1ad38bd
Removed start year from ICER calculation as cant calculate ICER with …
ld-archer Mar 4, 2024
d7a559c
Third time lucky. Switched some paths and constants back from testing…
ld-archer Mar 4, 2024
6eaa9b8
Small tweaks and better reporting of large values (formatted with com…
ld-archer Mar 5, 2024
ed00cbd
Typo in a new print statement
ld-archer Mar 5, 2024
0c16f0b
Removed all secondary modules, doing a test run with just core modules
ld-archer Mar 5, 2024
5a2abef
Working on the SF12 models, tweaking noise and such. Both models impr…
ld-archer Mar 6, 2024
cc4de88
Tweaks to data in and qaly visualisation functions. Added a script fo…
ld-archer Mar 6, 2024
80384db
Added combined target for running SCP interventions using Glasgow sca…
ld-archer Mar 7, 2024
82b9f86
adding in 6 further legacy benefits variables for scp
RobertClay Mar 7, 2024
e497698
slight tweak in make lineplots to allow for NA weights
RobertClay Mar 7, 2024
0c4b72f
Added some make targets for visualising QALY outputs for Glasgow Scal…
ld-archer Mar 8, 2024
022121b
Merge branch '231-SF12_PCS' of https://github.com/Leeds-MRG/Minos int…
ld-archer Mar 8, 2024
7d116d0
Removed default parameters from RNotebook as I think its causing prob…
ld-archer Mar 8, 2024
ac2e0dc
Typo in some qaly notebook parameters
ld-archer Mar 8, 2024
05cda86
Trying setting the experiment parameter when visualising results, and…
ld-archer Mar 8, 2024
f8d5afd
Parameterised the start year so we can handle synthetic 2020 starts a…
ld-archer Mar 8, 2024
a826846
Removed reweighting of SF12 vars in QALY calculation as it caused pro…
ld-archer Mar 11, 2024
bc2fa0e
Refactored QALY_comparison2.Rmd to accept multiple interventions and …
ld-archer Mar 12, 2024
39082b0
Added combined targets for visualising multiple QALY outcomes together
ld-archer Mar 12, 2024
a09d91e
Fixed typo in new QALY vis targets, and added some more for visualisi…
ld-archer Mar 12, 2024
b8c613c
Forgot to remove the debug parameters...
ld-archer Mar 12, 2024
00de15d
Fixed one final typo in QALY_comparison2.Rmd and added £75 interventi…
ld-archer Mar 12, 2024
c468b41
Tweaked colours on one plot in QALY_comparison2.Rmd
ld-archer Mar 13, 2024
ab2e4b0
Reduced the child uplift intervention by £10 for the universal credit…
ld-archer Mar 13, 2024
fdc2946
Added targets for running SCP interventions from £25 to £120 in £5 in…
ld-archer Mar 13, 2024
bc8473c
Saving the local_batch.sh file
ld-archer Mar 13, 2024
c32ba1e
Merged 231 into 400 before merging 400 back to 231
ld-archer Mar 13, 2024
585afd1
Merge pull request #427 from Leeds-MRG/400-leg_ben_mergeTest
ld-archer Mar 13, 2024
f245e88
Small fixes to get the new changes from branch 400 working here. Also…
ld-archer Mar 13, 2024
b101680
Added baseline to a combined arc run target, and renamed for more cla…
ld-archer Mar 13, 2024
02e378e
Added lots of new targets for visualising QALY outcomes for SCP inter…
ld-archer Mar 14, 2024
d34c7e8
Added the missing intervention information for larger universal credi…
ld-archer Mar 14, 2024
a56e851
Added another combined target for plotting 25-50 in £5 increments tog…
ld-archer Mar 14, 2024
155e550
Removed an extra quotation mark that was left in by accident
ld-archer Mar 14, 2024
cd28317
adding back in the line the creates council taxes in income composite…
RobertClay Mar 14, 2024
24a1cf3
adding in update 23/24 council tax bands by local authority
RobertClay Mar 14, 2024
88d35b0
typo in new csv colnames
RobertClay Mar 14, 2024
f0ab4f9
keep council tax variable and plot in handovers to check after baseli…
RobertClay Mar 14, 2024
d935dc8
WIP to get QALYs by subpopulation
ld-archer Mar 15, 2024
26ddbee
Added some diagnostic plots to handovers looking at council_tax
ld-archer Mar 15, 2024
747714c
Merge branch '429-council_tax_increase' into 231-SF12_PCS
ld-archer Mar 15, 2024
62f412e
Fixed age_bucket bins
ld-archer Mar 19, 2024
41f28c0
Added a function whose only purpose is to arrange the columns in our …
ld-archer Mar 19, 2024
3785687
More combined targets for different combinations of SCP runs, and cor…
ld-archer Mar 19, 2024
248f1e2
Tweaks and small changes to the QALY_comparison script, and some upda…
ld-archer Mar 19, 2024
6f8c0fe
Changed some targets to run for all Scotland instead of Glasgow
ld-archer Mar 19, 2024
407a9e1
Fixed combined target for producing the scotland scaled data
ld-archer Mar 19, 2024
091c333
More WIP stuff for subpopulation qalys
ld-archer Mar 19, 2024
b4ec0ce
Fixed a target for visualising qalys on all child intervention runs
ld-archer Mar 19, 2024
03a84ca
Fix a duplicated target
ld-archer Mar 19, 2024
5a47a80
Added 80:20 inequality ratios for continuous variables
ld-archer Mar 21, 2024
5a961bf
Added handovers plots for age structure and population counts
ld-archer Apr 8, 2024
0ff2607
Merged changes from remote into local, some additions to handovers.Rmd
ld-archer Apr 8, 2024
d97f8d1
Tweaked combined targets so that each runs the correct setup target
ld-archer Apr 8, 2024
fb4f753
Got council tax working again with some plots in handovers to check it
ld-archer Apr 8, 2024
17121b0
Change year range of education model to 2020-2021
ld-archer Apr 8, 2024
1054e91
Improved QALY_comparison visualisation functions and script
ld-archer Apr 11, 2024
526a458
Added plots to handovers for visualising counts of extreme old age gr…
ld-archer Apr 18, 2024
ac16527
Created some functions for plotting animated age pyramids, but leavin…
ld-archer Apr 22, 2024
23a8f2c
Additional R packages for animated age pyramids
ld-archer Apr 22, 2024
cf1e010
Added a new visualisation target
ld-archer Apr 23, 2024
9eecc2a
Additions to the PCS QALY notebook for sharing around SIPHER
ld-archer Apr 23, 2024
aa8dc9a
Additions and updating of the PCS_pathway_justifications script
ld-archer Oct 22, 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
keep council tax variable and plot in handovers to check after baseli…
…ne run.
  • Loading branch information
RobertClay committed Mar 14, 2024
commit f0ab4f98ee4fedd31569036c02aa338db8272447
2 changes: 1 addition & 1 deletion minos/data_generation/generate_composite_vars.py
Original file line number Diff line number Diff line change
@@ -231,7 +231,7 @@ def generate_hh_income(data):
data = US_utils.inflation_adjustment(data, "hh_income")

# now drop the intermediates
data.drop(labels=['hh_rent', 'hh_mortgage', 'council_tax', 'outgoings', 'hh_netinc', 'oecd_equiv',
data.drop(labels=['hh_rent', 'hh_mortgage', 'outgoings', 'hh_netinc', 'oecd_equiv',
'council_tax_lower', 'council_tax_upper', 'council_tax_draw'],
axis=1,
inplace=True)
2 changes: 2 additions & 0 deletions minos/validation/handovers.Rmd
Original file line number Diff line number Diff line change
@@ -78,6 +78,8 @@ shall.we.save <- FALSE

handover_boxplots(raw.dat, base.dat, 'hh_income')
handover_lineplots(raw.dat, base.dat, "hh_income")
handover_boxplots(raw.dat, base.dat, 'council_tax')
handover_lineplots(raw.dat, base.dat, "council_tax")
```

### Spaghetti