Spaces:

Multichem-PD
/

DFS_Portfolio_Manager

Running

Multichem commited on Aug 14

Commit

a3d17b1

1 Parent(s): 0ce635a

cleaning up salary subtraction

Files changed (1) hide show

global_func/predict_dupes.py CHANGED Viewed

@@ -496,7 +496,7 @@ def predict_dupes(portfolio, maps_dict, site_var, type_var, Contest_Size, streng
                 )
                 # Calculate dupes formula
-                portfolio['dupes_calc'] = (portfolio['avg_own_rank'] / 1000) * (Contest_Size / 100) + ((portfolio['salary'] - (50000 - portfolio['Own'])) / 50) - ((49700 - portfolio['salary']) / 50)
                 portfolio['dupes_calc'] = portfolio['dupes_calc'] * dupes_multiplier * (portfolio['Own'] / (100 + (Contest_Size / 1000))) * portfolio['top_x_presence']
                 # Round and handle negative values
@@ -549,7 +549,7 @@ def predict_dupes(portfolio, maps_dict, site_var, type_var, Contest_Size, streng
                 )
                 # Calculate dupes formula
-                portfolio['dupes_calc'] = (portfolio['avg_own_rank'] / 1000) * (Contest_Size / 100) + ((portfolio['salary'] - (50000 - portfolio['Own'])) / 50) - ((49700 - portfolio['salary']) / 50)
                 portfolio['dupes_calc'] = portfolio['dupes_calc'] * dupes_multiplier * (portfolio['Own'] / (100 + (Contest_Size / 1000))) * portfolio['top_x_presence']
                 # Round and handle negative values

                 )
                 # Calculate dupes formula
+                portfolio['dupes_calc'] = (portfolio['avg_own_rank'] / 1000) * (Contest_Size / 100) + ((portfolio['salary'] - (50000 - portfolio['Own'])) / 100) - ((49700 - portfolio['salary']) / 100)
                 portfolio['dupes_calc'] = portfolio['dupes_calc'] * dupes_multiplier * (portfolio['Own'] / (100 + (Contest_Size / 1000))) * portfolio['top_x_presence']
                 # Round and handle negative values
                 )
                 # Calculate dupes formula
+                portfolio['dupes_calc'] = (portfolio['avg_own_rank'] / 1000) * (Contest_Size / 100) + ((portfolio['salary'] - (50000 - portfolio['Own'])) / 100) - ((49700 - portfolio['salary']) / 100)
                 portfolio['dupes_calc'] = portfolio['dupes_calc'] * dupes_multiplier * (portfolio['Own'] / (100 + (Contest_Size / 1000))) * portfolio['top_x_presence']
                 # Round and handle negative values