Multichem commited on
Commit
02b6571
·
1 Parent(s): 8ab28a8

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +12 -11
app.py CHANGED
@@ -250,12 +250,12 @@ def get_correlated_portfolio_for_sim(Total_Sample_Size):
250
  RandomPortArray = RandomPortfolio.to_numpy()
251
  del RandomPortfolio
252
 
253
- RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,8:16].astype(int))]
254
- RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,16:24].astype(np.double))]
255
- RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,24:32].astype(np.double))]
256
- st.write(RandomPortArray[:,:100])
257
- RandomPortArrayOut = np.delete(RandomPortArray, np.s_[8:32], axis=1)
258
- st.write(RandomPortArrayOut[:,:100])
259
  RandomPortfolioDF = pd.DataFrame(RandomPortArrayOut, columns = ['QB', 'RB1', 'WR1', 'WR2', 'FLEX1', 'FLEX2', 'DST', 'User/Field', 'Salary', 'Projection', 'Own'])
260
  RandomPortfolioDF = RandomPortfolioDF.sort_values(by=Sim_function, ascending=False)
261
  del RandomPortArray
@@ -348,11 +348,12 @@ def get_uncorrelated_portfolio_for_sim(Total_Sample_Size):
348
  RandomPortArray = RandomPortfolio.to_numpy()
349
  del RandomPortfolio
350
 
351
- RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,8:16].astype(int))]
352
- RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,16:24].astype(np.double))]
353
- RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,24:32].astype(np.double))]
354
-
355
- RandomPortArrayOut = np.delete(RandomPortArray, np.s_[8:32], axis=1)
 
356
  RandomPortfolioDF = pd.DataFrame(RandomPortArrayOut, columns = ['QB', 'RB1', 'WR1', 'WR2', 'FLEX1', 'FLEX2', 'DST', 'User/Field', 'Salary', 'Projection', 'Own'])
357
  RandomPortfolioDF = RandomPortfolioDF.sort_values(by=Sim_function, ascending=False)
358
  del RandomPortArray
 
250
  RandomPortArray = RandomPortfolio.to_numpy()
251
  del RandomPortfolio
252
 
253
+ RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,8:15].astype(int))]
254
+ RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,15:22].astype(np.double))]
255
+ RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,22:29].astype(np.double))]
256
+ # st.write(RandomPortArray[:,:100])
257
+ RandomPortArrayOut = np.delete(RandomPortArray, np.s_[8:29], axis=1)
258
+ # st.write(RandomPortArrayOut[:,:100])
259
  RandomPortfolioDF = pd.DataFrame(RandomPortArrayOut, columns = ['QB', 'RB1', 'WR1', 'WR2', 'FLEX1', 'FLEX2', 'DST', 'User/Field', 'Salary', 'Projection', 'Own'])
260
  RandomPortfolioDF = RandomPortfolioDF.sort_values(by=Sim_function, ascending=False)
261
  del RandomPortArray
 
348
  RandomPortArray = RandomPortfolio.to_numpy()
349
  del RandomPortfolio
350
 
351
+ RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,8:15].astype(int))]
352
+ RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,15:22].astype(np.double))]
353
+ RandomPortArray = np.c_[RandomPortArray, np.einsum('ij->i',RandomPortArray[:,22:29].astype(np.double))]
354
+ # st.write(RandomPortArray[:,:100])
355
+ RandomPortArrayOut = np.delete(RandomPortArray, np.s_[8:29], axis=1)
356
+ # st.write(RandomPortArrayOut[:,:100])
357
  RandomPortfolioDF = pd.DataFrame(RandomPortArrayOut, columns = ['QB', 'RB1', 'WR1', 'WR2', 'FLEX1', 'FLEX2', 'DST', 'User/Field', 'Salary', 'Projection', 'Own'])
358
  RandomPortfolioDF = RandomPortfolioDF.sort_values(by=Sim_function, ascending=False)
359
  del RandomPortArray