|
|
|
|
@ -70,9 +70,10 @@ class DefaultHyperOpts(IHyperOpt):
|
|
|
|
|
dataframe['close'], dataframe['sar']
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
dataframe.loc[
|
|
|
|
|
reduce(lambda x, y: x & y, conditions),
|
|
|
|
|
'buy'] = 1
|
|
|
|
|
if conditions:
|
|
|
|
|
dataframe.loc[
|
|
|
|
|
reduce(lambda x, y: x & y, conditions),
|
|
|
|
|
'buy'] = 1
|
|
|
|
|
|
|
|
|
|
return dataframe
|
|
|
|
|
|
|
|
|
|
@ -129,9 +130,10 @@ class DefaultHyperOpts(IHyperOpt):
|
|
|
|
|
dataframe['sar'], dataframe['close']
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
dataframe.loc[
|
|
|
|
|
reduce(lambda x, y: x & y, conditions),
|
|
|
|
|
'sell'] = 1
|
|
|
|
|
if conditions:
|
|
|
|
|
dataframe.loc[
|
|
|
|
|
reduce(lambda x, y: x & y, conditions),
|
|
|
|
|
'sell'] = 1
|
|
|
|
|
|
|
|
|
|
return dataframe
|
|
|
|
|
|
|
|
|
|
|