Update app.py

app.py

@@ -868,8 +868,6 @@ def calculate_new_features(df):
     # 3. MA5_close – 5 日移動平均價
     df['MA5_close'] = df['Close'].rolling(window=5).mean()
     
-    # 4. MA20_close – 20 日移動平均價  
-    df['MA20_close'] = df['Close'].rolling(window=20).mean()
     
     # 5. volatility_5d – 5 日報酬標準差（短期波動）
     df['volatility_5d'] = df['return_t-1'].rolling(window=5).std()
@@ -891,6 +889,27 @@ def calculate_new_features(df):
     macd_line = exp1 - exp2
     signal_line = macd_line.ewm(span=9).mean()
     df['MACD_diff'] = macd_line - signal_line
+
+    # 9. MACDvol
+    df['MACDvol'] = df['MACDvol']
+
+    # 10. RSI_14 – 14 日 RSI 指標 (如果原資料沒有RSI，需要計算)
+    if 'RSI' in df.columns:
+        df['RSI_14'] = df['RSI']  # 使用現有的RSI
+    else:
+        # 計算 RSI
+        delta = df['close'].diff()
+        gain = (delta.where(delta > 0, 0)).rolling(window=14).mean()
+        loss = (-delta.where(delta < 0, 0)).rolling(window=14).mean()
+        rs = gain / loss
+        df['RSI_14'] = 100 - (100 / (1 + rs))
+        
+    # 14. ADX
+    df['ADX'] = df['ADX']
+
+
+    # 15. 當日報酬率絕對值 × 當日成交量 (成交量加權報酬率)
+    df['volume_weighted_return'] = abs(df['return_t-1']) * df['volume']
     
     # 移除輔助欄位
     if 'volume_5d_avg' in df.columns:
@@ -943,6 +962,11 @@ def advanced_xgboost_predict(predict_days=5):
             'volatility_5d',
             'volume_ratio_5d',
             'MACD_diff',
+            'MACDvol',
+            'RSI_14',
+            'ADX',
+            'volume_weighted_return'
+            
         ]
         
         # 獲取美股報酬率