Update app.py
Browse files
app.py
CHANGED
|
@@ -199,19 +199,20 @@ def predict_and_plot(timeframe, limit, epsilon, n_steps, ma):
|
|
| 199 |
|
| 200 |
def predict_both_plots(limit, epsilon, n_steps, ma):
|
| 201 |
period = f'{limit}d'
|
| 202 |
-
btc_data_1d = fetch_yfinance_data('BTC/USDT', period,
|
| 203 |
-
btc_data_4h = fetch_yfinance_data('BTC/USDT', period,
|
| 204 |
-
bch_data_1d = fetch_yfinance_data('BCH/USDT', period,
|
| 205 |
-
bch_data_4h = fetch_yfinance_data('BCH/USDT', period,
|
| 206 |
|
| 207 |
btc_data_1d, _ = normalize(btc_data_1d)
|
| 208 |
bch_data_1d, _ = normalize(bch_data_1d)
|
| 209 |
btc_data_4h, _ = normalize(btc_data_4h)
|
| 210 |
bch_data_4h, _ = normalize(bch_data_4h)
|
| 211 |
-
|
| 212 |
-
|
| 213 |
-
|
| 214 |
-
|
|
|
|
| 215 |
return fig_1d, fig_2g
|
| 216 |
|
| 217 |
with gr.Blocks() as demo:
|
|
@@ -235,4 +236,4 @@ with gr.Blocks() as demo:
|
|
| 235 |
outputs=[plot1, plot2]
|
| 236 |
)
|
| 237 |
|
| 238 |
-
demo.launch()
|
|
|
|
| 199 |
|
| 200 |
def predict_both_plots(limit, epsilon, n_steps, ma):
|
| 201 |
period = f'{limit}d'
|
| 202 |
+
btc_data_1d = fetch_yfinance_data('BTC/USDT', period, interval='1d')
|
| 203 |
+
btc_data_4h = fetch_yfinance_data('BTC/USDT', period, interval='4h')
|
| 204 |
+
bch_data_1d = fetch_yfinance_data('BCH/USDT', period, interval='1d')
|
| 205 |
+
bch_data_4h = fetch_yfinance_data('BCH/USDT', period, interval='4h')
|
| 206 |
|
| 207 |
btc_data_1d, _ = normalize(btc_data_1d)
|
| 208 |
bch_data_1d, _ = normalize(bch_data_1d)
|
| 209 |
btc_data_4h, _ = normalize(btc_data_4h)
|
| 210 |
bch_data_4h, _ = normalize(bch_data_4h)
|
| 211 |
+
|
| 212 |
+
preds_1d, label_1d = predictions(model_n1d_cat, btc_data_1d, bch_data_1d, name='1 day', n_steps=n_steps)
|
| 213 |
+
preds_4h, label_4h = predictions(model_n4h_cat, btc_data_4h, bch_data_4h, name='4 hours', n_steps=n_steps)
|
| 214 |
+
fig_1d = plot(preds_1d, label=label_1d, timeframe=timeframe, ma=ma, n_steps=n_steps)
|
| 215 |
+
fig_4h = plot(preds_4h, label=label_4h, timeframe=timeframe, ma=ma, n_steps=n_steps)
|
| 216 |
return fig_1d, fig_2g
|
| 217 |
|
| 218 |
with gr.Blocks() as demo:
|
|
|
|
| 236 |
outputs=[plot1, plot2]
|
| 237 |
)
|
| 238 |
|
| 239 |
+
demo.launch()
|