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

Merge commit '1134c81aad049d4357c8f299ffc801218f3d9574' into feature/objectify

Browse Source
This commit is contained in:
Gerald Lonlas
2018-03-03 16:42:37 -08:00
parent 96a343fb29 1134c81aad
commit 38510d4b03
11 changed files with 285 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
freqtrade/analyze.py
View File

@@ -172,19 +172,17 @@ class Analyze(object):
:return True if bot should sell at current rate
"""
current_profit = trade.calc_profit_percent(current_rate)
if self.strategy.stoploss is not None and current_profit < float(self.strategy.stoploss):
if self.strategy.stoploss is not None and current_profit < self.strategy.stoploss:
self.logger.debug('Stop loss hit.')
return True
# Check if time matches and current rate is above threshold
time_diff = (current_time.timestamp() - trade.open_date.timestamp()) / 60
for duration_string, threshold in self.strategy.minimal_roi.items():
duration = float(duration_string)
if time_diff > duration and current_profit > threshold:
return True
if time_diff < duration:
for duration, threshold in self.strategy.minimal_roi.items():
if time_diff <= duration:
return False
if current_profit > threshold:
return True
return False