diff --git a/.DS_Store b/.DS_Store index 7a1612e..ff8aab1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 68bc17f..0d95733 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ +.DS_Store +.DS_Store diff --git a/web/app.py b/web/app.py index f57496b..b13ba71 100644 --- a/web/app.py +++ b/web/app.py @@ -325,10 +325,10 @@ def add_indicators(df): def calculate_macd(df): """计算MACD指标""" - exp1 = df['close'].ewm(span=24, adjust=False).mean() - exp2 = df['close'].ewm(span=52, adjust=False).mean() + exp1 = df['close'].ewm(span=12, adjust=False).mean() + exp2 = df['close'].ewm(span=26, adjust=False).mean() macd = exp1 - exp2 - signal = macd.ewm(span=18, adjust=False).mean() + signal = macd.ewm(span=9, adjust=False).mean() histogram = macd - signal return {