]> Piment Noir Git Repositories - freqai-strategies.git/commitdiff
perf(qav3): fine tune TP computation
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Sat, 5 Apr 2025 23:25:43 +0000 (01:25 +0200)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Sat, 5 Apr 2025 23:25:43 +0000 (01:25 +0200)
Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
quickadapter/user_data/strategies/QuickAdapterV3.py

index c905915ddfbea93cea1df4840eea289c335bc80a..d98155dcb55d1519834177f38722ceab61d19a8b 100644 (file)
@@ -488,13 +488,19 @@ class QuickAdapterV3(IStrategy):
         current_natr = df["natr_label_period_candles"].iloc[-1]
         if isna(current_natr):
             return None
-        return (
+        trade_take_profit_distance = (
+            trade.open_rate * entry_natr * self.trailing_stoploss_natr_ratio
+        )
+        return max(
+            trade_take_profit_distance,
             geometric_mean(
-                [trade.open_rate * entry_natr, 0.5 * current_rate * current_natr]
+                [
+                    trade_take_profit_distance,
+                    current_rate * current_natr * self.trailing_stoploss_natr_ratio,
+                ]
             )
-            * self.trailing_stoploss_natr_ratio
             * math.log10(9 + trade_duration_candles)
-            * self.reward_risk_ratio
+            * self.reward_risk_ratio,
         )
 
     def custom_stoploss(