Update app.R

app.R

@@ -1277,7 +1277,14 @@ if ("TaggedPitchType" %in% names(df)) {
       SwingIndicator  = ifelse(PitchCall %in% c("StrikeSwinging","FoulBallNotFieldable","FoulBall","InPlay"), 1, 0),
       FPindicator  = ifelse(Balls == 0 & Strikes == 0, 1, 0),
       FPSindicator = ifelse(PitchCall %in% c("StrikeCalled","StrikeSwinging","FoulBallNotFieldable","FoulBall","InPlay") & FPindicator == 1, 1, 0),
-      AheadIndicator = ifelse(((Balls == 0 & Strikes == 1) | (Balls == 1 & Strikes == 1)) & StrikeIndicator == 1, 1, 0),
+      EarlyIndicator = ifelse(
+        ((Balls == 0 & Strikes == 0 & PitchCall == "InPlay") |
+           (Balls == 1 & Strikes == 0 & PitchCall == "InPlay") |
+           (Balls == 0 & Strikes == 1 & PitchCall == "InPlay") |
+           (Balls == 1 & Strikes == 1 & PitchCall == "InPlay")), 1, 0),
+      AheadIndicator = ifelse(
+        ((Balls == 0 & Strikes == 1) & (PitchCall %in% c("StrikeCalled", "StrikeSwinging", "FoulBallNotFieldable",'FoulBall'))) |
+          ((Balls == 1 & Strikes == 1) & (PitchCall %in% c("StrikeCalled", "StrikeSwinging", "FoulBallNotFieldable",'FoulBall'))), 1, 0),
       ABindicator = ifelse(PlayResult %in% c("Error","FieldersChoice","Out","Single","Double","Triple","HomeRun") | KorBB == "Strikeout", 1, 0),
       HitIndicator = ifelse(PlayResult %in% c("Single","Double","Triple","HomeRun"), 1, 0),
       PAindicator  = ifelse(PitchCall %in% c("InPlay","HitByPitch","CatchersInterference") | KorBB %in% c("Walk","Strikeout"), 1, 0),
@@ -1326,9 +1333,11 @@ calculate_tableau_header_stats <- function(pitcher_df) {
   fp_k_pct <- ifelse(fp_pitches > 0,
                      round(100 * sum(pitcher_df$FPSindicator, na.rm = TRUE) / fp_pitches, 0), 0)
 
-  ea_pct <- ifelse(fp_pitches > 0,
-                   round(100 * (sum(pitcher_df$FPSindicator, na.rm = TRUE) +
-                                  sum(pitcher_df$AheadIndicator & pitcher_df$Balls == 0, na.rm = TRUE)) / fp_pitches, 0), 0)
+  ea_pct <- round(
+  (sum(EarlyIndicator, na.rm = TRUE) + sum(AheadIndicator, na.rm = TRUE)) /
+  sum(PAindicator, na.rm = TRUE) * 100,
+  1
+)
 
   comp_pct <- ifelse(total_pitches > 0,
                      round(100 * sum(pitcher_df$QualityPitchIndicator, na.rm = TRUE) / total_pitches, 0), 0)