Update app.py

app.py

@@ -828,16 +828,16 @@ def calculate_new_features(df):
     df['close'] = df['Close']
     
     # 2. return_t-1 — 前一日報酬率 (***FIXED: Corrected to use hyphen to match the model***)
-    df['return-t-1'] = df['Close'].pct_change()
+    df['return_t-1'] = df['Close'].pct_change()
     
     # 3. return_t-5 — 過去 5 日累積報酬率 (***FIXED: Corrected to use hyphen to match the model***)
-    df['return-t-5'] = (df['Close'] / df['Close'].shift(5) - 1)
+    df['return_t-5'] = (df['Close'] / df['Close'].shift(5) - 1)
     
     # 4. MA5_close — 5 日移動平均價
     df['MA5_close'] = df['Close'].rolling(window=5).mean()
     
     # 5. volatility_5d — 5 日報酬標準差（短期波動）
-    df['volatility_5d'] = df['return-t-1'].rolling(window=5).std()
+    df['volatility_5d'] = df['return_t-1'].rolling(window=5).std()
     
     # 6. volume_ratio_5d — 今日成交量 ÷ 5 日均量
     df['volume_5d_avg'] = df['Volume'].rolling(window=5).mean()
@@ -851,10 +851,10 @@ def calculate_new_features(df):
     df['MACD_diff'] = macd_line - signal_line
     
     # 8. dji_return_t-1 — 前一日道瓊指數報酬率（預設為0，需外部數據）
-    df['dji_return-t-1'] = 0.0
+    df['dji_return_t-1'] = 0.0
     
     # 9. sox_return_t-1 — 前一日費半指數報酬率（預設為0，需外部數據）
-    df['sox_return-t-1'] = 0.0
+    df['sox_return_t-1'] = 0.0
     
     # 10. NEWS — 新聞情緒分數（預設為0，需外部數據）
     df['NEWS'] = 0.0
@@ -890,7 +890,7 @@ def calculate_new_features(df):
         df['ADX'] = 25.0
     
     # 14. volume_weighted_return — 成交量加權報酬率
-    df['volume_weighted_return'] = np.abs(df['return-t-1']) * df['Volume']
+    df['volume_weighted_return'] = np.abs(df['return_t-1']) * df['Volume']
     
     # 移除輔助欄位
     auxiliary_columns = ['volume_5d_avg', 'up_move', 'down_move', '+DM', '-DM', 'TR', '+DI', '-DI', 'DX']