From 0a22d1fe3476d0b3f26bf8cdc12e2bc9de603b82 Mon Sep 17 00:00:00 2001 From: jackyu66git Date: Fri, 24 Oct 2025 23:32:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86macd=E6=95=B0?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 8196 -> 10244 bytes .gitignore | 2 ++ web/app.py | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.DS_Store b/.DS_Store index 7a1612e08b0b3e9d1674ae638acd6cc38b085278..ff8aab1687d3ec74526813d00b5eca022b42cf53 100644 GIT binary patch literal 10244 zcmeHMYiu0V6+UO<*fV2?Ou!DC5Qi-$Dm8g{<2;q5ti2A%c@W2IV<#b9@9s?Pf!&$y z&OR_sTK_=MRuIu2vBs31a{LaX*iAAv%Dps1}>TJw5n97)S1=HnS0MU_xtADbMM?c3jjD+GNJ$x08r>;QtzNklY{Bmx!?$SHTy^+ z`9pR(n#ef0`~u6MB8Wf`fgl1w1cC?z5%^z;0KK!>p|lGbT!RP%5eOnsivXJ+B6Knt z^W?mceCnVJ-vW?qp=y56z0Ph(Mm!nwhm-8Zv(i8JOSDvNxwYILIzTF&Vb2kWEKFk@x?7=PCZwqp83b; z-ejB>X*cK88UAZ)nJ>WOjBf}A!Sb_v`}JzQ%q4a@I`iTQ&V~EP$c;K5j+nhV2&Y6* zNl-kp^cw+(ddK$n55W23guSS(%;&dTYJ9F?UysheWAEb)e_-)ZAx?dmBBlq4vBB8; zqt({i+)C!Ub!uBRc1_xoBYAC0Kfeg$rw~5}a**cHG@;;Umw2d|jm+)z#m!Z23)+&I zUCYkTYo76H^?2ooo$cpj{-jYa^VxT{)~~)cWG;)@_<3AlJlbH0dap?50Oj1UpUG!` zw$MW6^6Nm~J_4jYxu|5*rzVqbz$Xv9)FG_{z&aEd;s!CVSrd^}S z`?ERQd5p29wTHJxfn}mxyPl#u>7fialT8yzrkASaxZ|61YJ=7-$3-MUSF4eDw;Bmm zYY&f&YZH@J#<3IDgJx1+?oud*sW?(F%M^l%jFT`oTV z2a4?OsOuDpac-E@^^$9jnq+5{%^|WT*XvnJhw??svE6&jf=jX|*2kWMW`P$vx>n!Z zbK8c^+jkG#x$o{v%dT6luee^*j#5nRqV;LZER0tyqd0RUaIF=KlQtC-K0eo-B8D~skE6DRa>-eioRc+ zD2oRal{>Xv$_iYsPSSVo96gRJsy`WyDf&g_Qw;k+$}Jwsn|75|JiJ%YzoQ&=XHo_8 zP=!)Y_{77*io!dH>Y3AC!zwxj{^pCj7QpStoCwjZP^$-m-QQWwxTho`&FjBd1e=il$D{SAPX?hC{DD~2+8^bHL zJ=z^Ajba_R>A)a0#72kmpJ(YgcoANP3-Eo)()TGpKY%L;*oqyv64zn`d+=6VM_Jj2 zn<+E5@XQ>*L5$-8%FYp&vy`DH@FYHrkKh;Zi})x$fnUMX z_#{4sPvcq2*RMBZB3m#^2fj)LDHG*a;x7w!^2{mzO7vOO7h26Ntt+oLw|JQo;oFmGU)1q%g&24m89Q}fZBbv-)=?K~eRz188l_e%Y%wUW znY=0=1?BwVy0J`Q-P4aebJrC<7(G9^(-&%e6x1_}LI{pR!iNS=(tqfpUdDQMetWg6 zxsQz0sPo~#Wrp)%9ZLjIgnj?tyZHbA9~PYeCx}20fsY^p*fNwD8YJNAYP*pGd-Fu- zoT8H*%x+#t?m`#-aw5q;$5VlQj=zmgX6tPX`F+f*n-`M1lMQz#DZb|a*Z&L%_W!~D J|Nngd|4$CCn1}!X delta 285 zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8FDWo2aKK%mtDM@);P?lgf(=l5+BsHYP4* z-^|Xz!okQjd5OsH&3i@Xu}c#KbFt%n-H&H;{G(Ica0!cjn3bDuEn82Z0>Q SFgc!Q>gLUoD;TM7{Y3ybwn_m2 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 {