diff --git a/R/make_data.R b/R/make_data.R index ec8d9df2a2e11cbb09f79a3311e7823472c6ba74..8643aab8d78fbbf79a8437b87a8302d2b5d4b96b 100644 --- a/R/make_data.R +++ b/R/make_data.R @@ -87,7 +87,9 @@ get_kick <- function(action) { dplyr::mutate(after_unum = lead(unum)) %>% dplyr::mutate(a_sameteam = (after_team == team)) %>% dplyr::mutate(a_sameunum = (after_unum == unum)) %>% - select(-c(command, pvx, pvy, body, neck)) + select(-c(command, pvx, pvy, body, neck)) %>% + dplyr::mutate(next_ball_x = lead(ball_x)) %>% + dplyr::mutate(next_ball_y = lead(ball_y)) return(output) @@ -122,9 +124,7 @@ get_pass <- function(kick) { dplyr::mutate(pass_scc = (a_sameteam & !a_sameunum)) %>% dplyr::mutate(pass = ((a_sameteam & !a_sameunum) | (!a_tackle_scc & !a_sameteam))) %>% dplyr::filter(pass) %>% - select(-c(a_tackle_scc,tackle_scc, pass, a_sameteam, a_sameunum, after_team, after_unum)) %>% - dplyr::mutate(next_ball_x = lead(ball_x)) %>% - dplyr::mutate(next_ball_y = lead(ball_y)) + select(-c(a_tackle_scc,tackle_scc, pass, a_sameteam, a_sameunum, after_team, after_unum)) return(output) }