Update app.py

app.py

@@ -77,6 +77,57 @@ def set_export_ids():
 def convert_df_to_csv(df):
     return df.to_csv().encode('utf-8')
 
+def sim_contest(Sim_size, FinalPortfolio, CleanPortfolio, maps_dict, up_dict, insert_port):
+    SimVar = 1
+    Sim_Winners = []
+    fp_array = FinalPortfolio.values
+    
+    if insert_port == 1:
+        up_array = CleanPortfolio.values
+    
+    # Pre-vectorize functions
+    vec_projection_map = np.vectorize(maps_dict['Projection_map'].__getitem__)
+    vec_stdev_map = np.vectorize(maps_dict['STDev_map'].__getitem__)
+    
+    if insert_port == 1:
+        vec_up_projection_map = np.vectorize(up_dict['Projection_map'].__getitem__)
+        vec_up_stdev_map = np.vectorize(up_dict['STDev_map'].__getitem__)
+    
+    st.write('Simulating contest on frames')
+    
+    while SimVar <= Sim_size:
+        if insert_port == 1:
+            fp_random = fp_array[np.random.choice(fp_array.shape[0], Contest_Size-len(CleanPortfolio))]
+        elif insert_port == 0:
+            fp_random = fp_array[np.random.choice(fp_array.shape[0], Contest_Size)]
+            
+        sample_arrays1 = np.c_[
+            fp_random, 
+            np.sum(np.random.normal(
+                loc=vec_projection_map(fp_random[:, :-5]),
+                scale=vec_stdev_map(fp_random[:, :-5])),
+            axis=1)
+        ]
+
+        if insert_port == 1:
+            sample_arrays2 = np.c_[
+                up_array, 
+                np.sum(np.random.normal(
+                    loc=vec_up_projection_map(up_array[:, :-5]),
+                    scale=vec_up_stdev_map(up_array[:, :-5])),
+                axis=1)
+            ]
+            sample_arrays = np.vstack((sample_arrays1, sample_arrays2))
+        else:
+            sample_arrays = sample_arrays1
+
+        final_array = sample_arrays[sample_arrays[:, 10].argsort()[::-1]]
+        best_lineup = final_array[final_array[:, -1].argsort(kind='stable')[::-1][:1]]
+        Sim_Winners.append(best_lineup)
+        SimVar += 1
+        
+        return Sim_Winners
+
 def run_seed_frame(seed_depth1, Strength_var, strength_grow, Teams_used, Total_Runs):
     RunsVar = 1
     seed_depth_def = seed_depth1
@@ -770,7 +821,6 @@ with tab2:
             Contest_Size = 5000
         elif contest_var1 == 'Large':
             Contest_Size = 10000
-        linenum_var1 = 2500
         strength_var1 = st.selectbox("How sharp is the field in the contest?", ('Not Very', 'Average', 'Very'))
         if strength_var1 == 'Not Very':
             sharp_split = .33
@@ -792,8 +842,6 @@ with tab2:
                     st.write('Contest Simulation Starting')
                     for key in st.session_state.keys():
                         del st.session_state[key]
-                    seed_depth1 = 10
-                    Total_Runs = 1000000
                     if Contest_Size <= 1000:
                         strength_grow = .01
                     elif Contest_Size > 1000 and Contest_Size <= 2500:
@@ -1026,9 +1074,9 @@ with tab2:
                         }
                     
                     st.write('Seed frame creation')
-                    FinalPortfolio, maps_dict = run_seed_frame(seed_depth1, Strength_var, strength_grow, Teams_used, Total_Runs)
+                    FinalPortfolio, maps_dict = run_seed_frame(10, Strength_var, strength_grow, Teams_used, 1000000)
                     
-                    Sim_size = linenum_var1
+                    Sim_size = 2500
                     SimVar = 1
                     Sim_Winners = []
                     fp_array = FinalPortfolio.values
@@ -1046,36 +1094,7 @@ with tab2:
                     
                     st.write('Simulating contest on frames')
                     
-                    while SimVar <= Sim_size:
-                        if insert_port == 1:
-                            fp_random = fp_array[np.random.choice(fp_array.shape[0], Contest_Size-len(CleanPortfolio))]
-                        elif insert_port == 0:
-                            fp_random = fp_array[np.random.choice(fp_array.shape[0], Contest_Size)]
-                            
-                        sample_arrays1 = np.c_[
-                            fp_random, 
-                            np.sum(np.random.normal(
-                                loc=vec_projection_map(fp_random[:, :-5]),
-                                scale=vec_stdev_map(fp_random[:, :-5])),
-                            axis=1)
-                        ]
-                
-                        if insert_port == 1:
-                            sample_arrays2 = np.c_[
-                                up_array, 
-                                np.sum(np.random.normal(
-                                    loc=vec_up_projection_map(up_array[:, :-5]),
-                                    scale=vec_up_stdev_map(up_array[:, :-5])),
-                                axis=1)
-                            ]
-                            sample_arrays = np.vstack((sample_arrays1, sample_arrays2))
-                        else:
-                            sample_arrays = sample_arrays1
-                
-                        final_array = sample_arrays[sample_arrays[:, 10].argsort()[::-1]]
-                        best_lineup = final_array[final_array[:, -1].argsort(kind='stable')[::-1][:1]]
-                        Sim_Winners.append(best_lineup)
-                        SimVar += 1
+                    Sim_Winners = sim_contest(2500, FinalPortfolio, CleanPortfolio, maps_dict, up_dict, insert_port)
                         
                     st.write('Contest simulation complete')
                     # Initial setup
@@ -1294,6 +1313,4 @@ with tab2:
 del gc
 del dk_roo_raw, fd_roo_raw
 del t_stamp
-del dkid_dict, fdid_dict
-for key in st.session_state.keys():
-    del st.session_state[key]
+del dkid_dict, fdid_dict