James McCool
commited on
Commit
·
17c9148
1
Parent(s):
6610c83
Refactor slack_var handling in small_field_preset function: change iteration from float to integer and adjust calculation for curr_own_type_max to improve accuracy in portfolio adjustments.
Browse files
global_func/small_field_preset.py
CHANGED
|
@@ -2,16 +2,16 @@ import pandas as pd
|
|
| 2 |
|
| 3 |
def small_field_preset(portfolio: pd.DataFrame, lineup_target: int):
|
| 4 |
|
| 5 |
-
for slack_var in range(
|
| 6 |
working_portfolio = portfolio.sort_values(by='Own', ascending = False).reset_index(drop=True)
|
| 7 |
rows_to_drop = []
|
| 8 |
-
curr_own_type_max = working_portfolio.loc[0, 'Weighted Own'] + (slack_var * working_portfolio.loc[0, 'Weighted Own'])
|
| 9 |
|
| 10 |
for i in range(1, len(working_portfolio)):
|
| 11 |
if working_portfolio.loc[i, 'Weighted Own'] > curr_own_type_max:
|
| 12 |
rows_to_drop.append(i)
|
| 13 |
else:
|
| 14 |
-
curr_own_type_max = working_portfolio.loc[i, 'Weighted Own'] + (slack_var * working_portfolio.loc[i, 'Weighted Own'])
|
| 15 |
|
| 16 |
working_portfolio = working_portfolio.drop(rows_to_drop).reset_index(drop=True)
|
| 17 |
if len(working_portfolio) >= lineup_target:
|
|
|
|
| 2 |
|
| 3 |
def small_field_preset(portfolio: pd.DataFrame, lineup_target: int):
|
| 4 |
|
| 5 |
+
for slack_var in range(1, 10):
|
| 6 |
working_portfolio = portfolio.sort_values(by='Own', ascending = False).reset_index(drop=True)
|
| 7 |
rows_to_drop = []
|
| 8 |
+
curr_own_type_max = working_portfolio.loc[0, 'Weighted Own'] + (slack_var / 10 * working_portfolio.loc[0, 'Weighted Own'])
|
| 9 |
|
| 10 |
for i in range(1, len(working_portfolio)):
|
| 11 |
if working_portfolio.loc[i, 'Weighted Own'] > curr_own_type_max:
|
| 12 |
rows_to_drop.append(i)
|
| 13 |
else:
|
| 14 |
+
curr_own_type_max = working_portfolio.loc[i, 'Weighted Own'] + (slack_var / 10 * working_portfolio.loc[i, 'Weighted Own'])
|
| 15 |
|
| 16 |
working_portfolio = working_portfolio.drop(rows_to_drop).reset_index(drop=True)
|
| 17 |
if len(working_portfolio) >= lineup_target:
|