Update scoring percentage calculations to include separate metrics for Draftkings and Fanduel ('DK_Runs/$' and 'FD_Runs/$'). Adjust column selections and renaming for improved clarity in player statistics, while dropping unnecessary salary columns based on the selected site.

app.py

@@ -117,8 +117,9 @@ def init_baselines():
     cursor = collection.find()
     team_frame = pd.DataFrame(cursor)
     scoring_percentages = team_frame.drop(columns=['_id'])
-    scoring_percentages['Runs/$'] = scoring_percentages['Avg Score'] / (scoring_percentages['Avg_Salary'] / 1000)
-    scoring_percentages = scoring_percentages[['Names', 'Avg_Salary_DK', 'Avg_Salary_FD', 'Stack_Prio', 'Opp_SP', 'Avg First Inning', 'First Inning Lead Percentage', 'Avg Fifth Inning', 'Fifth Inning Lead Percentage', 'Avg Score', 'Runs/$', '8+ runs', 'Win Percentage',
+    scoring_percentages['DK_Runs/$'] = scoring_percentages['Avg Score'] / (scoring_percentages['Avg_Salary_DK'] / 1000)
+    scoring_percentages['FD_Runs/$'] = scoring_percentages['Avg Score'] / (scoring_percentages['Avg_Salary_FD'] / 1000)
+    scoring_percentages = scoring_percentages[['Names', 'Avg_Salary_DK', 'Avg_Salary_FD', 'Stack_Prio', 'Opp_SP', 'Avg First Inning', 'First Inning Lead Percentage', 'Avg Fifth Inning', 'Fifth Inning Lead Percentage', 'Avg Score', 'DK_Runs/$', 'FD_Runs/$', '8+ runs', 'Win Percentage',
     'DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'DK Main Top Score', 'FD Main Top Score', 'DK Secondary Top Score', 'FD Secondary Top Score',
     'DK Turbo Top Score', 'FD Turbo Top Score']]
     scoring_percentages['8+ runs'] = scoring_percentages['8+ runs'].replace('%', '', regex=True).astype(float)
@@ -385,11 +386,11 @@ with tab1:
             scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate', 'FD Main Top Score', 'DK Main Top Score', 'FD Secondary Top Score', 'DK Secondary Top Score', 'DK Turbo Top Score'], axis=1)
     scoring_percentages = scoring_percentages.sort_values(by='8+ runs', ascending=False)
     if site_var == 'Draftkings':
-        scoring_percentages = scoring_percentages.rename(columns={'DK LevX': 'LevX', 'DK Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs'})
-        scoring_percentages = scoring_percentages.drop(['FD Own%', 'Avg_Salary_FD'], axis=1)
+        scoring_percentages = scoring_percentages.rename(columns={'DK LevX': 'LevX', 'DK Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs', 'DK_Runs/$': 'Runs/$'})
+        scoring_percentages = scoring_percentages.drop(['FD Own%', 'Avg_Salary_FD', 'FD_Runs/$'], axis=1)
     elif site_var == 'Fanduel':
-        scoring_percentages = scoring_percentages.rename(columns={'FD LevX': 'LevX', 'FD Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs'})
-        scoring_percentages = scoring_percentages.drop(['DK Own%', 'Avg_Salary_DK'], axis=1)
+        scoring_percentages = scoring_percentages.rename(columns={'FD LevX': 'LevX', 'FD Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs', 'FD_Runs/$': 'Runs/$'})
+        scoring_percentages = scoring_percentages.drop(['DK Own%', 'Avg_Salary_DK', 'DK_Runs/$'], axis=1)
     
     if view_var == "Simple":
         scoring_percentages = scoring_percentages[['Names', 'Runs', '8+ Runs', 'Win%', 'LevX', 'Own%']]
@@ -399,7 +400,7 @@ with tab1:
         if prio_var is not None:
             scoring_percentages = scoring_percentages[scoring_percentages['Stack_Prio'] == prio_var]
         scoring_percentages = scoring_percentages.set_index('Names', drop=True)
-        st.dataframe(scoring_percentages.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').background_gradient(cmap='RdYlGn_r', subset=['Avg_Salary', 'Own%']).format(game_format, precision=2), height=750, use_container_width = True)
+        st.dataframe(scoring_percentages.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').background_gradient(cmap='RdYlGn_r', subset=['Own%']).format(game_format, precision=2), height=750, use_container_width = True)
 
 with tab2:
     st.header("Player ROO")