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

Merge commit 'aa7aeb046ef72412cadd094666efc8e4c503ef2d' into feature/objectify

Browse Source
This commit is contained in:
Gerald Lonlas
2018-03-02 23:28:36 -08:00
parent bbb1a31fda aa7aeb046e
commit 0632cf0f44
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
freqtrade/analyze.py
View File

@@ -177,15 +177,15 @@ class Analyze(object):
return True
# Check if time matches and current rate is above threshold
time_diff = (current_time - trade.open_date).total_seconds() / 60
for duration, threshold in sorted(self.strategy.minimal_roi.items()):
if time_diff > float(duration) and current_profit > 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
self.logger.debug(
'Threshold not reached. (cur_profit: %1.2f%%)',
float(current_profit) * 100.0
)
if time_diff < duration:
return False
return False
def tickerdata_to_dataframe(self, tickerdata: Dict[str, List]) -> Dict[str, DataFrame]: