Update app.R

app.R

@@ -6,50 +6,41 @@ library(caret)
 library(shinythemes)
 library(ggplot2)
 
-calculate_timstuff <- function(data, pitch_type) {
-    data_matrix <- as.matrix(data)
-    if (pitch_type == "Offspeed") {
-      mod <- xgb.load('Off.model')
-      prediction <- predict(mod, data_matrix)
-      timstuff <- (50 - (prediction - -0.002239657) / 0.01043216 * 10)
-    } else if (pitch_type == "Breaking") {
-      mod <- xgb.load('Break.model')
-      prediction <- predict(mod, data_matrix)
-      timstuff <- (50 - (prediction - -0.004822031) / 0.007912765 * 10)
-    } else {
-      mod <- xgb.load('FB.model')
-      prediction <- predict(mod, data_matrix)
-      timstuff <- (50 - (prediction - -0.0011801) / 0.007989927 * 10)
-    }
-    return(timstuff)
-  }
+calculate_timstuff <- function(data) {
+  data_matrix <- as.matrix(data)
+  mod <- xgb.load('TimStuff2.model')
+  prediction <- predict(mod, data_matrix)
+  timstuff <- (100 - (prediction - -0.00249975) / 0.007566558 * 10)
+  return(timstuff)
+}
 
 ui <- fluidPage(
   theme = shinytheme("flatly"),
   
-  titlePanel("TimStuff Fastball/Offspeed/Breaking Calculator"),
+  titlePanel("TimStuff+ Calculator"),
   
   sidebarLayout(
     sidebarPanel(
       width = 4,
-      radioButtons("pitch", "Pitch Type", choices = c("Fastball", "Offspeed", "Breaking"), inline = TRUE),
       radioButtons("phand", "Hand", choices = c("R", "L"), inline = TRUE),
-      
       numericInput("velo", "Velocity (mph)", value = 95, min = 70, max = 110, step = 1),
-      numericInput("ivb", "Induced Vertical Break (in)", value = 16, min = -20, max = 30, step = 0.1),
-      numericInput("hb", "Horizontal Break +Arm/-Glove (in)", value = 6, min = -20, max = 20, step = 0.1),
+      numericInput("ivb", "Induced Vertical Break (in)", value = 16, min = -30, max = 30, step = 0.1),
+      numericInput("hb", "Horizontal Break (in.) (Pitcher's Perspective)", value = 6, min = -25, max = 25, step = 0.1),
       numericInput("spinrate", "Spin Rate (rpm)", value = 2300, min = 1000, max = 3500, step = 10),
       numericInput("ext", "Extension (ft)", value = 6.3, min = 5, max = 8, step = 0.1),
       numericInput("spinaxisdiff", "Spin Axis Difference (°)", value = 0, min = -180, max = 180, step = 1),
-      numericInput("x0", "Horizontal Release Point (ft)", value = -1.5, min = -5, max = 5, step = 0.1),
+      numericInput("x0", "Horizontal Release Point (ft) (Catcher's Perspective)", value = -1.5, min = -5, max = 5, step = 0.1),
       numericInput("z0", "Vertical Release Point (ft)", value = 5, min = 3, max = 8, step = 0.1),
+      numericInput("primvelo", "Average Velocity of Primary Pitch", value = 95, min = 70, max = 110, step = 1),
+      numericInput("primIVB", "Average IVB of Primary Pitch", value = 16, min = -30, max = 30, step = 0.1),
+      numericInput("primHB", "Average HB of Primary Pitch", value = 6, min = -25, max = 25, step = 0.1),
       selectInput("feature_to_vary", "Select Feature to Vary:",
-            choices = c("Velocity" = "start_speed",
-                        "Induced Vertical Break" = "IVB",
-                        "Horizontal Break" = "HB",
-                        "Spin Rate" = "spin_rate",
-                        "Extension" = "EAA",
-                        "Spin Axis Difference" = "SADiff"))
+                  choices = c("Velocity" = "start_speed",
+                              "Induced Vertical Break" = "IVB",
+                              "Horizontal Break" = "HB",
+                              "Spin Rate" = "spin_rate",
+                              "Extension" = "EAA",
+                              "Spin Axis Difference" = "SADiff"))
     ),
     
     mainPanel(
@@ -64,73 +55,66 @@ ui <- fluidPage(
 )
 
 server <- function(input, output) {
-  observeEvent(input$pitch, {
-    output$stuff <- renderText({
-      data <- data.frame(
-        start_speed = input$velo,
-        IVB = input$ivb,
-        HB = input$hb,
-        EAA = input$ext / 6.3,
-        x0 = ifelse(input$phand == "L", -input$x0, input$x0),
-        z0 = input$z0,
-        spin_rate = input$spinrate,
-        SADiff = input$spinaxisdiff
-      )
-      
-      data <- as.matrix(data)
-      
-      TimStuff <- calculate_timstuff(data, input$pitch)
-      
-      paste("TimStuff:", round(TimStuff, 2), "\n20-80 Scale, 50 is Average, 1 SD is 10")
-    })
+  reactive_data <- reactive({
+    data.frame(
+      ishandL = ifelse(input$phand == "L", 1, 0),
+      start_speed = input$velo,
+      IVB = input$ivb,
+      HB = input$hb,
+      EAA = input$ext / 6.3,
+      x0 = input$x0,
+      z0 = input$z0,
+      spin_rate = input$spinrate,
+      SADiff = input$spinaxisdiff,
+      primary_speed = input$primvelo,
+      primary_IVB = input$primIVB,
+      primary_HB = input$primHB
+    )
+  })
+  
+  output$stuff <- renderText({
+    data <- reactive_data()
+    TimStuff <- calculate_timstuff(data)
+    paste("TimStuff+:", round(TimStuff, 2), "\nTimStuff+ scale is 100 is Average, 1 SD is 10")
+  })
+  
+  feature_range <- reactive({
+    ranges <- list(
+      start_speed = c(70, 110),
+      IVB = c(-20, 30),
+      HB = c(-20, 20),
+      spin_rate = c(1000, 3500),
+      EAA = c(5/6.3, 8/6.3),
+      SADiff = c(-180, 180)
+    )
+    ranges[[input$feature_to_vary]]
+  })
+  
+  output$feature_impact <- renderPlot({
+    base_data <- reactive_data()
     
-    feature_range <- reactive({
-      ranges <- list(
-        start_speed = c(70, 110),
-        IVB = c(-20, 30),
-        HB = c(-20, 20),
-        spin_rate = c(1000, 3500),
-        EAA = c(5/6.3, 8/6.3),
-        SADiff = c(-180, 180)
-      )
-      ranges[[input$feature_to_vary]]
-    })
-
-    output$feature_impact <- renderPlot({
-      base_data <- data.frame(
-        start_speed = input$velo,
-        IVB = input$ivb,
-        HB = input$hb,
-        EAA = input$ext / 6.3,
-        x0 = ifelse(input$phand == "L", -input$x0, input$x0),
-        z0 = input$z0,
-        spin_rate = input$spinrate,
-        SADiff = input$spinaxisdiff
-      )
-      
-      feature_seq <- seq(feature_range()[1], feature_range()[2], length.out = 100)
-      
-      varied_data <- do.call(rbind, replicate(100, base_data, simplify = FALSE))
-      varied_data[[input$feature_to_vary]] <- feature_seq
-      timstuff <- calculate_timstuff(varied_data, input$pitch)
-      
-      plot_data <- data.frame(
-        Feature = names(base_data)[which(names(base_data) == input$feature_to_vary)],
-        Value = feature_seq,
-        TimStuff = timstuff
-      )
-      
-      ggplot(plot_data, aes(x = Value, y = TimStuff)) +
-        geom_line(color = "blue", size = 1) +
-        geom_point(aes(x = base_data[[input$feature_to_vary]], 
-                       y = calculate_timstuff(base_data, input$pitch)),
-                   color = "red", size = 3) +
-        theme_minimal() +
-        ylim(0,100) +
-        labs(title = paste("Impact of", input$feature_to_vary, "on TimStuff"),
-             x = input$feature_to_vary, y = "TimStuff") +
-        theme(text = element_text(size = 14))
-    })
+    feature_seq <- seq(feature_range()[1], feature_range()[2], length.out = 100)
+    
+    varied_data <- do.call(rbind, replicate(100, base_data, simplify = FALSE))
+    varied_data[[input$feature_to_vary]] <- feature_seq
+    timstuff <- calculate_timstuff(varied_data)
+    
+    plot_data <- data.frame(
+      Feature = names(base_data)[which(names(base_data) == input$feature_to_vary)],
+      Value = feature_seq,
+      TimStuff = timstuff
+    )
+    
+    ggplot(plot_data, aes(x = Value, y = TimStuff)) +
+      geom_line(color = "blue", size = 1) +
+      geom_point(aes(x = base_data[[input$feature_to_vary]], 
+                     y = calculate_timstuff(base_data)),
+                 color = "red", size = 3) +
+      theme_minimal() +
+      ylim(50,150) +
+      labs(title = paste("Impact of", input$feature_to_vary, "on TimStuff"),
+           x = input$feature_to_vary, y = "TimStuff") +
+      theme(text = element_text(size = 14))
   })
 }