dwker/v2realbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inject stratvars

Browse Source
This commit is contained in:
David Brazda
2023-04-14 12:06:37 +02:00
parent a1aa1c3f75
commit 8f7ca4a8b2
16 changed files with 144 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
v2realbot/backtesting/__pycache__/backtester.cpython-310.pyc
View File

Binary file not shown.

19
v2realbot/backtesting/backtester.py
View File

@ -43,7 +43,7 @@ from v2realbot.common.model import TradeUpdate, Order
#from rich import print
import threading
import asyncio
from v2realbot.config import BT_DELAYS
from v2realbot.config import BT_DELAYS, DATA_DIR
from v2realbot.utils.utils import AttributeDict, ltp, zoneNY, trunc, count_decimals,print
from v2realbot.utils.tlog import tlog
from datetime import datetime, timedelta
@ -59,7 +59,6 @@ from v2realbot.utils.dash_save_html import make_static
import dash_bootstrap_components as dbc
from dash.dependencies import Input, Output
from dash import dcc, html, dash_table, Dash
from config import DATA_DIR
""""
LATENCY DELAYS
.000 trigger - last_trade_time (.4246266)
@ -563,8 +562,18 @@ class Backtester:
hist_df = hist_df.set_index('time', drop=False)
#indicators
ind_df = pd.DataFrame(state.indicators)
ind_df = ind_df.set_index('time', drop=False)
#TODO vyresit if no indicators or no trades - pada na ValueError protoze pole obsahuje time, ale nikoliv indikatory
#zatim jen takto workaround
#print(state.indicators)
try:
ind_df = pd.DataFrame(state.indicators)
ind_df = ind_df.set_index('time', drop=False)
except ValueError as e:
print("Value error", str(e))
state.indicators = {'time': [] }
ind_df = pd.DataFrame(state.indicators)
ind_df = ind_df.set_index('time', drop=False)
#print("Indicators", ind_df)
#print(state.indicators)
@ -801,7 +810,7 @@ class Backtester:
if n_clicks == 0:
return 'not saved'
else:
bt_dir = DATADIR + "/backtestresults/" + self.symbol + self.bp_from.strftime("%d-%m-%y-%H-%M-%S") + ' ' + self.bp_to.strftime("%d-%m-%y-%H-%M-%S") + ' ' + str(datetime.now().microsecond)
bt_dir = DATA_DIR + "/backtestresults/" + self.symbol + self.bp_from.strftime("%d-%m-%y-%H-%M-%S") + ' ' + self.bp_to.strftime("%d-%m-%y-%H-%M-%S") + ' ' + str(datetime.now().microsecond)
make_static(f'http://127.0.0.1:{port}/', bt_dir)
return 'saved'