Add short to the stratetgy
This commit is contained in:
@@ -416,6 +416,17 @@ class ChanLun_SOL_5(IStrategy):
|
|||||||
#(qtpylib.crossed_above(dataframe['macd'], dataframe['macdsignal']))
|
#(qtpylib.crossed_above(dataframe['macd'], dataframe['macdsignal']))
|
||||||
),
|
),
|
||||||
['enter_long', 'enter_tag']] = (1, 'long_signal_chan')
|
['enter_long', 'enter_tag']] = (1, 'long_signal_chan')
|
||||||
|
dataframe.loc[
|
||||||
|
(
|
||||||
|
#(dataframe['state'] == "-30")
|
||||||
|
(dataframe[state_str].shift(self.time5*2) > 1.0) &
|
||||||
|
(dataframe[fx_str].shift(self.time5*2) == 1)
|
||||||
|
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)].shift(self.time5) == "-10") &
|
||||||
|
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time30)] == "-10") &
|
||||||
|
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)].shift(self.time5) == "-10")
|
||||||
|
#(qtpylib.crossed_above(dataframe['macd'], dataframe['macdsignal']))
|
||||||
|
),
|
||||||
|
['enter_short', 'enter_tag']] = (1, 'short_signal_chan')
|
||||||
return dataframe
|
return dataframe
|
||||||
def populate_exit_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
|
def populate_exit_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
|
||||||
state_str = 'resample_{}_state'.format(self.get_ticker_indicator()*self.time5)
|
state_str = 'resample_{}_state'.format(self.get_ticker_indicator()*self.time5)
|
||||||
@@ -429,6 +440,15 @@ class ChanLun_SOL_5(IStrategy):
|
|||||||
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time60)] == "10")
|
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time60)] == "10")
|
||||||
),
|
),
|
||||||
['exit_long', 'exit_tag']] = (1, 'long_close_signal_chan')
|
['exit_long', 'exit_tag']] = (1, 'long_close_signal_chan')
|
||||||
|
dataframe.loc[
|
||||||
|
(
|
||||||
|
#(dataframe['state']== "30")
|
||||||
|
(dataframe[state_str].shift(self.time5*2) > 1.0) &
|
||||||
|
(dataframe[fx_str].shift(self.time5*2) == -1)
|
||||||
|
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time30)] == "10") &
|
||||||
|
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time60)] == "10")
|
||||||
|
),
|
||||||
|
['exit_short', 'exit_tag']] = (1, 'short_close_signal_chan')
|
||||||
return dataframe
|
return dataframe
|
||||||
def leverage(self, pair: str, current_time: datetime, current_rate: float,
|
def leverage(self, pair: str, current_time: datetime, current_rate: float,
|
||||||
proposed_leverage: float, max_leverage: float, entry_tag: Optional[str], side: str,
|
proposed_leverage: float, max_leverage: float, entry_tag: Optional[str], side: str,
|
||||||
|
|||||||
Reference in New Issue
Block a user