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

fixing some flake8 tests

Browse Source
This commit is contained in:
Felix Meier 2021-10-26 00:02:26 +02:00
parent 0d995038e1
commit 4f521618a6
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/plot/plotting.py
View File

@ -364,11 +364,13 @@ def generateBuySellVolumes(dataframe) -> pd.DataFrame:
candles['volume_buy'].iat[i] = (candles['volume'].iat[i] * candles['volume_buy'].iat[i] = (candles['volume'].iat[i] *
(candles['close'].iat[i]-candles['low'].iat[i]) / (candles['close'].iat[i]-candles['low'].iat[i]) /
(candles['high'].iat[i]-candles['low'].iat[i])) if (candles['high'].iat[i]-candles['low'].iat[i]) > 0 else 0 (candles['high'].iat[i]-candles['low'].iat[i])) \
if (candles['high'].iat[i]-candles['low'].iat[i]) > 0 else 0
candles['volume_sell'].iat[i] = (candles['volume'].iat[i] * candles['volume_sell'].iat[i] = (candles['volume'].iat[i] *
(candles['high'].iat[i]-candles['close'].iat[i]) / (candles['high'].iat[i]-candles['close'].iat[i]) /
(candles['high'].iat[i]-candles['low'].iat[i])) if (candles['high'].iat[i]-candles['low'].iat[i]) > 0 else 0 (candles['high'].iat[i]-candles['low'].iat[i])) \
if (candles['high'].iat[i]-candles['low'].iat[i]) > 0 else 0
return candles return candles

26
tests/test_plotting.py
View File

@ -13,9 +13,10 @@ from freqtrade.configuration import TimeRange
from freqtrade.data import history from freqtrade.data import history
from freqtrade.data.btanalysis import create_cum_profit, load_backtest_data from freqtrade.data.btanalysis import create_cum_profit, load_backtest_data
from freqtrade.exceptions import OperationalException from freqtrade.exceptions import OperationalException
from freqtrade.plot.plotting import (add_areas, add_indicators, add_profit, create_plotconfig, createVolumeProfileData, from freqtrade.plot.plotting import (add_areas, add_indicators, add_profit, create_plotconfig,
generate_candlestick_graph, generate_plot_filename, createVolumeProfileData, generate_candlestick_graph,
generate_profit_graph, generateBuySellVolumes, init_plotscript, load_and_plot_trades, generate_plot_filename, generate_profit_graph,
generateBuySellVolumes, init_plotscript, load_and_plot_trades,
plot_profit, plot_trades, store_plot_file) plot_profit, plot_trades, store_plot_file)
from freqtrade.resolvers import StrategyResolver from freqtrade.resolvers import StrategyResolver
from tests.conftest import get_args, log_has, log_has_re, patch_exchange from tests.conftest import get_args, log_has, log_has_re, patch_exchange
@ -314,12 +315,13 @@ def test_generate_candlestick_graph_withVolumeProfile(default_conf, mocker, test
data['buy'] = 0 data['buy'] = 0
data['sell'] = 0 data['sell'] = 0
indicators1 = []
indicators2 = []
fig = generate_candlestick_graph(pair=pair, data=data, trades=None, fig = generate_candlestick_graph(pair=pair, data=data, trades=None,
plot_config={'main_plot': {'sma': {}, 'ema200': {}}, plot_config={'main_plot': {'sma': {}, 'ema200': {}},
'subplots': {'Other': {'macdsignal': {}}}, 'subplots': {'Other': {'macdsignal': {}}},
'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true', 'VolumeProfileHistoryBars': 96, 'VolumeProfilePriceRangeSplices': 60}}) 'volume': {'showBuySell': 'true',
'showVolumeProfile': 'true',
'VolumeProfileHistoryBars': 96,
'VolumeProfilePriceRangeSplices': 60}})
assert isinstance(fig, go.Figure) assert isinstance(fig, go.Figure)
assert fig.layout.title.text == pair assert fig.layout.title.text == pair
figure = fig.layout.figure figure = fig.layout.figure
@ -568,20 +570,24 @@ def test_plot_profit(default_conf, mocker, testdatadir):
# No indicators, use plot_conf with just volume profile # No indicators, use plot_conf with just volume profile
([], [], ([], [],
{ {
'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true', 'VolumeProfileHistoryBars': 96, 'VolumeProfilePriceRangeSplices': 100}, 'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true',
'VolumeProfileHistoryBars': 96, 'VolumeProfilePriceRangeSplices': 100},
}, },
{'main_plot': {'sma': {}, 'ema3': {}, 'ema5': {}}, {'main_plot': {'sma': {}, 'ema3': {}, 'ema5': {}},
'subplots': {'Other': {'macd': {}, 'macdsignal': {}}}, 'subplots': {'Other': {'macd': {}, 'macdsignal': {}}},
'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true', 'VolumeProfileHistoryBars': 96, 'VolumeProfilePriceRangeSplices': 100}}, 'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true',
'VolumeProfileHistoryBars': 96, 'VolumeProfilePriceRangeSplices': 100}},
), ),
# No indicators, use full plot_conf with volume profile # No indicators, use full plot_conf with volume profile
([], [], ([], [],
{'main_plot': {'sma': {}, 'ema200': {}}, {'main_plot': {'sma': {}, 'ema200': {}},
'subplots': {'Other': {'macdsignal': {}}}, 'subplots': {'Other': {'macdsignal': {}}},
'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true', 'VolumeProfileHistoryBars': 9, 'VolumeProfilePriceRangeSplices': 111}}, 'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true',
'VolumeProfileHistoryBars': 9, 'VolumeProfilePriceRangeSplices': 111}},
{'main_plot': {'sma': {}, 'ema200': {}}, {'main_plot': {'sma': {}, 'ema200': {}},
'subplots': {'Other': {'macdsignal': {}}}, 'subplots': {'Other': {'macdsignal': {}}},
'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true', 'VolumeProfileHistoryBars': 9, 'VolumeProfilePriceRangeSplices': 111}}, 'volume': {'showBuySell': 'true', 'showVolumeProfile': 'true',
'VolumeProfileHistoryBars': 9, 'VolumeProfilePriceRangeSplices': 111}},
) )
]) ])