Add XAU/USD oversold-bounce strategy (79.7% WR, PF 2.06)
BUY-only strategy for gold: enters when M15 RSI drops below oversold threshold while price remains above EMA200 on all three timeframes (M15, H1, H4). Uses ATR-based TP/SL (0.7x/2.0x) sized from M15 ATR. Isolated to XAU/USD only — other pairs completely unaffected.
This commit is contained in:
+122
-1
@@ -331,8 +331,25 @@ class SignalAggregator:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# ── 6c. XAU/USD oversold bounce strategy ─────────────────
|
||||
if report.display_name == "XAU/USD" and self.config.xau_strategy.enabled:
|
||||
if self._check_xau_oversold_bounce(report, dfs):
|
||||
report.final_signal = SignalStrength.STRONG_BUY
|
||||
report.final_score = 50.0
|
||||
report.final_confidence = 85.0
|
||||
report.signal_quality = "A+"
|
||||
report.action_recommendation = (
|
||||
"STRONG BUY — XAU oversold bounce "
|
||||
"(RSI<30 + M15/H1/H4 all above EMA200)"
|
||||
)
|
||||
report.bullish_reasons.insert(
|
||||
0,
|
||||
"XAU STRATEGY: M15 RSI oversold + triple-TF bullish trend confirmation",
|
||||
)
|
||||
report.trade_setup = self._generate_xau_trade_setup(report, dfs)
|
||||
|
||||
# ── 7. Trade setup for actionable signals ──────────────────
|
||||
if report.signal_quality in ("A+", "A", "B", "C"):
|
||||
if report.trade_setup is None and report.signal_quality in ("A+", "A", "B", "C"):
|
||||
is_sell_direction = (
|
||||
report.final_signal in (SignalStrength.SELL, SignalStrength.STRONG_SELL)
|
||||
or (report.final_signal == SignalStrength.NEUTRAL and report.final_score < 0)
|
||||
@@ -359,6 +376,110 @@ class SignalAggregator:
|
||||
0/4 trades won even under best conditions (trending_down + MTF + ADX>=25 + RSI<=50)."""
|
||||
return False
|
||||
|
||||
def _check_xau_oversold_bounce(
|
||||
self, report: SignalReport, dfs: Dict[Timeframe, pd.DataFrame]
|
||||
) -> bool:
|
||||
"""Return True when XAU/USD oversold-bounce conditions are met.
|
||||
|
||||
Conditions (all must be true):
|
||||
1. M15 RSI(14) < 30
|
||||
2. M15 price > M15 EMA(200)
|
||||
3. H1 price > H1 EMA(200)
|
||||
4. H4 price > H4 EMA(200)
|
||||
5. Current bar hour not in blocked list
|
||||
"""
|
||||
cfg = self.config.xau_strategy
|
||||
|
||||
try:
|
||||
bar_hour = pd.Timestamp(report.timestamp).hour
|
||||
if bar_hour in cfg.blocked_hours_utc:
|
||||
return False
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
m15_analysis = None
|
||||
h4_analysis = None
|
||||
for ca in report.confirmation_analyses:
|
||||
if ca.timeframe == Timeframe.M15.value:
|
||||
m15_analysis = ca
|
||||
elif ca.timeframe == Timeframe.H4.value:
|
||||
h4_analysis = ca
|
||||
|
||||
h1_analysis = report.primary_analysis
|
||||
|
||||
if not m15_analysis or not h1_analysis or not h4_analysis:
|
||||
return False
|
||||
|
||||
m15_rsi = m15_analysis.indicators.get("rsi")
|
||||
if not m15_rsi or m15_rsi.value >= cfg.rsi_entry_threshold:
|
||||
return False
|
||||
|
||||
m15_ema200 = m15_analysis.key_levels.get("ema_trend")
|
||||
m15_df = dfs.get(Timeframe.M15)
|
||||
if m15_df is None or m15_ema200 is None:
|
||||
return False
|
||||
m15_price = float(m15_df["Close"].iloc[-1])
|
||||
if m15_price <= m15_ema200:
|
||||
return False
|
||||
|
||||
h1_ema200 = h1_analysis.key_levels.get("ema_trend")
|
||||
if h1_ema200 is None or report.current_price <= h1_ema200:
|
||||
return False
|
||||
|
||||
h4_ema200 = h4_analysis.key_levels.get("ema_trend")
|
||||
h4_df = dfs.get(Timeframe.H4)
|
||||
if h4_df is None or h4_ema200 is None:
|
||||
return False
|
||||
h4_price = float(h4_df["Close"].iloc[-1])
|
||||
if h4_price <= h4_ema200:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
def _generate_xau_trade_setup(
|
||||
self, report: SignalReport, dfs: Dict[Timeframe, pd.DataFrame]
|
||||
) -> Optional[TradeSetup]:
|
||||
"""Generate XAU-specific trade setup with backtested TP/SL."""
|
||||
cfg = self.config.xau_strategy
|
||||
|
||||
m15_analysis = None
|
||||
for ca in report.confirmation_analyses:
|
||||
if ca.timeframe == Timeframe.M15.value:
|
||||
m15_analysis = ca
|
||||
break
|
||||
|
||||
if not m15_analysis:
|
||||
return None
|
||||
|
||||
atr = m15_analysis.key_levels.get("atr", 0)
|
||||
if atr <= 0:
|
||||
return None
|
||||
|
||||
price = report.current_price
|
||||
pip_value = 0.10
|
||||
|
||||
tp1 = price + cfg.tp_atr_multiplier * atr
|
||||
sl = price - cfg.sl_atr_multiplier * atr
|
||||
tp2 = price + cfg.tp_atr_multiplier * 2.0 * atr
|
||||
|
||||
sl_distance = price - sl
|
||||
tp_distance = tp1 - price
|
||||
rr = tp_distance / sl_distance if sl_distance > 0 else 0
|
||||
|
||||
return TradeSetup(
|
||||
pair=report.symbol,
|
||||
display_name=report.display_name,
|
||||
direction="BUY",
|
||||
entry_price=price,
|
||||
stop_loss=round(sl, 2),
|
||||
take_profit_1=round(tp1, 2),
|
||||
take_profit_2=round(tp2, 2),
|
||||
risk_reward=round(rr, 2),
|
||||
risk_pips=round(sl_distance / pip_value, 1),
|
||||
reward_pips=round(tp_distance / pip_value, 1),
|
||||
pip_value=pip_value,
|
||||
)
|
||||
|
||||
def _check_mtf_agreement(self, report: SignalReport) -> bool:
|
||||
signals = list(report.mtf_signals.values())
|
||||
if len(signals) < 2:
|
||||
|
||||
Reference in New Issue
Block a user