Change something for the strategy

This commit is contained in:
Porter
2025-05-09 08:35:34 +08:00
parent 4f3629ba76
commit 65a85823b9
12 changed files with 22 additions and 5 deletions
+8 -5
View File
@@ -61,7 +61,8 @@ class ChanLun_SOL_5(IStrategy):
"3600": 0
}
can_short = False
stoploss = -0.30
lev = 5.0
stoploss = -0.3 * lev
trailing_stop = False
trailing_stop_positive = 0.025
trailing_stop_positive_offset = 0.045
@@ -177,7 +178,7 @@ class ChanLun_SOL_5(IStrategy):
#self.print_macd_div_list(dataframe)
#self.print_resample_df(dataframe, 1, 50)
#self.chan.get_bi_list(dataframe_30)
if self.last_time + timedelta(minutes=1) < datetime.now():
if self.last_time + timedelta(minutes=1) < datetime.now() and False:
#print(informative.iloc[-1])
#self.print_klc(dataframe, "1m: ")
#self.print_klc(dataframe_5, "5m: ")
@@ -474,7 +475,8 @@ class ChanLun_SOL_5(IStrategy):
dataframe.loc[
(
#(dataframe['state'] == "-30")
(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)].shift(self.time5) == "-10")
(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)].shift(self.time5) == "-10") |
(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)] == "99")
#(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")
@@ -496,7 +498,8 @@ class ChanLun_SOL_5(IStrategy):
dataframe.loc[
(
#(dataframe['state']== "30")
(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)].shift(self.time5) == "10")
(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)].shift(self.time5) == "10") |
(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time5)] == "-99")
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time30)] == "10") &
#(dataframe['resample_{}_state'.format(self.get_ticker_indicator()*self.time60)] == "10")
),
@@ -513,7 +516,7 @@ class ChanLun_SOL_5(IStrategy):
def leverage(self, pair: str, current_time: datetime, current_rate: float,
proposed_leverage: float, max_leverage: float, entry_tag: Optional[str], side: str,
**kwargs) -> float:
return 1.0
return self.lev
def get_ticker_indicator(self):
return int(self.timeframe[:-1])