Update app.py

app.py

@@ -550,50 +550,56 @@ def generate_risk_matrix():
 
 # 🥊 Battle Strategies (Preset vs Preset)
 
-def battle_strategies(style1, style2, enable_fatigue, fatigue_level, enable_trump, trump_vol_level):
+def battle_strategies(
+    style1, enable_fatigue1, fatigue1, enable_trump1, trump1,
+    style2, enable_fatigue2, fatigue2, enable_trump2, trump2
+):
     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
+    fatigue_a = fatigue1 if enable_fatigue1 else 0.0
+    trump_a = trump1 if enable_trump1 else 0.0
+    fatigue_b = fatigue2 if enable_fatigue2 else 0.0
+    trump_b = trump2 if enable_trump2 else 0.0
 
     try:
-        config1 = strategy_presets[style1].copy()
-        config2 = strategy_presets[style2].copy()
+        config1 = strategy_presets[style1]
+        config2 = strategy_presets[style2]
 
         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
+            config1["base_risk_pct"], config1["profit_target"], fatigue_a, trump_a
         )
 
         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
+            config2["base_risk_pct"], config2["profit_target"], fatigue_b, trump_b
         )
 
         s1["Strategy"], s2["Strategy"] = style1, style2
-        comparison_df = pd.DataFrame([s1, s2])[["Strategy", "Final Balance", "Sharpe Ratio", "EdgeCast Score", "Max Drawdown %"]]
+        df_compare = 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]]
+            best_val = df_compare[col].astype(float).max()
+            df_compare[col] = [f"{val} 🏆" if float(val) == best_val else val for val in df_compare[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
+        return df_compare, fig
 
     except Exception as e:
         return pd.DataFrame([{"Error": str(e)}]), go.Figure()
 
 
+
 # 🚀 App UI Launch
 
 app = gr.TabbedInterface(
@@ -660,24 +666,26 @@ app = gr.TabbedInterface(
 
         # 🥊 Battle Mode – Preset
 
-        gr.Interface(
+       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")
+        gr.Dropdown(choices=["None"] + list(strategy_presets.keys()), value="None", label="Strategy A"),
+        gr.Checkbox(label="Enable Fatigue for A"),
+        gr.Slider(0, 1, 0.0, step=0.1, label="Fatigue Level A"),
+        gr.Checkbox(label="Enable Trump Volatility for A"),
+        gr.Slider(0, 1, 0.0, step=0.1, label="Trump Volatility A"),
+
+        gr.Dropdown(choices=["None"] + list(strategy_presets.keys()), value="None", label="Strategy B"),
+        gr.Checkbox(label="Enable Fatigue for B"),
+        gr.Slider(0, 1, 0.0, step=0.1, label="Fatigue Level B"),
+        gr.Checkbox(label="Enable Trump Volatility for B"),
+        gr.Slider(0, 1, 0.0, step=0.1, label="Trump Volatility B"),
     ],
     outputs=["dataframe", gr.Plot()],
     title="🥊 Battle Mode"
 ),
 
 
-
-
-
         # 🧪 Manual Battle Mode
 
         # 🧪 Manual Battle Mode (Slider Version)