James McCool commited on
Commit
b071238
·
1 Parent(s): 09fca6e

Refactor threshold logic in distribute_preset function to improve clarity and accuracy in filtering. Introduced a lower threshold variable for better readability and consistency in handling 'Finish_percentile' across all finishing ranges.

Browse files
Files changed (1) hide show
  1. global_func/distribute_preset.py +4 -3
global_func/distribute_preset.py CHANGED
@@ -7,18 +7,19 @@ def distribute_preset(portfolio: pd.DataFrame, lineup_target: int, exclude_cols:
7
 
8
  for finishing_range in range(1, 20):
9
  finish_threshold = (finishing_range / 100)
 
10
  rows_to_drop = []
11
  working_portfolio = portfolio.copy()
12
  if finishing_range == 1:
13
  working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] <= finish_threshold]
14
  elif finishing_range == 20:
15
- working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] >= (finish_threshold - 1)]
16
  else:
17
  working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] <= finish_threshold]
18
- working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] >= (finish_threshold - 1)]
19
  working_portfolio = working_portfolio.sort_values(by='median', ascending = False)
20
  working_portfolio = working_portfolio.reset_index(drop=True)
21
- print(working_portfolio.head(10))
22
  curr_own_type_max = working_portfolio.loc[0, 'Weighted Own'] + (slack_var / 20 * working_portfolio.loc[0, 'Weighted Own'])
23
 
24
  for i in range(1, len(working_portfolio)):
 
7
 
8
  for finishing_range in range(1, 20):
9
  finish_threshold = (finishing_range / 100)
10
+ lower_threshold = ((finish_threshold - 1) / 100)
11
  rows_to_drop = []
12
  working_portfolio = portfolio.copy()
13
  if finishing_range == 1:
14
  working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] <= finish_threshold]
15
  elif finishing_range == 20:
16
+ working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] >= lower_threshold]
17
  else:
18
  working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] <= finish_threshold]
19
+ working_portfolio = working_portfolio[working_portfolio['Finish_percentile'] >= lower_threshold]
20
  working_portfolio = working_portfolio.sort_values(by='median', ascending = False)
21
  working_portfolio = working_portfolio.reset_index(drop=True)
22
+ print(working_portfolio[['Finish_percentile', 'Weighted Own']].head(10))
23
  curr_own_type_max = working_portfolio.loc[0, 'Weighted Own'] + (slack_var / 20 * working_portfolio.loc[0, 'Weighted Own'])
24
 
25
  for i in range(1, len(working_portfolio)):