James McCool
commited on
Commit
·
afc2563
1
Parent(s):
0cc5962
adjusting comp_salary_high out of equiation for Exposure Spread
Browse files
global_func/exposure_spread.py
CHANGED
|
@@ -177,7 +177,7 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
|
|
| 177 |
comparable_players = projections_df[projections_df['player_names'] == exposure_player]
|
| 178 |
|
| 179 |
comparable_players = comparable_players.reset_index(drop=True)
|
| 180 |
-
|
| 181 |
if type_var == 'Showdown':
|
| 182 |
comp_salary_low = comparable_players['salary'][0] + comp_salary_below
|
| 183 |
comp_salary_high = comparable_players['salary'][0] + comp_salary_above
|
|
@@ -260,12 +260,12 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
|
|
| 260 |
|
| 261 |
if specific_replacements != []:
|
| 262 |
comparable_players = projections_df[(projections_df['player_names'].isin(specific_replacements)) &
|
| 263 |
-
(projections_df['salary'] <=
|
| 264 |
]
|
| 265 |
else:
|
| 266 |
comparable_players = projections_df[
|
| 267 |
(projections_df['salary'] >= comp_salary_low) &
|
| 268 |
-
(projections_df['salary'] <=
|
| 269 |
(projections_df['median'] >= comp_projection_low) &
|
| 270 |
(projections_df['position'].apply(lambda x: has_position_overlap(x, comp_player_position)))
|
| 271 |
]
|
|
@@ -369,12 +369,12 @@ def exposure_spread(working_frame, exposure_player, exposure_target, comp_salary
|
|
| 369 |
if type_var == 'Showdown':
|
| 370 |
comparable_players = projections_df[
|
| 371 |
(projections_df['salary'] >= comp_salary_low) &
|
| 372 |
-
(projections_df['salary'] <=
|
| 373 |
]
|
| 374 |
else:
|
| 375 |
comparable_players = projections_df[
|
| 376 |
(projections_df['salary'] >= comp_salary_low) &
|
| 377 |
-
(projections_df['salary'] <=
|
| 378 |
(projections_df['position'].apply(lambda x: has_position_overlap(x, comp_player_position)))
|
| 379 |
]
|
| 380 |
if sport_var in stacking_sports:
|
|
|
|
| 177 |
comparable_players = projections_df[projections_df['player_names'] == exposure_player]
|
| 178 |
|
| 179 |
comparable_players = comparable_players.reset_index(drop=True)
|
| 180 |
+
comp_salary_high_base = comparable_players['salary'][0]
|
| 181 |
if type_var == 'Showdown':
|
| 182 |
comp_salary_low = comparable_players['salary'][0] + comp_salary_below
|
| 183 |
comp_salary_high = comparable_players['salary'][0] + comp_salary_above
|
|
|
|
| 260 |
|
| 261 |
if specific_replacements != []:
|
| 262 |
comparable_players = projections_df[(projections_df['player_names'].isin(specific_replacements)) &
|
| 263 |
+
(projections_df['salary'] <= comp_salary_high_base + (salary_max - working_frame['salary'][row]))
|
| 264 |
]
|
| 265 |
else:
|
| 266 |
comparable_players = projections_df[
|
| 267 |
(projections_df['salary'] >= comp_salary_low) &
|
| 268 |
+
(projections_df['salary'] <= comp_salary_high_base + (salary_max - working_frame['salary'][row])) &
|
| 269 |
(projections_df['median'] >= comp_projection_low) &
|
| 270 |
(projections_df['position'].apply(lambda x: has_position_overlap(x, comp_player_position)))
|
| 271 |
]
|
|
|
|
| 369 |
if type_var == 'Showdown':
|
| 370 |
comparable_players = projections_df[
|
| 371 |
(projections_df['salary'] >= comp_salary_low) &
|
| 372 |
+
(projections_df['salary'] <= comp_salary_high_base + (salary_max - working_frame['salary'][row]))
|
| 373 |
]
|
| 374 |
else:
|
| 375 |
comparable_players = projections_df[
|
| 376 |
(projections_df['salary'] >= comp_salary_low) &
|
| 377 |
+
(projections_df['salary'] <= comp_salary_high_base + (salary_max - working_frame['salary'][row])) &
|
| 378 |
(projections_df['position'].apply(lambda x: has_position_overlap(x, comp_player_position)))
|
| 379 |
]
|
| 380 |
if sport_var in stacking_sports:
|