Spaces:
Sleeping
Sleeping
James McCool
commited on
Commit
·
b2bbd77
1
Parent(s):
40e191a
Refactor player filtering logic in app.py to consolidate mask creation for including and removing players. This change enhances code readability and maintains the functionality of dynamic player selection based on user-defined criteria.
Browse files
app.py
CHANGED
|
@@ -1318,21 +1318,14 @@ with tab2:
|
|
| 1318 |
|
| 1319 |
# Get player columns (excluding non-player columns)
|
| 1320 |
player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
|
| 1321 |
-
|
| 1322 |
-
|
| 1323 |
-
|
| 1324 |
-
|
| 1325 |
-
lambda row: all(player in list(row) for player in conditional_include_players), axis=1
|
| 1326 |
-
)
|
| 1327 |
-
else:
|
| 1328 |
-
include_mask = pd.Series([True] * len(parsed_frame))
|
| 1329 |
|
| 1330 |
-
|
| 1331 |
-
|
| 1332 |
-
|
| 1333 |
-
)
|
| 1334 |
-
else:
|
| 1335 |
-
remove_mask = pd.Series([True] * len(parsed_frame))
|
| 1336 |
|
| 1337 |
parsed_frame = parsed_frame[include_mask & remove_mask]
|
| 1338 |
|
|
@@ -1345,20 +1338,13 @@ with tab2:
|
|
| 1345 |
# Get player columns (excluding non-player columns)
|
| 1346 |
player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
|
| 1347 |
|
| 1348 |
-
|
| 1349 |
-
|
| 1350 |
-
|
| 1351 |
-
|
| 1352 |
-
|
| 1353 |
-
|
| 1354 |
-
|
| 1355 |
-
|
| 1356 |
-
if conditional_remove_players:
|
| 1357 |
-
remove_mask = parsed_frame[player_columns].apply(
|
| 1358 |
-
lambda row: not any(player in list(row) for player in conditional_remove_players), axis=1
|
| 1359 |
-
)
|
| 1360 |
-
else:
|
| 1361 |
-
remove_mask = pd.Series([True] * len(parsed_frame))
|
| 1362 |
|
| 1363 |
parsed_frame = parsed_frame[include_mask & remove_mask]
|
| 1364 |
|
|
|
|
| 1318 |
|
| 1319 |
# Get player columns (excluding non-player columns)
|
| 1320 |
player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
|
| 1321 |
+
|
| 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 |
|
|
|
|
| 1338 |
# Get player columns (excluding non-player columns)
|
| 1339 |
player_columns = [col for col in parsed_frame.columns if col not in excluded_cols]
|
| 1340 |
|
| 1341 |
+
include_mask = parsed_frame[player_columns].apply(
|
| 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 |
|