James McCool
commited on
Commit
·
6a37505
1
Parent(s):
ad29ee6
Refactor player and team filtering logic in 'app.py' to use iloc for row selection, enhancing code clarity and maintaining performance in Showdown mode.
Browse files
app.py
CHANGED
|
@@ -1279,11 +1279,11 @@ if selected_tab == 'Manage Portfolio':
|
|
| 1279 |
if player_remove:
|
| 1280 |
if type_var == 'Showdown':
|
| 1281 |
if cpt_flex_focus == 'CPT':
|
| 1282 |
-
remove_mask = parsed_frame[0
|
| 1283 |
lambda row: not any(player in list(row) for player in player_remove), axis=1
|
| 1284 |
)
|
| 1285 |
elif cpt_flex_focus == 'FLEX':
|
| 1286 |
-
remove_mask = parsed_frame[1:].apply(
|
| 1287 |
lambda row: not any(player in list(row) for player in player_remove), axis=1
|
| 1288 |
)
|
| 1289 |
elif cpt_flex_focus == 'Overall':
|
|
@@ -1300,11 +1300,11 @@ if selected_tab == 'Manage Portfolio':
|
|
| 1300 |
if player_lock:
|
| 1301 |
if type_var == 'Showdown':
|
| 1302 |
if cpt_flex_focus == 'CPT':
|
| 1303 |
-
lock_mask = parsed_frame[0
|
| 1304 |
lambda row: all(player in list(row) for player in player_lock), axis=1
|
| 1305 |
)
|
| 1306 |
elif cpt_flex_focus == 'FLEX':
|
| 1307 |
-
lock_mask = parsed_frame[1:].apply(
|
| 1308 |
lambda row: all(player in list(row) for player in player_lock), axis=1
|
| 1309 |
)
|
| 1310 |
elif cpt_flex_focus == 'Overall':
|
|
@@ -1320,11 +1320,11 @@ if selected_tab == 'Manage Portfolio':
|
|
| 1320 |
if team_include:
|
| 1321 |
if type_var == 'Showdown':
|
| 1322 |
if cpt_flex_focus == 'CPT':
|
| 1323 |
-
include_mask = parsed_frame[0
|
| 1324 |
lambda row: any(team in list(row) for team in team_include), axis=1
|
| 1325 |
)
|
| 1326 |
elif cpt_flex_focus == 'FLEX':
|
| 1327 |
-
include_mask = parsed_frame[1:].apply(
|
| 1328 |
lambda row: any(team in list(row) for team in team_include), axis=1
|
| 1329 |
)
|
| 1330 |
elif cpt_flex_focus == 'Overall':
|
|
@@ -1346,11 +1346,11 @@ if selected_tab == 'Manage Portfolio':
|
|
| 1346 |
if team_remove:
|
| 1347 |
if type_var == 'Showdown':
|
| 1348 |
if cpt_flex_focus == 'CPT':
|
| 1349 |
-
remove_mask = parsed_frame[0
|
| 1350 |
lambda row: not any(team in list(row) for team in team_remove), axis=1
|
| 1351 |
)
|
| 1352 |
elif cpt_flex_focus == 'FLEX':
|
| 1353 |
-
remove_mask = parsed_frame[1:].apply(
|
| 1354 |
lambda row: not any(team in list(row) for team in team_remove), axis=1
|
| 1355 |
)
|
| 1356 |
elif cpt_flex_focus == 'Overall':
|
|
|
|
| 1279 |
if player_remove:
|
| 1280 |
if type_var == 'Showdown':
|
| 1281 |
if cpt_flex_focus == 'CPT':
|
| 1282 |
+
remove_mask = parsed_frame.iloc[:, 0].apply(
|
| 1283 |
lambda row: not any(player in list(row) for player in player_remove), axis=1
|
| 1284 |
)
|
| 1285 |
elif cpt_flex_focus == 'FLEX':
|
| 1286 |
+
remove_mask = parsed_frame.iloc[:, 1:].apply(
|
| 1287 |
lambda row: not any(player in list(row) for player in player_remove), axis=1
|
| 1288 |
)
|
| 1289 |
elif cpt_flex_focus == 'Overall':
|
|
|
|
| 1300 |
if player_lock:
|
| 1301 |
if type_var == 'Showdown':
|
| 1302 |
if cpt_flex_focus == 'CPT':
|
| 1303 |
+
lock_mask = parsed_frame.iloc[:, 0].apply(
|
| 1304 |
lambda row: all(player in list(row) for player in player_lock), axis=1
|
| 1305 |
)
|
| 1306 |
elif cpt_flex_focus == 'FLEX':
|
| 1307 |
+
lock_mask = parsed_frame.iloc[:, 1:].apply(
|
| 1308 |
lambda row: all(player in list(row) for player in player_lock), axis=1
|
| 1309 |
)
|
| 1310 |
elif cpt_flex_focus == 'Overall':
|
|
|
|
| 1320 |
if team_include:
|
| 1321 |
if type_var == 'Showdown':
|
| 1322 |
if cpt_flex_focus == 'CPT':
|
| 1323 |
+
include_mask = parsed_frame.iloc[:, 0].apply(
|
| 1324 |
lambda row: any(team in list(row) for team in team_include), axis=1
|
| 1325 |
)
|
| 1326 |
elif cpt_flex_focus == 'FLEX':
|
| 1327 |
+
include_mask = parsed_frame.iloc[:, 1:].apply(
|
| 1328 |
lambda row: any(team in list(row) for team in team_include), axis=1
|
| 1329 |
)
|
| 1330 |
elif cpt_flex_focus == 'Overall':
|
|
|
|
| 1346 |
if team_remove:
|
| 1347 |
if type_var == 'Showdown':
|
| 1348 |
if cpt_flex_focus == 'CPT':
|
| 1349 |
+
remove_mask = parsed_frame.iloc[:, 0].apply(
|
| 1350 |
lambda row: not any(team in list(row) for team in team_remove), axis=1
|
| 1351 |
)
|
| 1352 |
elif cpt_flex_focus == 'FLEX':
|
| 1353 |
+
remove_mask = parsed_frame.iloc[:, 1:].apply(
|
| 1354 |
lambda row: not any(team in list(row) for team in team_remove), axis=1
|
| 1355 |
)
|
| 1356 |
elif cpt_flex_focus == 'Overall':
|