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

Simplify stoploss_reached

Browse Source
This commit is contained in:
Matthias 2019-03-23 16:23:32 +01:00
parent 7307084dfd
commit b1fe8c5325
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/strategy/interface.py
View File

@ -299,18 +299,16 @@ class IStrategy(ABC):
""" """
trailing_stop = self.config.get('trailing_stop', False) trailing_stop = self.config.get('trailing_stop', False)
trade.adjust_stop_loss(trade.open_rate, force_stoploss if force_stoploss
else self.stoploss, initial=True)
# update the stop loss afterwards, after all by definition it's supposed to be hanging
# TODO: Maybe this needs to be moved to the start of this function. check #1575 for details
if trailing_stop:
# check if we have a special stop loss for positive condition
# and if profit is positive
stop_loss_value = force_stoploss if force_stoploss else self.stoploss stop_loss_value = force_stoploss if force_stoploss else self.stoploss
trade.adjust_stop_loss(trade.open_rate, stop_loss_value, initial=True)
if trailing_stop:
# check if we have a special stop loss for positive condition
# and if profit is positive
sl_offset = self.config.get('trailing_stop_positive_offset') or 0.0 sl_offset = self.config.get('trailing_stop_positive_offset') or 0.0
tsl_only_offset = self.config.get('trailing_only_offset_is_reached', False)
if 'trailing_stop_positive' in self.config and current_profit > sl_offset: if 'trailing_stop_positive' in self.config and current_profit > sl_offset:
@ -321,7 +319,6 @@ class IStrategy(ABC):
# if trailing_only_offset_is_reached is true, # if trailing_only_offset_is_reached is true,
# we update trailing stoploss only if offset is reached. # we update trailing stoploss only if offset is reached.
tsl_only_offset = self.config.get('trailing_only_offset_is_reached', False)
if not (tsl_only_offset and current_profit < sl_offset): if not (tsl_only_offset and current_profit < sl_offset):
trade.adjust_stop_loss(high or current_rate, stop_loss_value) trade.adjust_stop_loss(high or current_rate, stop_loss_value)