update to internal functions

Author: atungate

R/calc_projections.R

@@ -210,7 +210,7 @@ score_dst_pts_allowed = function(data_result, pts_bracket, is_actual = FALSE) {
     }, ppg, ppg_sd)
     df$dst_pts_allowed[!na_idx] = vapply(game_l, sum, numeric(1L))
   } else {
-    df$dst_pts_allowed[!na_idx] = score_pts_bracket(df$dst_pts_allowed, pts_bracket)
+    df$dst_pts_allowed[!na_idx] = score_pts_bracket(df$dst_pts_allowed[!na_idx], pts_bracket)
   }
   df$dst_pts_allowed
 }

R/helper_funcs.R

@@ -277,36 +277,44 @@ actual_points_scoring = function(season = NULL,
     stat_type = nflf_stat_type,
     season_type = season_type
   )
+
   nflf_stat = nflf_stat %>%
     dplyr::filter(grepl(sub("+", "|", !!season_type, fixed = TRUE), .data$season_type))
 
-
-
   # Loading pbp and filtering for season_type
   nflf_pbp = nflfastR::load_pbp(
     season = season,
     file_type = "rds"
   )
   nflf_pbp = nflf_pbp %>%
-    dplyr::filter(grepl(sub("+", "|", !!season_type, fixed = TRUE), .data$season_type))
+    dplyr::filter(grepl(sub("+", "|", !!season_type, fixed = TRUE), .data$season_type)) %>%
+    dplyr::mutate(home_team = rename_vec(home_team, unlist(team_corrections)),
+                  away_team = rename_vec(away_team, unlist(team_corrections)))
 
 
 
   # Adding week if summary level = "season"
   if(isTRUE(summary_level %in% c("season"))) {
     nflf_stat$week = 0L
     nflf_pbp$week = 0L
+  } else {
+    nflf_stat$opponent_team = rename_vec(nflf_stat$opponent_team, unlist(team_corrections))
   }
 
-  # Updating columns names to match our standard column names
+  # browser()
+
 
+  # Updating columns names to match our standard column names
   if(isTRUE(stat_type == "player")) {
     names(nflf_stat) = rename_vec(names(nflf_stat), nflfastr_player_cols)
+    nflf_stat$recent_team = rename_vec(nflf_stat$recent_team, unlist(team_corrections))
+
   } else {
     # names(nflfastr_player_cols) = gsub("idp", "dst", names(nflfastr_player_cols), fixed = TRUE)
     nflfastr_player_cols = gsub("idp", "dst", nflfastr_player_cols, fixed = TRUE)
     names(nflf_stat) = rename_vec(names(nflf_stat), nflfastr_player_cols)
 
+    nflf_stat$team = rename_vec(nflf_stat$team, unlist(team_corrections))
     nflf_stat$gsis_id = nflf_stat$team
     nflf_stat$pos = "DST"
 
@@ -366,6 +374,7 @@ actual_points_scoring = function(season = NULL,
       rec_100_yds = as.integer(rec_yds >= 100, na.rm = TRUE),
       rec_150_yds = as.integer(rec_yds >= 150, na.rm = TRUE),
       rec_200_yds = as.integer(rec_yds >= 200, na.rm = TRUE),
+      pos = ifelse(pos == "SPEC", "K", pos)
     )
 
   data_result = split.data.frame(nflf_stat, nflf_stat$pos)
@@ -388,10 +397,27 @@ actual_points_scoring = function(season = NULL,
                        .groups = "drop")
 
     actual_allowed = dplyr::bind_rows(
-      dplyr::select(temp_scores, season_year = season, week, team = home_team, dst_pts_allowed = total_away_score),
-      dplyr::select(temp_scores, season_year = season, week, team = away_team, dst_pts_allowed = total_home_score)
+      dplyr::select(
+        temp_scores, season_year = season, week, team = home_team,
+        team_pts_scored = total_home_score, opp_pts_scored = total_away_score,
+        dst_pts_allowed = total_away_score
+        ),
+      dplyr::select(
+        temp_scores, season_year = season, week, team = away_team,
+        team_pts_scored = total_away_score, opp_pts_scored = total_home_score,
+        dst_pts_allowed = total_home_score
+        )
     )
 
+    if(summary_level == "season") {
+      actual_allowed = actual_allowed %>%
+        dplyr::group_by(season_year, week, team) %>%
+        dplyr::summarise(team_pts_scored = sum(team_pts_scored, na.rm = TRUE),
+                         opp_pts_scored = sum(opp_pts_scored, na.rm = TRUE),
+                         dst_pts_allowed = sum(dst_pts_allowed, na.rm = TRUE),
+                         .groups = "drop")
+    }
+
     data_result[["DST"]] = data_result[["DST"]] %>%
       dplyr::left_join(actual_allowed, c("season_year", "week", "team")) %>%
       dplyr::select(-gsis_id, -pos)
@@ -402,20 +428,37 @@ actual_points_scoring = function(season = NULL,
   if(isTRUE(stat_type == "dst")) {
     scoring_rules = scoring_rules[c("ret", "dst", "pts_bracket")]
   }
-
-
   data_result[] = source_points(data_result, scoring_rules, return_data_result = TRUE, is_actual = TRUE)
 
   nflf_out_df = dplyr::bind_rows(data_result)
 
 
+
   if(isFALSE(rename_colums)) {
     switch_back_names = setNames(names(nflfastr_player_cols), nflfastr_player_cols)
 
     names(nflf_out_df) = rename_vec(names(nflf_out_df), switch_back_names)
   }
   nflf_out_df
 }
+# devtools::load_all()
+# df_out = actual_points_scoring(
+#   season = 2019,
+#   summary_level = c("season"),
+#   stat_type = c("player", "dst", "team"),
+#   season_type = c("REG", "POST", "REG+POST"),
+#   scoring_rules = NULL,
+#   vor_baseline = NULL,
+#   rename_colums = TRUE
+# )
+
+
+
+
+
+
+
+
 
 
 

R/recode_vars.R

@@ -5,9 +5,10 @@ pos_corrections = list(Def = "DST", D = "DST", DEF = "DST", "D/ST" = "DST", PK =
                        OLB = "LB", SS = "DB", FB = "RB")
 
 team_corrections <- list(KCC = "KC", SFO = "SF", TBB = "TB", NEP = "NE", RAM = "LAR",
-                         LA = "LAR", SDC = "SD", ARZ = "ARI", NOR = "NO", GBP = "GB",
+                         LA = "LAR", SDC = "LAC", ARZ = "ARI", NOR = "NO", GBP = "GB",
                          JAX = "JAC", WSH = "WAS", HST = "HOU", CLV = "CLE", BLT = "BAL",
-                         NWE = "NE", NOS = "NO", LVR = "LV")
+                         NWE = "NE", NOS = "NO", LVR = "LV", STL = "LAR", OAK = "LV",
+                         SD = "LAC")
 
 
 nflTeam.abb <- c("ARI", "ATL", "BAL", "BUF", "CAR", "CHI", "CIN", "CLE",