Update app.py

app.py

@@ -176,10 +176,10 @@ def calculate_technical_indicators(df):
     high_max_14 = df['High'].rolling(window=14).max()
     df['Williams_R'] = -100 * (high_max_14 - df['Close']) / (high_max_14 - low_min_14)
 
-    # DMI (Directional Movement Index)
+    # --- DMI (Directional Movement Index) - 已修正的計算邏輯 ---
     # 計算正向運動 (+DM) 和負向運動 (-DM)
-    df['up_move'] = df['High'].diff()
-    df['down_move'] = df['Low'].diff()
+    df['up_move'] = df['High'] - df['High'].shift(1)
+    df['down_move'] = df['Low'].shift(1) - df['Low'] # 修正：將當日低點與前日低點作差
     df['+DM'] = np.where((df['up_move'] > df['down_move']) & (df['up_move'] > 0), df['up_move'], 0)
     df['-DM'] = np.where((df['down_move'] > df['up_move']) & (df['down_move'] > 0), df['down_move'], 0)
 
@@ -187,12 +187,12 @@ def calculate_technical_indicators(df):
     df['TR'] = np.max([df['High'] - df['Low'], abs(df['High'] - df['Close'].shift(1)), abs(df['Low'] - df['Close'].shift(1))], axis=0)
 
     # 計算平滑後的 +DM, -DM, TR (通常使用 14 天)
-    df['+DI'] = df['+DM'].ewm(alpha=1/14, adjust=False).mean() / df['TR'].ewm(alpha=1/14, adjust=False).mean() * 100
-    df['-DI'] = df['-DM'].ewm(alpha=1/14, adjust=False).mean() / df['TR'].ewm(alpha=1/14, adjust=False).mean() * 100
+    df['+DI'] = (df['+DM'].ewm(com=13, adjust=False).mean() / df['TR'].ewm(com=13, adjust=False).mean()) * 100
+    df['-DI'] = (df['-DM'].ewm(com=13, adjust=False).mean() / df['TR'].ewm(com=13, adjust=False).mean()) * 100
 
     # 計算 ADX
     df['DX'] = abs(df['+DI'] - df['-DI']) / (df['+DI'] + df['-DI']) * 100
-    df['ADX'] = df['DX'].ewm(alpha=1/14, adjust=False).mean()
+    df['ADX'] = df['DX'].ewm(com=13, adjust=False).mean()
 
     return df