Choose OFFB implementation of HR/FB

pitch_leaderboard.py

@@ -41,7 +41,7 @@ def create_pitch_leaderboard(player_team_type):
       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%', 'PLUS%'],
-      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR/FB', 'HR/OFFB'],
+      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR/FB'],
       'Approach': ['Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%']
     }
     
@@ -51,7 +51,7 @@ def create_pitch_leaderboard(player_team_type):
       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%', 'PLUS%'],
-      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR/FB', 'HR/OFFB']
+      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR/FB']
     }
 
   all_cols = prefix_cols + sum(list(theme_to_cols.values()), [])

player_team_leaderboard.py

@@ -33,7 +33,7 @@ def create_player_team_leaderboard_app(player_team_type):
       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%', 'PLUS%'],
-      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR%', 'HR/FB', 'HR/OFFB'],
+      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR%', 'HR/FB'],
       'Approach': ['Zone%', 'Arm%', 'Glove%', 'High%', 'Low%', 'MM%', 'Behind%', 'Sec%']
     }
     all_cols = prefix_cols + sum(list(theme_to_cols.values()), [])
@@ -46,7 +46,7 @@ def create_player_team_leaderboard_app(player_team_type):
       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%', 'PLUS%'],
-      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR%', 'HR/FB', 'HR/OFFB']
+      'Batted Ball': ['GB%', 'FB%', 'LD%', 'OFFB%', 'IFFB%', 'AIR%', 'HR%', 'HR/FB']
     }
     all_cols = prefix_cols + sum(list(theme_to_cols.values()), [])
     for theme, cols in theme_to_cols.items():

stats.py

@@ -80,8 +80,9 @@ register_stat('IFFB%', pl.col('P'), True, Player.PITCHER, True)
 register_stat('OFFB%', pl.col('F'), True, Player.BATTER, True)
 register_stat('AIR%', pl.col('F') + pl.col('P') + pl.col('L'), True, Player.BATTER, True)
 register_stat('HR%', (pl.col('presult') == 'Home run').sum() / pa, True, Player.BATTER)
-register_stat('HR/FB', (pl.col('presult') == 'Home run').sum() / (pl.col('aux_bresult').struct.field('batType') == 'F').sum(), True, Player.BATTER)
-register_stat('HR/OFFB', (pl.col('presult') == 'Home run').sum() / (pl.col('aux_bresult').struct.field('batType').is_in(['F', 'P'])).sum(), True, Player.BATTER)
+register_stat('HR/FB', (pl.col('presult') == 'Home run').sum() / (pl.col('aux_bresult').struct.field('batType').is_in(['F', 'P'])).sum(), True, Player.BATTER)
+# note: to match bouno-san's data, HR/FB bust be /FB for pitchers and /OFFB for batters; 
+# /OFFB matches both player types for DeltaGraphs, so we use /OFFB in implementaiton and /FB in na,e
 
 # register_stat('Usage', pl.col('count')/pl.sum('count').over('pitId'), True, None)
 register_stat('Usage', pl.len()/pl.first('Pitches'), True, None)