adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only read trades once

Browse Source
This commit is contained in:
Matthias 2019-06-29 20:41:22 +02:00
parent e50eee59cf
commit 4218d569de
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/plot_dataframe.py
View File

@ -80,6 +80,11 @@ def analyse_and_plot_pairs(config: Dict[str, Any]):
live=config.get("live", False), live=config.get("live", False),
) )
if config["trade_source"] == "DB":
trades = load_trades_from_db(config["db_url"])
elif config["trade_source"] == "file":
trades = load_backtest_data(Path(config["exportfilename"]))
pair_counter = 0 pair_counter = 0
for pair, data in tickers.items(): for pair, data in tickers.items():
pair_counter += 1 pair_counter += 1
@ -87,18 +92,14 @@ def analyse_and_plot_pairs(config: Dict[str, Any]):
tickers = {} tickers = {}
tickers[pair] = data tickers[pair] = data
dataframe = generate_dataframe(strategy, tickers, pair) dataframe = generate_dataframe(strategy, tickers, pair)
if config["trade_source"] == "DB":
trades = load_trades_from_db(config["db_url"])
elif config["trade_source"] == "file":
trades = load_backtest_data(Path(config["exportfilename"]))
trades = trades.loc[trades['pair'] == pair] trades_pair = trades.loc[trades['pair'] == pair]
trades = extract_trades_of_period(dataframe, trades) trades_pair = extract_trades_of_period(dataframe, trades_pair)
fig = generate_candlestick_graph( fig = generate_candlestick_graph(
pair=pair, pair=pair,
data=dataframe, data=dataframe,
trades=trades, trades=trades_pair,
indicators1=config["indicators1"].split(","), indicators1=config["indicators1"].split(","),
indicators2=config["indicators2"].split(",") indicators2=config["indicators2"].split(",")
) )