Update app.R

app.R

@@ -117,64 +117,9 @@ AAA <- rbind(AAA,AAA25)
 FSL <- rbind(FSL,FSL25)
 
 is_barrel <- function(df) {
-  df$hit_speedr <- round(df$hit_speed)
-  df <- df |>
-    mutate(barrel = ifelse((hit_speedr >= 124) &
-                             (hit_angle >= 0 & hit_angle <= 50),1,0)) |>
-    mutate(barrel = ifelse((hit_speedr == 123) &
-                             (hit_angle >= 1 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 122) &
-                             (hit_angle >= 2 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 121) &
-                             (hit_angle >= 3 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 120) &
-                             (hit_angle >= 4 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 119) &
-                             (hit_angle >= 5 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 118) &
-                             (hit_angle >= 6 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 117) &
-                             (hit_angle >= 7 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 116) &
-                             (hit_angle >= 8 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 115) &
-                             (hit_angle >= 9 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 114) &
-                             (hit_angle >= 10 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 113) &
-                             (hit_angle >= 11 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 112) &
-                             (hit_angle >= 12 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 111) &
-                             (hit_angle >= 13 & hit_angle <= 50),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 110) &
-                             (hit_angle >= 14 & hit_angle <= 48),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 109) &
-                             (hit_angle >= 15 & hit_angle <= 46),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 108) &
-                             (hit_angle >= 16 & hit_angle <= 45),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 107) &
-                             (hit_angle >= 17 & hit_angle <= 43),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 106) &
-                             (hit_angle >= 18 & hit_angle <= 42),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 105) &
-                             (hit_angle >= 19 & hit_angle <= 40),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 104) &
-                             (hit_angle >= 20 & hit_angle <= 39),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 103) &
-                             (hit_angle >= 21 & hit_angle <= 37),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 102) &
-                             (hit_angle >= 22 & hit_angle <= 36),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 101) &
-                             (hit_angle >= 23 & hit_angle <= 34),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 100) &
-                             (hit_angle >= 24 & hit_angle <= 33),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 99) &
-                             (hit_angle >= 25 & hit_angle <= 31),1,barrel)) |>
-    mutate(barrel = ifelse((hit_speedr == 98) &
-                             (hit_angle >= 26 & hit_angle <= 30),1,barrel)) |>
-    select(-hit_speedr)
-  return(df)
+    df$barrel <- with(df, ifelse(hit_angle <= 50 & hit_speed >= 97 & hit_speed * 1.5 - 
+                                     hit_angle >= 117 & hit_speed + hit_angle >= 123, 1, 0))
+    return(df)
 }
 
 VAA <- function(milbtotal){