Update app.R

app.R

@@ -1967,6 +1967,7 @@ has_col_index <- function(idx) {
   is.numeric(idx) && length(idx) == 1 && !is.na(idx) && is.finite(idx) && idx >= 1
 }
 
+            
 stuffplus_model <- tryCatch({
   readr::read_rds("college_stuffplusCC.rds")
 }, error = function(e) {
@@ -2191,24 +2192,114 @@ advanced_normalize_columns <- function(df) {
 
 normalize_columns <- advanced_normalize_columns
 
+process_pitcher_indicators <- function(df) {
+  # Ensure basic columns exist
+  df <- df %>%
+    mutate(
+      # Outs on play - you may need to adjust based on your data structure
+      OutsOnPlay = case_when(
+        PlayResult == "Out" ~ 1,
+        PlayResult == "FieldersChoice" ~ 1,
+        PlayResult == "Sacrifice" ~ 1,
+        PlayResult == "SacrificeFly" ~ 1,
+        KorBB == "Strikeout" ~ 1,
+        # Double play - adjust if you have this info
+        TRUE ~ 0
+      ),
+      
+      # Runs scored - you may already have this column
+      RunsScored = if ("RunsScored" %in% names(df)) RunsScored else 0,
+      
+      # Hit indicator
+      is_hit = as.integer(PlayResult %in% c("Single", "Double", "Triple", "HomeRun")),
+      
+      # On base indicator (hits + walks + HBP)
+      on_base = as.integer(
+        PlayResult %in% c("Single", "Double", "Triple", "HomeRun") |
+        KorBB == "Walk" |
+        PitchCall == "HitByPitch"
+      ),
+      
+      # Total bases for SLG
+      total_bases = case_when(
+        PlayResult == "Single" ~ 1,
+        PlayResult == "Double" ~ 2,
+        PlayResult == "Triple" ~ 3,
+        PlayResult == "HomeRun" ~ 4,
+        TRUE ~ 0
+      ),
+      
+      # SLG is total_bases per AB - we'll calculate per PA for simplicity
+      # You may want to exclude walks/HBP from denominator for true SLG
+      slg = total_bases,
+      
+      # Strikeout indicator (per PA)
+      is_k = as.integer(KorBB == "Strikeout"),
+      
+      # Walk indicator (per PA)
+      is_walk = as.integer(KorBB == "Walk"),
+      
+      # CSW (Called Strike + Whiff) indicator
+      is_csw = as.integer(PitchCall %in% c("StrikeCalled", "StrikeSwinging")),
+      
+      # Chase indicator (swing outside zone)
+      chase = as.integer(
+        PitchCall %in% c("StrikeSwinging", "FoulBall", "FoulBallNotFieldable", 
+                         "FoulBallFieldable", "InPlay") &
+        (PlateLocSide < -0.83 | PlateLocSide > 0.83 |
+         PlateLocHeight < 1.5 | PlateLocHeight > 3.38)
+      ),
+      
+      # In zone indicator
+      in_zone = as.integer(
+        PlateLocSide >= -0.83 & PlateLocSide <= 0.83 &
+        PlateLocHeight >= 1.5 & PlateLocHeight <= 3.38
+      ),
+      
+      # Whiff indicator
+      is_whiff = as.integer(PitchCall == "StrikeSwinging"),
+      
+      # Put away indicator (strikeout with 2 strikes)
+      is_put_away = as.integer(KorBB == "Strikeout" & Strikes == 2),
+      
+      # PA indicator for rate calculations
+      PAindicator = as.integer(
+        !is.na(KorBB) | 
+        PlayResult %in% c("Single", "Double", "Triple", "HomeRun", "Out", 
+                          "FieldersChoice", "Error", "Sacrifice", "SacrificeFly") |
+        PitchCall == "HitByPitch"
+      )
+    )
+  
+  df
+}
+
 create_advanced_pitcher_summary <- function(data, player_name) {
   data <- normalize_columns(data)
+  data <- process_pitcher_indicators(data)
+  
   pitcher_data <- data %>% dplyr::filter(Pitcher == player_name)
+  
+  # Calculate PA-level stats
+  pa_data <- pitcher_data %>%
+    filter(PAindicator == 1) %>%
+    group_by(Inning, Batter, PAofInning) %>%
+    slice_tail(n = 1) %>%  # Get final pitch of each PA
+    ungroup()
+  
   summary_stats <- pitcher_data %>%
     dplyr::summarise(
-      BF = dplyr::n_distinct(paste(Inning, Batter, PAofInning)),
-      P = dplyr::n(),
+      IP = round(sum(OutsOnPlay, na.rm = TRUE) / 3, 1),
+      R = sum(RunsScored, na.rm = TRUE),
+      BF = n_distinct(paste(Inning, Batter, PAofInning)),
       K = sum(KorBB == "Strikeout", na.rm = TRUE),
       BB = sum(WalkIndicator, na.rm = TRUE),
-      H = sum(PlayResult %in% c("Single","Double","Triple","HomeRun"), na.rm = TRUE),
-      XBH = sum(PlayResult %in% c("Double","Triple","HomeRun"), na.rm = TRUE),
-      HR = sum(PlayResult == "HomeRun", na.rm = TRUE),
-      HBP = sum(HBPIndicator, na.rm = TRUE),
-      `Strike%` = 100 * sum(!PitchCall %in% c("BallCalled","HitByPitch","BallinDirt","BallIntentional")) / dplyr::n(),
-      `CSW%`    = 100 * sum(PitchCall %in% c("StrikeCalled","StrikeSwinging")) / dplyr::n(),
-      `Whiff%`  = ifelse(sum(SwingIndicator, na.rm = TRUE) > 0,
-                         100 * sum(WhiffIndicator, na.rm = TRUE) / sum(SwingIndicator, na.rm = TRUE), 0),
-      `Zone%`   = 100 * sum(StrikeZoneIndicator, na.rm = TRUE) / dplyr::n(),
+      H = sum(PlayResult %in% c("Single", "Double", "Triple", "HomeRun"), na.rm = TRUE),
+      `Strike%` = round(100 * mean(is_csw | PitchCall %in% c("FoulBall", "FoulBallNotFieldable", "InPlay"), na.rm = TRUE), 1),
+      `CSW%` = round(100 * mean(is_csw, na.rm = TRUE), 1),
+      `Whiff%` = ifelse(sum(SwingIndicator, na.rm = TRUE) > 0,
+                        round(100 * sum(is_whiff, na.rm = TRUE) / sum(SwingIndicator, na.rm = TRUE), 1), 0),
+      `Zone%` = round(100 * mean(in_zone, na.rm = TRUE), 1),
       .groups = "drop"
     )