lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-10 10:21:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

simple tests

Browse Source
This commit is contained in:
Christof 2020-12-19 20:32:13 +01:00
parent 8b24878023
commit 43091a26ce
2 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freqtrade/plot/plotting.py
View File

@ -301,11 +301,22 @@ def add_areas(fig, row: int, data: pd.DataFrame, indicators) -> make_subplots:
"""
for indicator, ind_conf in indicators.items():
if 'fill_to' in ind_conf:
label = ind_conf.get('fill_label', '')
fill_color = ind_conf.get('fill_color', 'rgba(0,176,246,0.2)')
fig = plot_area_between(fig, row, data, indicator,
ind_conf['fill_to'], label=label,
fill_color=fill_color)
indicator_b = ind_conf['fill_to']
if indicator in data and indicator_b in data:
label = ind_conf.get('fill_label', '')
fill_color = ind_conf.get('fill_color', 'rgba(0,176,246,0.2)')
fig = plot_area_between(fig, row, data, indicator, indicator_b,
label=label, fill_color=fill_color)
elif indicator not in data:
logger.info(
'Indicator "%s" ignored. Reason: This indicator is not '
'found in your strategy.', indicator
)
elif indicator_b not in data:
logger.info(
'fill_to: "%s" ignored. Reason: This indicator is not '
'in your strategy.', indicator_b
)
return fig

40
tests/test_plotting.py
View File

@ -16,7 +16,8 @@ from freqtrade.exceptions import OperationalException
from freqtrade.plot.plotting import (add_indicators, add_profit, create_plotconfig,
generate_candlestick_graph, generate_plot_filename,
generate_profit_graph, init_plotscript, load_and_plot_trades,
plot_profit, plot_trades, store_plot_file)
plot_profit, plot_trades, store_plot_file,
add_areas)
from freqtrade.resolvers import StrategyResolver
from tests.conftest import get_args, log_has, log_has_re, patch_exchange
@ -96,6 +97,42 @@ def test_add_indicators(default_conf, testdatadir, caplog):
assert log_has_re(r'Indicator "no_indicator" ignored\..*', caplog)
def test_add_areas(default_conf, testdatadir, caplog):
pair = "UNITTEST/BTC"
timerange = TimeRange(None, 'line', 0, -1000)
data = history.load_pair_history(pair=pair, timeframe='1m',
datadir=testdatadir, timerange=timerange)
indicators = {"macd": {"color": "red",
"fill_color": "black",
"fill_to": "macdhist",
"fill_label": "MACD Fill"}}
default_conf.update({'strategy': 'DefaultStrategy'})
strategy = StrategyResolver.load_strategy(default_conf)
# Generate buy/sell signals and indicators
data = strategy.analyze_ticker(data, {'pair': pair})
fig = generate_empty_figure()
# indicator mentioned in fill_to does not exist
fig1 = add_areas(fig, 1, data, {'ema10': {'fill_to': 'no_fill_indicator'}})
assert fig == fig1
assert log_has_re(r'fill_to: "no_fill_indicator" ignored\..*', caplog)
# indicator does not exist
fig2 = add_areas(fig, 1, data, {'no_indicator': {'fill_to': 'ema10'}})
assert fig == fig2
assert log_has_re(r'Indicator "no_indicator" ignored\..*', caplog)
fig3 = add_areas(fig, 3, data, indicators)
figure = fig3.layout.figure
fill_macd = find_trace_in_fig_data(figure.data, "MACD Fill")
assert isinstance(fill_macd, go.Scatter)
assert fill_macd.yaxis == "y3"
assert fill_macd.fillcolor == "black"
def test_plot_trades(testdatadir, caplog):
fig1 = generate_empty_figure()
# nothing happens when no trades are available
@ -136,6 +173,7 @@ def test_plot_trades(testdatadir, caplog):
assert trade_sell_loss.text[5] == '-10.4%, stop_loss, 720 min'
def test_generate_candlestick_graph_no_signals_no_trades(default_conf, mocker, testdatadir, caplog):
row_mock = mocker.patch('freqtrade.plot.plotting.add_indicators',
MagicMock(side_effect=fig_generating_mock))