Spaces:
Runtime error
Runtime error
Commit ·
d32dcbd
1
Parent(s): 407ac47
stopping erroneous dropping of NaN drawdown
Browse files
app.py
CHANGED
|
@@ -152,7 +152,7 @@ def get_rolling_stats(df, lev, otimeheader, days):
|
|
| 152 |
rolling_df = df[df[otimeheader] >= rollend]
|
| 153 |
|
| 154 |
if len(rolling_df) > 0:
|
| 155 |
-
rolling_perc = rolling_df['Return Per Trade'].dropna().cumprod().values[-1]-1
|
| 156 |
else:
|
| 157 |
rolling_perc = np.nan
|
| 158 |
else:
|
|
@@ -583,7 +583,7 @@ def runapp() -> None:
|
|
| 583 |
df['Balance used in Trade'] = np.concatenate([[principal_balance], df['New Balance'].values[:-1]])
|
| 584 |
df['Net P/L Per Trade'] = (df['Return Per Trade']-1)*df['Balance used in Trade']
|
| 585 |
df['Cumulative P/L'] = df['Net P/L Per Trade'].cumsum()
|
| 586 |
-
cum_pl = df.loc[df.dropna().index[-1],'Cumulative P/L'] + principal_balance
|
| 587 |
|
| 588 |
effective_return = 100*((cum_pl - principal_balance)/principal_balance)
|
| 589 |
|
|
@@ -595,7 +595,7 @@ def runapp() -> None:
|
|
| 595 |
f"{100*(cum_pl-principal_balance)/(principal_balance):.2f} %",
|
| 596 |
)
|
| 597 |
|
| 598 |
-
st.line_chart(data=df.dropna(), x='Exit Date', y='Cumulative P/L', use_container_width=True)
|
| 599 |
|
| 600 |
df['Per Trade Return Rate'] = df['Return Per Trade']-1
|
| 601 |
|
|
|
|
| 152 |
rolling_df = df[df[otimeheader] >= rollend]
|
| 153 |
|
| 154 |
if len(rolling_df) > 0:
|
| 155 |
+
rolling_perc = rolling_df['Return Per Trade'].drop('Drawdown %', axis=1).dropna().cumprod().values[-1]-1
|
| 156 |
else:
|
| 157 |
rolling_perc = np.nan
|
| 158 |
else:
|
|
|
|
| 583 |
df['Balance used in Trade'] = np.concatenate([[principal_balance], df['New Balance'].values[:-1]])
|
| 584 |
df['Net P/L Per Trade'] = (df['Return Per Trade']-1)*df['Balance used in Trade']
|
| 585 |
df['Cumulative P/L'] = df['Net P/L Per Trade'].cumsum()
|
| 586 |
+
cum_pl = df.loc[df.drop('Drawdown %', axis=1).dropna().index[-1],'Cumulative P/L'] + principal_balance
|
| 587 |
|
| 588 |
effective_return = 100*((cum_pl - principal_balance)/principal_balance)
|
| 589 |
|
|
|
|
| 595 |
f"{100*(cum_pl-principal_balance)/(principal_balance):.2f} %",
|
| 596 |
)
|
| 597 |
|
| 598 |
+
st.line_chart(data=df.drop('Drawdown %', axis=1).dropna(), x='Exit Date', y='Cumulative P/L', use_container_width=True)
|
| 599 |
|
| 600 |
df['Per Trade Return Rate'] = df['Return Per Trade']-1
|
| 601 |
|