Refactor VORP calculation in Streamlit app by removing unnecessary intermediate calculations and streamlining the ranking process, enhancing clarity and performance in player evaluations.

src/streamlit_app.py

@@ -402,27 +402,11 @@ def assign_vorp_roster(frame: pd.DataFrame, halfPpr_rv: dict, custom_rv: dict, l
         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)
-        pos_frame['custom_rank_raw'] = pos_frame[rv_type].rank(method='first', ascending=False)
-        pos_frame['custom_calc'] = ((pos_frame['custom_rank_raw'] +  pos_frame['Rank']) / 2).astype(int)
-        pos_frame['custom_proj_rank'] = pos_frame['custom_calc'].rank(method='first', ascending=True).astype(int)
-
-        pos_frame['max_halfPpr'] = pos_frame['halfPpr'].max()
-        pos_frame['halfPpr_range'] = (pos_frame['max_halfPpr']) / len(pos_frame)
-        pos_frame['adj_halfPpr'] = pos_frame['halfPpr_range'] * (len(pos_frame) - (pos_frame.index))
-
-        pos_frame['max_custom'] = pos_frame[rv_type].max()
-        pos_frame['custom_range'] = (pos_frame['max_custom']) / len(pos_frame)
-        pos_frame['adj_custom'] = pos_frame['custom_range'] * (len(pos_frame) - (pos_frame['custom_proj_rank'] - 1))
-        pos_frame['pos_lock'] = (pos_frame['Pos'].astype(str) + pos_frame['custom_proj_rank'].astype(str))
-        
-        print(pos_frame[['Name', 'Rank', 'custom_proj_rank', 'halfPpr', rv_type, 'adj_halfPpr', 'adj_custom', 'pos_lock']].head(20))
         
         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 = pos_frame.drop(columns=['custom_rank_raw', 'custom_calc', 'custom_proj_rank', 'max_halfPpr', 'halfPpr_range', 'max_custom', 'custom_range'])
         
         vorp_frame = pd.concat([vorp_frame, pos_frame]).reset_index(drop=True)
 
@@ -431,10 +415,6 @@ def assign_vorp_roster(frame: pd.DataFrame, halfPpr_rv: dict, custom_rv: dict, l
     vorp_frame['vorp_diff'] = np.where(vorp_frame['halfPpr_VORP'] == vorp_frame['custom_VORP'], 0, vorp_frame['halfPpr_vorp_rank'] - vorp_frame['custom_vorp_rank'])
     for positions in ['QB', 'RB', 'WR', 'TE']:
         vorp_frame.loc[vorp_frame['Pos'] == positions, 'Rank_Adjust'] = (vorp_frame['Rank'] - (vorp_frame['vorp_diff'] * pos_vorp_limiters[positions])).astype(float)
-    if league_settings['TYPE'] == 'Standard':
-        vorp_frame.loc[vorp_frame['Pos'] == 'QB', 'Rank_Adjust'] = vorp_frame.loc[vorp_frame['Pos'] == 'QB', 'Rank_Adjust'].apply(lambda x: max(x, 10))
-    elif league_settings['TYPE'] == 'PPR':
-        vorp_frame.loc[vorp_frame['Pos'] == 'QB', 'Rank_Adjust'] = vorp_frame.loc[vorp_frame['Pos'] == 'QB', 'Rank_Adjust'].apply(lambda x: max(x, -10))
     pos_lock_dict = dict(zip(vorp_frame['pos_lock'], vorp_frame['Name']))
     name_lock_dict = dict(zip(vorp_frame['Name'], vorp_frame['pos_lock']))
     vorp_frame['custom_rank'] = vorp_frame['Rank_Adjust'].rank(method='first', ascending=True).astype(int)