Update app.py

app.py

@@ -23,7 +23,7 @@ warnings.filterwarnings('ignore')
 # 引用您組員的預測器程式
 from Bert_predict import BertPredictor
 
-# 引用新的模型預測器
+# 引用新的模型預測器 (已修正特徵欄位)
 from model_predictor import XGBoostModel
 # ========================== 引用外部模組 END ==========================
 # ========================= 新增：交易回測模組 START =========================
@@ -418,45 +418,35 @@ class TradingBacktester:
             buy_trades = trades_df[trades_df['signal'] == 1]
             sell_trades = trades_df[trades_df['signal'] == -1]
             
-            if not buy_trades.empty:
-                fig.add_trace(
-                    go.Scatter(
-                        x=buy_trades['date'],
-                        y=buy_trades['price'],
-                        mode='markers',
-                        name='買入',
-                        marker=dict(color='red', size=8, symbol='triangle-up')
-                    ),
-                    row=3, col=1
-                )
-                
-            if not sell_trades.empty:
-                fig.add_trace(
-                    go.Scatter(
-                        x=sell_trades['date'],
-                        y=sell_trades['price'],
-                        mode='markers',
-                        name='賣出',
-                        marker=dict(color='green', size=8, symbol='triangle-down')
-                    ),
-                    row=3, col=1
-                )
+            fig.add_trace(
+                go.Scatter(
+                    x=buy_trades['date'],
+                    y=[stock_data.loc[d, 'Close'] for d in buy_trades['date']],
+                    mode='markers',
+                    name='買入點',
+                    marker=dict(color='green', size=10, symbol='triangle-up')
+                ),
+                row=3, col=1
+            )
+            
+            fig.add_trace(
+                go.Scatter(
+                    x=sell_trades['date'],
+                    y=[stock_data.loc[d, 'Close'] for d in sell_trades['date']],
+                    mode='markers',
+                    name='賣出點',
+                    marker=dict(color='red', size=10, symbol='triangle-down')
+                ),
+                row=3, col=1
+            )
         
-        # 更新布局
         fig.update_layout(
-            title=f"交易策略回測結果",
+            title='交易回測結果',
             height=800,
-            showlegend=True,
-            xaxis3_title="日期"
+            showlegend=True
         )
-        
-        fig.update_yaxes(title_text="價值 (TWD)", row=1, col=1)
-        fig.update_yaxes(title_text="股數", row=2, col=1)
-        fig.update_yaxes(title_text="股價 (TWD)", row=3, col=1)
-        
         return fig
 
-
 def create_backtest_summary_card(results):
     """創建回測摘要卡片"""
     if not results: