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

introduce experimental variable and fix test naming

This commit is contained in:
xmatthias 2018-06-22 20:51:21 +02:00
parent 8a44dff595
commit cbfee51f32
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
freqtrade/analyze.py
View File

@ -172,7 +172,8 @@ class Analyze(object):
if the threshold is reached and updates the trade record.
:return: True if trade should be sold, False otherwise
"""
if buy and self.config.get('experimental', {}).get('ignore_roi_if_buy_signal', False):
experimental = self.config.get('experimental', {})
if buy and experimental.get('ignore_roi_if_buy_signal', False):
logger.debug('Buy signal still active - not selling.')
return False
@ -181,13 +182,11 @@ class Analyze(object):
logger.debug('Required profit reached. Selling..')
return True
# Experimental: Check if the trade is profitable before selling it (avoid selling at loss)
if self.config.get('experimental', {}).get('sell_profit_only', False):
if experimental.get('sell_profit_only', False):
logger.debug('Checking if trade is profitable..')
if trade.calc_profit(rate=rate) <= 0:
return False
if sell and not buy and self.config.get('experimental', {}).get('use_sell_signal', False):
if sell and not buy and experimental.get('use_sell_signal', False):
logger.debug('Sell signal received. Selling..')
return True

5
freqtrade/freqtradebot.py
View File

@ -423,9 +423,8 @@ with limit `{buy_limit:.8f} ({stake_amount:.6f} \
current_rate = self.exchange.get_ticker(trade.pair)['bid']
(buy, sell) = (False, False)
if (self.config.get('experimental', {}).get('use_sell_signal')
or self.config.get('experimental', {}).get('ignore_roi_if_buy_signal')):
experimental = self.config.get('experimental', {})
if experimental.get('use_sell_signal') or experimental.get('ignore_roi_if_buy_signal'):
(buy, sell) = self.analyze.get_signal(self.exchange,
trade.pair, self.analyze.get_ticker_interval())

2
freqtrade/tests/test_freqtradebot.py
View File

@ -1335,7 +1335,7 @@ def test_sell_profit_only_disable_loss(default_conf, limit_buy_order, fee, mocke
assert freqtrade.handle_trade(trade) is True
def ignore_roi_if_buy_signal(default_conf, limit_buy_order, fee, mocker) -> None:
def test_ignore_roi_if_buy_signal(default_conf, limit_buy_order, fee, mocker) -> None:
"""
Test sell_profit_only feature when enabled and we have a loss
"""