Update app.py

app.py

@@ -550,79 +550,49 @@ def generate_risk_matrix():
 
 # 🥊 Battle Strategies (Preset vs Preset)
 
-def battle_strategies(style1, style2):
-
+def battle_strategies(style1, style2, enable_fatigue, fatigue_level, enable_trump, trump_vol_level):
     if style1 == "None" or style2 == "None":
-
         return pd.DataFrame([{"⚠️ Error": "Please select two valid strategies."}]), go.Figure()
 
-
-
-
     if style1 == style2:
-
         return pd.DataFrame([{"⚠️ Error": "Please select two different strategies."}]), go.Figure()
 
-
-
+    fatigue = fatigue_level if enable_fatigue else 0.0
+    trump_vol = trump_vol_level if enable_trump else 0.0
 
     try:
+        config1 = strategy_presets[style1].copy()
+        config2 = strategy_presets[style2].copy()
 
-        df1, s1 = simulate_tp_strategy_full(**{k: v for k, v in strategy_presets[style1].items() if k != "description"})
-
-        df2, s2 = simulate_tp_strategy_full(**{k: v for k, v in strategy_presets[style2].items() if k != "description"})
-
-
-
-
-        s1["Strategy"] = style1
-
-        s2["Strategy"] = style2
-
-
-
-
-        comparison_df = pd.DataFrame([s1, s2])
-
-        comparison_df = comparison_df[["Strategy", "Final Balance", "Sharpe Ratio", "EdgeCast Score", "Max Drawdown %"]]
-
+        df1, s1 = simulate_tp_strategy_full(
+            config1["starting_balance"], config1["trades_min"], config1["trades_max"], config1["weeks"],
+            config1["tp1_prob"], config1["tp2_prob"], config1["tp1_r"], config1["tp2_r"],
+            config1["base_risk_pct"], config1["profit_target"], fatigue, trump_vol
+        )
 
+        df2, s2 = simulate_tp_strategy_full(
+            config2["starting_balance"], config2["trades_min"], config2["trades_max"], config2["weeks"],
+            config2["tp1_prob"], config2["tp2_prob"], config2["tp1_r"], config2["tp2_r"],
+            config2["base_risk_pct"], config2["profit_target"], fatigue, trump_vol
+        )
 
+        s1["Strategy"], s2["Strategy"] = style1, style2
+        comparison_df = pd.DataFrame([s1, s2])[["Strategy", "Final Balance", "Sharpe Ratio", "EdgeCast Score", "Max Drawdown %"]]
 
         for col in ["Final Balance", "Sharpe Ratio", "EdgeCast Score"]:
-
             best_val = comparison_df[col].astype(float).max()
-
-            comparison_df[col] = [
-
-                f"{val} 🏆" if float(val) == best_val else val for val in comparison_df[col]
-
-            ]
-
-
-
+            comparison_df[col] = [f"{val} 🏆" if float(val) == best_val else val for val in comparison_df[col]]
 
         fig = go.Figure()
-
         fig.add_trace(go.Scatter(x=df1["Week"], y=df1["End Balance"], name=style1))
-
         fig.add_trace(go.Scatter(x=df2["Week"], y=df2["End Balance"], name=style2))
-
         fig.update_layout(title=f"🥊 {style1} vs {style2}", xaxis_title="Week", yaxis_title="Balance")
 
-
-
-
         return comparison_df, fig
 
-
-
-
     except Exception as e:
-
         return pd.DataFrame([{"Error": str(e)}]), go.Figure()
 
-    
 
 # 🚀 App UI Launch
 
@@ -691,22 +661,19 @@ app = gr.TabbedInterface(
         # 🥊 Battle Mode – Preset
 
         gr.Interface(
+    fn=battle_strategies,
+    inputs=[
+        gr.Dropdown(choices=["None"] + list(strategy_presets.keys()), value="None", label="Strategy 1"),
+        gr.Dropdown(choices=["None"] + list(strategy_presets.keys()), value="None", label="Strategy 2"),
+        gr.Checkbox(label="Enable Fatigue"),
+        gr.Slider(0, 1, 0.0, step=0.1, label="Fatigue Level"),
+        gr.Checkbox(label="Enable Trump Volatility"),
+        gr.Slider(0, 1, 0.0, step=0.1, label="Trump Volatility Index")
+    ],
+    outputs=["dataframe", gr.Plot()],
+    title="🥊 Battle Mode"
+),
 
-            fn=battle_strategies,
-
-            inputs=[
-
-                gr.Dropdown(choices=["None"] + list(strategy_presets.keys()), value="None", label="Strategy 1"),
-
-                gr.Dropdown(choices=["None"] + list(strategy_presets.keys()), value="None", label="Strategy 2")
-
-            ],
-
-            outputs=["dataframe", gr.Plot()],
-
-            title="🥊 Battle Mode"
-
-        ),