Add PLUS%

pitch_leaderboard.py

@@ -40,19 +40,17 @@ def create_pitch_leaderboard(player_team_type):
     if team:
       prefix_cols = [col for col in prefix_cols if col not in ('Pitcher', 'Throws')]
     theme_to_cols = {
-      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%'],
+      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'PLUS%'],
       'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%'],
       'Approach': ['Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
     }
     
   else:
     prefix_cols = ['Batter', 'Team', 'Bats', 'Pitch', 'Pitch (General)', 'Count', 'Usage', 'Avg Velo', 'Max Velo']
-    plate_disc_cols = ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%']
-    batted_ball_cols = ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']
     if team:
       prefix_cols = [col for col in prefix_cols if col not in ('Batter', 'Bats')]
     theme_to_cols = {
-      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%'],
+      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'PLUS%'],
       'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']
     }
 

player_team_leaderboard.py

@@ -36,7 +36,7 @@ def create_player_team_leaderboard_app(player_team_type):
     if team:
       prefix_cols = [col for col in prefix_cols if col not in ('Pitcher', 'Throws')]
     theme_to_cols = {
-      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%'],
+      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'Strike%', 'Ball%', 'F-Str%', 'PAR%', 'PLUS%'],
       'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%'],
       'Approach': ['Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
     }
@@ -46,12 +46,10 @@ def create_player_team_leaderboard_app(player_team_type):
     
   else:
     prefix_cols = ['Batter', 'Team', 'Bats', 'PA', 'K%', 'BB%']
-    plate_disc_cols = ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Contact%', 'O-Contact%', 'SwStr%', 'Whiff%', 'CSW%']
-    batted_ball_cols = ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']
     if team:
       prefix_cols = [col for col in prefix_cols if col not in ('Batter', 'Bats')]
     theme_to_cols = {
-      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%'],
+      'Plate Discipline': ['Swing%', 'Z-Swing%', 'Chase%', 'Contact%', 'Z-Con%', 'O-Con%', 'SwStr%', 'Whiff%', 'CSW%', 'PLUS%'],
       'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%']
     }
     all_cols = prefix_cols + sum(list(theme_to_cols.values()), [])

stats.py

@@ -38,6 +38,12 @@ is_ball = pl.col('presult').is_in(verify_and_return_presult(['Ball', 'Walk']))
 is_non_ball = pl.col('pitch') & ~is_ball # pitches that are not balls i.e. no catcher interference, etc.
 is_two_str = pl.col('before_s') == 2 # named this way in case I use two_str for 2-Str%
 first_count = (pl.col('before_s') == 0) & (pl.col('before_b') == 0)
+is_bip_out = pl.col('presult').is_in(verify_and_return_presult([
+  'Groundout', 'Flyout', 'Lineout', 'Groundout (Double play)',
+  'Foul fly', 'Foul line (?)',
+  'Sacrifice bunt', 'Sacrifice fly',
+  "Fielder's choice", "Sacrifice fielder's choice"
+]))
 
 register_stat('FB Velo', pl.col('FB Velo').max(), False, Player.PITCHER)
 register_stat('K%', pl.when(pl.col('presult').str.contains('strikeout')).then(1).otherwise(0).sum() / pl.col('pa_code').unique().len(), True, Player.PITCHER)
@@ -55,6 +61,7 @@ register_stat('Ball%', is_ball.sum() / pl.col('pitch').sum(), True, Player.BATTE
 register_stat('Strike%', is_non_ball.sum() / pl.col('pitch').sum(), True, Player.PITCHER)
 register_stat('F-Str%', (is_non_ball  & first_count).sum() / first_count.sum(), True, Player.PITCHER)
 register_stat('PAR%', ((is_two_str & pl.col('presult').str.contains('strikeout')).sum()) / is_two_str.sum(), True, Player.PITCHER)
+register_stat('PLUS%', (pl.col('csw') | (pl.col('presult') == 'Foul') | is_bip_out).sum() / pl.col('pitch').sum(), True, Player.PITCHER)
 register_stat('Behind%', ((pl.col('before_b') > pl.col('before_s')) & (pl.col('before_s') < 2) & (pl.col('before_b') > 1)).sum() / pl.len(), True, Player.BATTER)
 register_stat('Zone%', pl.col('zone').sum() / pl.col('pitch').sum(), True, Player.PITCHER)
 register_stat('Glove%', (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') < 0).otherwise(pl.col('x') > 0)).mean(), True, None)
@@ -74,39 +81,6 @@ register_stat('Usage', pl.len()/pl.first('Pitches'), True, None)
 register_stat('Avg Velo', pl.when(valid_pitch).then('mph').mean(), False, None)
 register_stat('Max Velo', pl.col('mph').max(), False, None)
 
-# swing = (pl.col('swing').sum() / pl.col('pitch').sum()).alias('Swing%')
-# z_swing = ((pl.col('swing') & pl.col('zone')).sum() / pl.col('zone').sum()).alias('Z-Swing%')
-# chase = ((pl.col('swing') & ~pl.col('zone')).sum() / (~pl.col('zone')).sum()).alias('Chase%')
-# contact = ((pl.col('swing') & ~pl.col('whiff')).sum()/pl.col('swing').sum()).alias('Contact%')
-# z_con = ((pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(pl.col('zone') & pl.col('swing')).sum()).alias('Z-Contact%')
-# o_con = ((~pl.col('zone') & pl.col('swing') & ~pl.col('whiff')).sum()/(~pl.col('zone') & pl.col('swing')).sum()).alias('O-Contact%')
-# whiff = (pl.col('whiff').sum() / pl.col('swing').sum()).alias('Whiff%')
-# swstr = (pl.col('whiff').sum() / pl.col('pitch').sum()).alias('SwStr%')
-# csw = (pl.col('csw').sum() / pl.col('pitch').sum()).alias('CSW%')
-# is_ball = pl.col('presult').is_in(verify_and_return_presult(['Ball', 'Walk']))
-# is_non_ball = pl.col('pitch') & ~is_ball # pitches that are not balls i.e. no catcher interference, etc.
-# ball = (is_ball.sum() / pl.col('pitch').sum()).alias('Ball%')
-# strike = (is_non_ball.sum() / pl.col('pitch').sum()).alias('Strike%')
-# is_two_str = pl.col('before_s') == 2 # named this way in case I use two_str for 2-Str%
-# first_count = (pl.col('before_s') == 0) & (pl.col('before_b') == 0)
-# f_strike = ((is_non_ball  & first_count).sum() / first_count.sum()).alias('F-Str%')
-# par = (((is_two_str & pl.col('presult').str.contains('strikeout')).sum()) / is_two_str.sum()).alias('PAR%')
-# behind = (((pl.col('before_b') > pl.col('before_s')) & (pl.col('before_s') < 2) & (pl.col('before_b') > 1)).sum() / pl.len()).alias('Behind%')
-# zone = (pl.col('zone').sum() / pl.col('pitch').sum()).alias('Zone%')
-# glove = (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') < 0).otherwise(pl.col('x') > 0)).mean().alias('Glove%')
-# arm = (pl.when(pl.col('pitLR') == 'r').then(pl.col('x') >= 0).otherwise(pl.col('x') <= 0)).mean().alias('Arm%')
-# high = (pl.col('y') > 125).mean().alias('High%')
-# low = (pl.col('y') <= 125).mean().alias('Low%')
-# mm = (pl.col('x').is_between(-20, 20) & pl.col('y').is_between(100, 100+50)).mean().alias('MM%')
-# obp = (
-  # pl.col('presult').is_in(verify_and_return_presult(['Single', 'Double', 'Triple', 'Home run', 'Walk', 'Inside-the-park home run', 'Hit by pitch'])).sum() /
-  # (pl.col('AB').first() + pl.col('presult').is_in(verify_and_return_presult(['Walk', 'Hit by pitch', 'Sacrifice fly'])).sum())
-# ).round(3).alias('OBP')
-# h = pl.col('presult').is_in(verify_and_return_presult(['Single', 'Double', 'Triple', 'Home run', 'Inside-the-park home run'])).sum().alias('H')
-# bb = pl.col('presult').is_in(verify_and_return_presult(['Walk'])).sum().alias('BB')
-# hbp = pl.col('presult').is_in(verify_and_return_presult(['Hit by pitch'])).sum().alias('HBP')
-# sf =  pl.col('presult').is_in(verify_and_return_presult(['Sacrifice fly'])).sum().alias('SF')
-
 
 def filter_data_by_date_and_game_kind(data, start_date=None, end_date=None, game_kind=None):
   if start_date is not None: