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

Rename generate_row to add_indicators

Browse Source
This commit is contained in:
Matthias 2019-06-30 09:44:50 +02:00
parent 88545d882c
commit 0d5e94b147
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/plot/plotting.py
View File

@ -54,7 +54,7 @@ class FTPlots():
self.trades = load_trades(self._config) self.trades = load_trades(self._config)
def generate_row(fig, row, indicators: List[str], data: pd.DataFrame) -> tools.make_subplots: def add_indicators(fig, row, indicators: List[str], data: pd.DataFrame) -> tools.make_subplots:
""" """
Generator all the indicator selected by the user for a specific row Generator all the indicator selected by the user for a specific row
:param fig: Plot figure to append to :param fig: Plot figure to append to
@ -224,7 +224,7 @@ def generate_candlestick_graph(
fig.append_trace(bb_upper, 1, 1) fig.append_trace(bb_upper, 1, 1)
# Add indicators to main plot # Add indicators to main plot
fig = generate_row(fig=fig, row=1, indicators=indicators1, data=data) fig = add_indicators(fig=fig, row=1, indicators=indicators1, data=data)
fig = plot_trades(fig, trades) fig = plot_trades(fig, trades)
@ -237,7 +237,7 @@ def generate_candlestick_graph(
fig.append_trace(volume, 2, 1) fig.append_trace(volume, 2, 1)
# Add indicators to seperate row # Add indicators to seperate row
fig = generate_row(fig=fig, row=3, indicators=indicators2, data=data) fig = add_indicators(fig=fig, row=3, indicators=indicators2, data=data)
return fig return fig

16
freqtrade/tests/test_plotting.py
View File

@ -10,14 +10,14 @@ from freqtrade.data import history
from freqtrade.data.btanalysis import load_backtest_data from freqtrade.data.btanalysis import load_backtest_data
from freqtrade.plot.plotting import (generate_candlestick_graph, from freqtrade.plot.plotting import (generate_candlestick_graph,
store_plot_file, store_plot_file,
generate_plot_filename, generate_row, generate_plot_filename, add_indicators,
plot_trades) plot_trades)
from freqtrade.strategy.default_strategy import DefaultStrategy from freqtrade.strategy.default_strategy import DefaultStrategy
from freqtrade.tests.conftest import log_has, log_has_re from freqtrade.tests.conftest import log_has, log_has_re
def fig_generating_mock(fig, *args, **kwargs): def fig_generating_mock(fig, *args, **kwargs):
""" Return Fig - used to mock generate_row and plot_trades""" """ Return Fig - used to mock add_indicators and plot_trades"""
return fig return fig
@ -36,7 +36,7 @@ def generage_empty_figure():
) )
def test_generate_row(default_conf, caplog): def test_add_indicators(default_conf, caplog):
pair = "UNITTEST/BTC" pair = "UNITTEST/BTC"
timerange = TimeRange(None, 'line', 0, -1000) timerange = TimeRange(None, 'line', 0, -1000)
@ -51,20 +51,20 @@ def test_generate_row(default_conf, caplog):
fig = generage_empty_figure() fig = generage_empty_figure()
# Row 1 # Row 1
fig1 = generate_row(fig=deepcopy(fig), row=1, indicators=indicators1, data=data) fig1 = add_indicators(fig=deepcopy(fig), row=1, indicators=indicators1, data=data)
figure = fig1.layout.figure figure = fig1.layout.figure
ema10 = find_trace_in_fig_data(figure.data, "ema10") ema10 = find_trace_in_fig_data(figure.data, "ema10")
assert isinstance(ema10, go.Scatter) assert isinstance(ema10, go.Scatter)
assert ema10.yaxis == "y" assert ema10.yaxis == "y"
fig2 = generate_row(fig=deepcopy(fig), row=3, indicators=indicators2, data=data) fig2 = add_indicators(fig=deepcopy(fig), row=3, indicators=indicators2, data=data)
figure = fig2.layout.figure figure = fig2.layout.figure
macd = find_trace_in_fig_data(figure.data, "macd") macd = find_trace_in_fig_data(figure.data, "macd")
assert isinstance(macd, go.Scatter) assert isinstance(macd, go.Scatter)
assert macd.yaxis == "y3" assert macd.yaxis == "y3"
# No indicator found # No indicator found
fig3 = generate_row(fig=deepcopy(fig), row=3, indicators=['no_indicator'], data=data) fig3 = add_indicators(fig=deepcopy(fig), row=3, indicators=['no_indicator'], data=data)
assert fig == fig3 assert fig == fig3
assert log_has_re(r'Indicator "no_indicator" ignored\..*', caplog.record_tuples) assert log_has_re(r'Indicator "no_indicator" ignored\..*', caplog.record_tuples)
@ -98,7 +98,7 @@ def test_plot_trades(caplog):
def test_generate_candlestick_graph_no_signals_no_trades(default_conf, mocker, caplog): def test_generate_candlestick_graph_no_signals_no_trades(default_conf, mocker, caplog):
row_mock = mocker.patch('freqtrade.plot.plotting.generate_row', row_mock = mocker.patch('freqtrade.plot.plotting.add_indicators',
MagicMock(side_effect=fig_generating_mock)) MagicMock(side_effect=fig_generating_mock))
trades_mock = mocker.patch('freqtrade.plot.plotting.plot_trades', trades_mock = mocker.patch('freqtrade.plot.plotting.plot_trades',
MagicMock(side_effect=fig_generating_mock)) MagicMock(side_effect=fig_generating_mock))
@ -134,7 +134,7 @@ def test_generate_candlestick_graph_no_signals_no_trades(default_conf, mocker, c
def test_generate_candlestick_graph_no_trades(default_conf, mocker): def test_generate_candlestick_graph_no_trades(default_conf, mocker):
row_mock = mocker.patch('freqtrade.plot.plotting.generate_row', row_mock = mocker.patch('freqtrade.plot.plotting.add_indicators',
MagicMock(side_effect=fig_generating_mock)) MagicMock(side_effect=fig_generating_mock))
trades_mock = mocker.patch('freqtrade.plot.plotting.plot_trades', trades_mock = mocker.patch('freqtrade.plot.plotting.plot_trades',
MagicMock(side_effect=fig_generating_mock)) MagicMock(side_effect=fig_generating_mock))