Refactor VORP scoring and roster assignment in Streamlit app to include halfPPR and custom match dictionaries, enhancing accuracy in player evaluations and simplifying the function signatures for better clarity.

src/streamlit_app.py

@@ -383,31 +383,26 @@ def assign_vorp_scoring(frame: pd.DataFrame, halfPpr_rv: dict, custom_rv: dict,
     vorp_frame['pos_designation'] = vorp_frame['Pos'] + vorp_frame['pos_rank'].astype(str)
     pos_des_dict = dict(zip(vorp_frame['pos_designation'], vorp_frame['Name']))
     orig_rank_dict = dict(zip(vorp_frame['Name'], vorp_frame['pos_designation']))
+    half_ppr_match_dict = dict(zip(vorp_frame['pos_designation'], vorp_frame['halfPpr']))
+    custom_match_dict = dict(zip(vorp_frame['pos_designation'], vorp_frame[rv_type]))
 
-    return pos_des_dict, orig_rank_dict
 
-def assign_vorp_roster(frame: pd.DataFrame, halfPpr_rv: dict, custom_rv: dict, league_settings: dict, pos_vorp_limiters: dict) -> pd.DataFrame:
-    if league_settings['TYPE'] == 'Half PPR':
-        rv_type = 'halfPpr'
-    elif league_settings['TYPE'] == 'PPR':
-        rv_type = 'ppr'
-    elif league_settings['TYPE'] == 'Standard':
-        rv_type = 'standard'
-    elif league_settings['TYPE'] == 'Superflex':
-        rv_type = 'halfPpr'
-    elif league_settings['TYPE'] == 'TE Premium':
-        rv_type = 'halfPpr'
+    return pos_des_dict, orig_rank_dict, half_ppr_match_dict, custom_match_dict
+
+def assign_vorp_roster(frame: pd.DataFrame, halfPpr_rv: dict, custom_rv: dict, pos_vorp_limiters: dict, half_ppr_match_dict: dict, custom_match_dict: dict) -> pd.DataFrame:
 
     vorp_frame = pd.DataFrame()
     for positions in ['QB', 'RB', 'WR', 'TE']:
         pos_frame = frame[frame['Pos'] == positions]
         pos_frame = pos_frame[pos_frame['Rank'] != 0]
         pos_frame = pos_frame.sort_values(by='Rank', ascending=True).reset_index(drop=True)
+        halfPpr_rv_var = pos_frame['Rank'].map(half_ppr_match_dict)
+        custom_rv_var = pos_frame['Rank'].map(custom_match_dict)
         
         pos_frame['halfPpr_rv'] = halfPpr_rv[positions]
         pos_frame['custom_rv'] = custom_rv[positions]
-        pos_frame['halfPpr_VORP'] = pos_frame['halfPpr'] - halfPpr_rv[positions]
-        pos_frame['custom_VORP'] = pos_frame[rv_type] - custom_rv[positions]
+        pos_frame['halfPpr_VORP'] = pos_frame[halfPpr_rv_var] - halfPpr_rv[positions]
+        pos_frame['custom_VORP'] = pos_frame[custom_rv_var] - custom_rv[positions]
         
         vorp_frame = pd.concat([vorp_frame, pos_frame]).reset_index(drop=True)
 
@@ -445,11 +440,11 @@ def main():
     custom_roster_rv = create_custom_rv(position_df, custom_pos_reqs, user_league_settings)
     
     # Calculate VORP and rankings
-    pos_des_dict, orig_rank_dict = assign_vorp_scoring(position_df, halfPpr_rv, custom_scoring_rv, user_league_settings, user_pos_vorp_limiters)
-    final_df = assign_vorp_roster(position_df, halfPpr_rv, custom_roster_rv, user_league_settings, user_pos_vorp_limiters)
+    pos_des_dict, orig_rank_dict, half_ppr_match_dict, custom_match_dict = assign_vorp_scoring(position_df, halfPpr_rv, custom_scoring_rv, user_league_settings, user_pos_vorp_limiters)
+    final_df = assign_vorp_roster(position_df, halfPpr_rv, custom_roster_rv, user_league_settings, user_pos_vorp_limiters, half_ppr_match_dict, custom_match_dict)
     final_df = final_df.drop(columns=['SR_ID'], axis=1)
-    final_df['scoring_rank'] = final_df['Name'].map(orig_rank_dict)
-    final_df['pos_lock_name'] = final_df['pos_designation'].map(pos_des_dict)
+    final_df['Name_Lookup'] = final_df['Name'].map(orig_rank_dict)
+    final_df['Scoring_Lookup'] = final_df['pos_designation'].map(pos_des_dict)
     
     # Display results
     st.header("Player Rankings")