James McCool
commited on
Commit
·
6fa0eb5
1
Parent(s):
0808078
Remove limit on concatenation in distribute_preset function to include all entries of the working portfolio, enhancing data completeness while maintaining sorting by 'Finish_percentile'.
Browse files
global_func/distribute_preset.py
CHANGED
@@ -27,8 +27,7 @@ def distribute_preset(portfolio: pd.DataFrame, lineup_target: int, exclude_cols:
|
|
27 |
curr_own_type_max = working_portfolio.loc[i, 'Weighted Own'] + (slack_var / 20 * working_portfolio.loc[i, 'Weighted Own'])
|
28 |
|
29 |
working_portfolio = working_portfolio.drop(rows_to_drop).reset_index(drop=True)
|
30 |
-
concat_portfolio = pd.concat([concat_portfolio, working_portfolio
|
31 |
-
concat_portfolio = concat_portfolio.drop_duplicates(subset=['median', 'salary', 'Own'])
|
32 |
|
33 |
if len(concat_portfolio) >= lineup_target:
|
34 |
return concat_portfolio.sort_values(by='Finish_percentile', ascending=True).head(lineup_target)
|
|
|
27 |
curr_own_type_max = working_portfolio.loc[i, 'Weighted Own'] + (slack_var / 20 * working_portfolio.loc[i, 'Weighted Own'])
|
28 |
|
29 |
working_portfolio = working_portfolio.drop(rows_to_drop).reset_index(drop=True)
|
30 |
+
concat_portfolio = pd.concat([concat_portfolio, working_portfolio])
|
|
|
31 |
|
32 |
if len(concat_portfolio) >= lineup_target:
|
33 |
return concat_portfolio.sort_values(by='Finish_percentile', ascending=True).head(lineup_target)
|