James McCool commited on
Commit
f70241f
·
1 Parent(s): b2bbd77

Refactor player filtering logic in app.py to correct mask application for removing players. Updated the remove mask condition to ensure accurate filtering of lineups based on user-defined criteria, enhancing functionality and maintainability.

Browse files
Files changed (1) hide show
  1. app.py +8 -4
app.py CHANGED
@@ -1322,12 +1322,14 @@ with tab2:
1322
  include_mask = parsed_frame[player_columns].apply(
1323
  lambda row: all(player in list(row) for player in conditional_include_players), axis=1
1324
  )
 
 
1325
 
1326
  remove_mask = parsed_frame[player_columns].apply(
1327
- lambda row: all(player in list(row) for player in conditional_remove_players), axis=1
1328
  )
1329
 
1330
- parsed_frame = parsed_frame[include_mask & remove_mask]
1331
 
1332
  st.session_state['working_frame'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
1333
  st.session_state['export_merge'] = st.session_state['working_frame'].copy()
@@ -1342,11 +1344,13 @@ with tab2:
1342
  lambda row: all(player in list(row) for player in conditional_include_players), axis=1
1343
  )
1344
 
 
 
1345
  remove_mask = parsed_frame[player_columns].apply(
1346
- lambda row: all(player in list(row) for player in conditional_remove_players), axis=1
1347
  )
1348
 
1349
- parsed_frame = parsed_frame[include_mask & remove_mask]
1350
 
1351
  st.session_state['export_base'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
1352
  st.session_state['export_merge'] = st.session_state['export_base'].copy()
 
1322
  include_mask = parsed_frame[player_columns].apply(
1323
  lambda row: all(player in list(row) for player in conditional_include_players), axis=1
1324
  )
1325
+
1326
+ parsed_frame = parsed_frame[include_mask]
1327
 
1328
  remove_mask = parsed_frame[player_columns].apply(
1329
+ lambda row: not all(player in list(row) for player in conditional_remove_players), axis=1
1330
  )
1331
 
1332
+ parsed_frame = parsed_frame[remove_mask]
1333
 
1334
  st.session_state['working_frame'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
1335
  st.session_state['export_merge'] = st.session_state['working_frame'].copy()
 
1344
  lambda row: all(player in list(row) for player in conditional_include_players), axis=1
1345
  )
1346
 
1347
+ parsed_frame = parsed_frame[include_mask]
1348
+
1349
  remove_mask = parsed_frame[player_columns].apply(
1350
+ lambda row: not all(player in list(row) for player in conditional_remove_players), axis=1
1351
  )
1352
 
1353
+ parsed_frame = parsed_frame[remove_mask]
1354
 
1355
  st.session_state['export_base'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
1356
  st.session_state['export_merge'] = st.session_state['export_base'].copy()