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

Updating main branch from development branch #14

Merged
merged 52 commits into from
Mar 22, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
021c3cc
Merge pull request #9 from andrewbaxter439/main
andrewbaxter439 Nov 11, 2022
a58f1f3
furrr'ed data.table reading
andrewbaxter439 Nov 14, 2022
d06e7ce
update options
andrewbaxter439 Nov 14, 2022
1093ecc
updating prediction runs
andrewbaxter439 Nov 14, 2022
42f2b8e
adjusted equation for glm prediction
andrewbaxter439 Nov 16, 2022
d2d96c3
working ahead of trying to export model
andrewbaxter439 Nov 16, 2022
588000d
separating import and tidy functions
andrewbaxter439 Nov 17, 2022
f4e330a
working models to be extracted to yaml and csv
andrewbaxter439 Nov 17, 2022
b81de79
preliminary output models for exporting into secure lab
andrewbaxter439 Nov 18, 2022
39288bf
marsta as integer
andrewbaxter439 Nov 18, 2022
d36259e
extra planning for furrr reading
andrewbaxter439 Nov 18, 2022
7c45410
tidy for parallel run
andrewbaxter439 Nov 18, 2022
04249b5
fixed
andrewbaxter439 Nov 18, 2022
7fb7ec2
expanding metrics
andrewbaxter439 Nov 18, 2022
640d36e
staging file for forest iterations
andrewbaxter439 Nov 18, 2022
73a1e19
Merge branch 'dev' of https://github.com/andrewbaxter439/UC-DiD-analy…
andrewbaxter439 Nov 18, 2022
86afed8
forest code ready to run
andrewbaxter439 Nov 18, 2022
5bb21f2
added future call
andrewbaxter439 Nov 18, 2022
8b8f4f6
try one with knn
andrewbaxter439 Nov 18, 2022
2236964
updated extracting metrics
andrewbaxter439 Nov 18, 2022
7535e77
removed non-working forest bits
andrewbaxter439 Nov 22, 2022
93ab417
Merge branch 'dev' of https://github.com/andrewbaxter439/UC-DiD-analy…
andrewbaxter439 Nov 22, 2022
76bb3ff
test running models again
andrewbaxter439 Nov 22, 2022
36d153b
reduced to 0.95*cores
andrewbaxter439 Nov 22, 2022
26cb07a
tidied collection script
andrewbaxter439 Nov 29, 2022
fbe49f3
switched back to no-hh model
andrewbaxter439 Nov 29, 2022
175c128
minimal changes (indentation)
andrewbaxter439 Nov 29, 2022
b81d78f
changed to nuts133 for region var
andrewbaxter439 Nov 29, 2022
9d0db0d
corrected output line
andrewbaxter439 Nov 29, 2022
eeb20bf
added weighting to benefits redeipt graph
andrewbaxter439 Dec 6, 2022
6c631d3
added qmd document for collecting prediction metrics
andrewbaxter439 Dec 6, 2022
37ee507
small expansion to testing for missing data
andrewbaxter439 Dec 6, 2022
c462318
Merge branch 'dev' of https://github.com/andrewbaxter439/UC-DiD-analy…
andrewbaxter439 Dec 6, 2022
c49b543
changed to stat_summary
andrewbaxter439 Dec 6, 2022
b1e3c1c
New comparison between perc reported on statxplore and uc report claims
andrewbaxter439 Dec 16, 2022
06082e7
new file - example family type by govof
andrewbaxter439 Jan 18, 2023
f1da643
new file - predicting benefit amount as change
andrewbaxter439 Jan 18, 2023
670ba63
testing triple diff file
andrewbaxter439 Jan 18, 2023
8e6dbbb
rmd report testing prediction types
andrewbaxter439 Jan 19, 2023
2bc52ad
testing knn algorithm
andrewbaxter439 Jan 19, 2023
938f34d
added hours worked in both aps and ukmod
andrewbaxter439 Jan 19, 2023
1f3999c
test hours worked for missingness
andrewbaxter439 Jan 19, 2023
84355e1
added seeed for consistent outputs
andrewbaxter439 Jan 19, 2023
7bc0fc2
updated prediction model comparisons
andrewbaxter439 Jan 20, 2023
8f2ffcd
added income variable to completeness testing
andrewbaxter439 Jan 30, 2023
fc69430
Fixed small bug over-counting lb recipients
andrewbaxter439 Mar 3, 2023
98b4284
Testing data in LFS for household characteristics
andrewbaxter439 Mar 6, 2023
381bb67
quick test of uc effect on pay not mediated through hours worked
andrewbaxter439 Mar 6, 2023
e3b5b8a
output files testing prediction methods
andrewbaxter439 Mar 6, 2023
a21d95e
dependencies for pred_results chunk
andrewbaxter439 Mar 6, 2023
38c86c2
tidied comment after fixing LB counts
andrewbaxter439 Mar 6, 2023
601f517
Merge branch 'main' into dev
andrewbaxter439 Mar 22, 2023
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
added seeed for consistent outputs
  • Loading branch information
andrewbaxter439 committed Jan 19, 2023
commit 84355e14eb088385eb0d693ab1e08b1c5b8e5f4d
2 changes: 2 additions & 0 deletions pred_models.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ model_data <- ukmod_tidy |>
select(-starts_with("n_hh")) |>
mutate(uc_receipt = factor(uc_receipt, levels = 1:0, labels = c("Yes", "No")))

set.seed(123)

data_split <- initial_split(model_data, prop = 0.8, strata = year)

train_data <- training(data_split) |> select(-year)
Expand Down
Loading