anaucoin commited on
Commit
8cb4519
1 Parent(s): 62111cc

rolling stats dynamic

Browse files
Files changed (1) hide show
  1. app.py +13 -8
app.py CHANGED
@@ -44,14 +44,19 @@ def get_hist_info(df_coin, principal_balance,plheader):
44
  pfactor = np.nan
45
  return numtrades, numwin, numloss, winrate, pfactor
46
  @st.experimental_memo
47
- def get_rolling_stats(df, lev, otimeheader,days):
48
- rollend = datetime.today()-timedelta(days=days)
49
- rolling_df = df[df[otimeheader] >= rollend]
50
-
51
- if len(rolling_df) > 0:
52
- rolling_perc = rolling_df['Return Per Trade'].dropna().cumprod().values[-1]-1
53
- else:
54
- rolling_perc = 0
 
 
 
 
 
55
  return 100*lev*rolling_perc
56
 
57
  @st.experimental_memo
 
44
  pfactor = np.nan
45
  return numtrades, numwin, numloss, winrate, pfactor
46
  @st.experimental_memo
47
+ def get_rolling_stats(df, lev, otimeheader, days):
48
+ max_roll = (df[otimeheader].max() - df[otimeheader].min()).days
49
+
50
+ if max_roll >= days:
51
+ rollend = df[otimeheader].max()-timedelta(days=days)
52
+ rolling_df = df[df[otimeheader] >= rollend]
53
+
54
+ if len(rolling_df) > 0:
55
+ rolling_perc = rolling_df['Return Per Trade'].dropna().cumprod().values[-1]-1
56
+ else:
57
+ rolling_perc = np.nan
58
+ else:
59
+ rolling_perc = np.nan
60
  return 100*lev*rolling_perc
61
 
62
  @st.experimental_memo