James McCool
commited on
Commit
·
f8c0a84
1
Parent(s):
5f37d0a
continuing to adjust dupe predictions
Browse files
global_func/predict_dupes.py
CHANGED
|
@@ -116,6 +116,11 @@ def predict_dupes(portfolio, maps_dict, site_var, type_var, Contest_Size, streng
|
|
| 116 |
elif strength_var == 'Sharp':
|
| 117 |
dupes_multiplier = 1.25
|
| 118 |
percentile_multiplier = 1.10
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 119 |
max_ownership = max(maps_dict['own_map'].values()) / 100
|
| 120 |
average_ownership = np.mean(list(maps_dict['own_map'].values())) / 100
|
| 121 |
|
|
@@ -186,8 +191,8 @@ def predict_dupes(portfolio, maps_dict, site_var, type_var, Contest_Size, streng
|
|
| 186 |
portfolio['avg_own_rank'] = portfolio[dup_count_columns].mean(axis=1)
|
| 187 |
|
| 188 |
# Calculate dupes formula
|
| 189 |
-
portfolio['dupes_calc'] = ((portfolio['own_product']+((portfolio['Own'] / 6) / max_salary)) * portfolio['avg_own_rank']) * Contest_Size + ((portfolio['salary'] - (max_salary - portfolio['Own'])) / 100) - ((max_salary - portfolio['salary']) / 100)
|
| 190 |
-
portfolio['dupes_calc'] = portfolio['dupes_calc'] * dupes_multiplier * (portfolio['Own'] / (
|
| 191 |
portfolio['dupes_calc'] = ((((portfolio['salary'] / (max_salary * 0.96)) - 1)*(max_salary / 10000)) + 1) * portfolio['dupes_calc']
|
| 192 |
|
| 193 |
# Round and handle negative values
|
|
|
|
| 116 |
elif strength_var == 'Sharp':
|
| 117 |
dupes_multiplier = 1.25
|
| 118 |
percentile_multiplier = 1.10
|
| 119 |
+
|
| 120 |
+
if sport_var == 'NFL':
|
| 121 |
+
own_baseline = 180
|
| 122 |
+
else:
|
| 123 |
+
own_baseline = 120
|
| 124 |
max_ownership = max(maps_dict['own_map'].values()) / 100
|
| 125 |
average_ownership = np.mean(list(maps_dict['own_map'].values())) / 100
|
| 126 |
|
|
|
|
| 191 |
portfolio['avg_own_rank'] = portfolio[dup_count_columns].mean(axis=1)
|
| 192 |
|
| 193 |
# Calculate dupes formula
|
| 194 |
+
portfolio['dupes_calc'] = ((portfolio['own_product']+((portfolio['Own'] / 6) / (max_salary / 2))) * portfolio['avg_own_rank']) * Contest_Size + ((portfolio['salary'] - (max_salary - portfolio['Own'])) / 100) - ((max_salary - portfolio['salary']) / 100)
|
| 195 |
+
portfolio['dupes_calc'] = portfolio['dupes_calc'] * dupes_multiplier * (portfolio['Own'] / (own_baseline + (Contest_Size / 1000)))
|
| 196 |
portfolio['dupes_calc'] = ((((portfolio['salary'] / (max_salary * 0.96)) - 1)*(max_salary / 10000)) + 1) * portfolio['dupes_calc']
|
| 197 |
|
| 198 |
# Round and handle negative values
|