From 14450c4efe9525a513401aeaa020ae5a33af91f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Delacotte?= Date: Wed, 30 Apr 2025 22:01:04 +0200 Subject: [PATCH] Zeus_8_3_2_B_4_2 tests tendancies / suppression filtre B++ --- Zeus_8_3_2_B_4_2.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Zeus_8_3_2_B_4_2.py b/Zeus_8_3_2_B_4_2.py index d60ad5f..4d9c83d 100644 --- a/Zeus_8_3_2_B_4_2.py +++ b/Zeus_8_3_2_B_4_2.py @@ -372,8 +372,10 @@ class Zeus_8_3_2_B_4_2(IStrategy): ) def printLog(self, str): - print(str) - logger.info(str) + if not self.dp.runmode.value in ('backtest', 'hyperopt'): + logger.info(str) + else: + print(str) def add_tendency_column(self, dataframe: pd.DataFrame) -> pd.DataFrame: def tag_by_derivatives(row): @@ -759,16 +761,16 @@ class Zeus_8_3_2_B_4_2(IStrategy): # (dataframe["bb_width"] > 0.01) (dataframe['down_count'].shift(1) < - 6) & (dataframe['down_count'] == 0) - & (dataframe['tendency'] != "B++") - & (dataframe['tendency'] != "B--") + # & (dataframe['tendency'] != "B++") + # & (dataframe['tendency'] != "B--") ), ['enter_long', 'enter_tag']] = (1, 'down') dataframe.loc[ ( (dataframe['low'] < dataframe['min200']) & (dataframe['min50'] == dataframe['min200'].shift(3)) - & (dataframe['tendency'] != "B++") - & (dataframe['tendency'] != "B--") + # & (dataframe['tendency'] != "B++") + # & (dataframe['tendency'] != "B--") ), ['enter_long', 'enter_tag']] = (1, 'low') dataframe['test'] = np.where(dataframe['enter_long'] == 1, dataframe['close'] * 1.01, np.nan)