From e1866758b717991ae2f63bb320b705e8f785eab1 Mon Sep 17 00:00:00 2001 From: gitea Date: Thu, 18 Jul 2024 16:50:50 +0800 Subject: [PATCH] change x-axis content --- .../durable/durable_data_current.xlsx | Bin 6104 -> 5623 bytes .../durable/durable_data_current_max.xlsx | Bin 5758 -> 5578 bytes aio/code/durable_action/factory_test.py | 18 +++++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/aio/assets/templates/durable/durable_data_current.xlsx b/aio/assets/templates/durable/durable_data_current.xlsx index 0cb184a948742e0cb38ceebcc63d3187925432fb..7a7f763507aa7a181777b344fe44aecace7d5726 100644 GIT binary patch delta 1624 zcmZ8hdpOg39R6)aBWx~HW*u}+#*$0K^tfb^+-8_kE2$7C=4ewc$42B5sZ8RyL@t?I zPZ3%?D?&F$Mwv51LPmAAhSE5k=izkD_n*)6d7t<5em?K_kN2(d!cIkks|-XP001ap zlzd&W4r-Jv@{K-q40XK?O`mCvbE737;U&Y3dM29AP<|{lHVx2Xho9>|19ye7xx%g$%Z%Bb8p%^|c zXL!%zk3AV}-0sea8guMUeoDArf_-ta;RBQo=UnrBw~=H!t%?A>6gq)J6f7KJ7c@6} zD&M^d8g>l;l}>hK_hc5}CYrG$x{?@iX(Wfb8huG!Y;>?BAxJ)?l_g)auLp zb%1|1XxxpU8<3Dk70?p!PZ~!9Zd51#-q;?2iRc{itNs>C*>}RS6@PYXz}?B}5cYAFJU`H+j`GZvLKe-mRCPx*Enl$? zevx9(evN&O5?1r3+P0hG6Zgq@89O_8lI~q$VjRXkFenw1i`+cFxJEXKI9*l358g|8 z^THD^t53?XmSTI5Vj_Y*l|r9yAcYTBCt3xCJ1&*8mdUobj{aSjYr5x$S**Gl+d10O zYxY*#xPt;E4oB)27be7uKZ<#A!yO}XVHdQek)K7TLKV&n+JsVG-aIuHS(v9s_Bd_U zKQR~5_sTpn_NcX)yP&9(A7a07JmUm(8ymj2rgsHR6QGAj`6K7)!?-s^@$&wvx!{Va zZuyQ*!YgFUUpP~^LN1_}VBjA!Qb6e2in%X$$FCBa1lEgp_E*R)vP2WDlP}jkc}n_V zD#zRyckbvS{)u;NA)?CuW%}%{aG51?U2nt_A45#!-9Y`~$ueFB)8ag4vYbc%5q0Sz zG7B*xuW}uP3CIoX{rF3Z74sl=Af>kl5&IA&Nz_$`?!a9l7#HXFV4R-fyQEY|xr{#C zB}t*gZ=WTfYo02FqG@k*DnoTPnB*$dQ(BH1n+oUdg)1bfmf$M4^txL{!cN(7(*$%| zXq7fp7MDiQ)BeZ}*M$tglfWeomGBu^YQKA6(py;cOq0sR87MA+u$>5% zfLR|Zyl}HAHWHG&{R2qJK7AETQVfVs^|sQT-+$}dTvBn&MS@N?6oG4vC$pGk@TD;i zX%3FyZohu-0!+xPrW4liI-KX>4Sdyy&-Cj)nK4+z;^VA`6x3ym;>OmJ+IH0#kKm{b zFvoM$UcuTq!O38ybf}j(L^$seOpMxasAPlq3CUMON^~}S?Dw!q?OaGYAc1b2+e`Ph zx&6JU7w`NvyG$j`yX_q|NZvJ%z4_yGwv(<>bc1t9+jji-un4F6X003(WJiJ6gtxdf zky-IekSFT;wfiQSUpocZ3)Jju=1K=f)XJINAy{zg-Ojf!HUsI$k3tyy-R2OU)efT&Po3N<=3kYW@S7D{jhfz^TaoM-fD zpumPO#wQKUwG|3mP+$a{p}%FD&YG;5@ExmmRci?Z0LXRC)fx{vr@{zVLn;4H?CR?H RVO2)$mK}1XtEmY9e*^x9(-Qyy delta 2101 zcmY+Fdpy(oAIHDj7_v>vmbpaalFdexLoAi$e&q6trMX{GbyZd(CT}qw!_%?h+fu{Vb(~xkrd-r} z@mhSj>93k#lwqo67PD7eBP}au$w4nf#fxIoZF}B5F_%~SMlEC%P0@ZYt>R4fMq9`6 z9jx1k#7Ax~jGC|1XzG_^FKvNDMqkn}ofkafh#l+q_IxE=I|@_P*CA3nt&{yn-p1&p zV;e$lggtN$h~_r68B6Y+)A4`&#q{8S29N8Dc?CYwQAYC){PFekDHa_HY-qWXF=*?nTyh(WfVo>CsWwLnFQ9DkU*alUnd+kd(DIi=&70s5U04S~5Xj&wLz) zwU6U-cSs-;mh4MBJdJ#Ien6)fWV%A{pQwtt#ap<|Pc_J>tG4Ib5Pq3lNGV(CX-%PN z%XpzH4+BeBD)c+wK6~>%2gDTAtuA)oe9Iq?O$}{2YPUyadf>O^NhJlbWv;+ z+vlF~VE*$^&5Jqj@u$+o+KFl|D2X;oEB5A1%f3y`WD0KmJCHE*X61dd-MNVXTFfY^ zXl`qE#0ksEM=AbN&*_Nsnt>&DYc<+0&ImsC50pE$@?U9MLY@cILfi6^+FQ?SE?&{; zUmYwB3K^8G1;>Yw=f0Zl*;R9nR>;EmwA;OOgH?~}L@Wg3&TYM^pl7N=VjaKyD{Zym zfNG%Ekhfucb2z!9juDLJe~K));-%(^H7+3KhmdyF1d*TBWd$$penFbZ-dT#m>A6@` zV0_GK!pL29XN$utULMMK&f0?v$9TeU7$5VR5HhjH+*79a+^{S2azoC}Of(Fq?z5|g z6;ZVF3{t`faV1$hp!l0IZ@{W)7@xyjxBSPK=bh_!RM_sw3YO=)WFCQ4-#u!GrI0e% zgQ}hvkX>~bgAMrD%>F(TRrwG%gr2bq$p>0RKy1}Au_njWu`WDp(cgODEKKWu;@%2ufwgcL zM49~wk1Mc0>=goF3i#cRE(wZk1zVv$n1cEVLzLJ?M4=OyV)zqgDzP2+2~UA3RzF}` zwdRgZ?BjOAYYfl14yf^LnG(2>ot@~Kb*TXgoGcYNC^<_$^gll~0m`@RC>G-vchnX* z1gVpc=Og{1qC5hq>3wf5?(y4;&n>_D*TYiZgUM}ZNn%>0vZRn6R&16At;lgu?nt3F zf~YyS9cK&vrGU-`l^y{3U3-snYMQ5c2JNpcm34clI5&wvWx0^5`*4@*4{=_(mdA3t zcP841=|WTar^DSiV@Q;|QBFyHted}i?k>h1PEJLJHud`QIS&p}l#j3K_LJIIOpXi% zUGP)vd;);r1HIU6Y-PrNlN{m+xJ#FzZ|3^OL0yP=T0DmI@r%+e8WK0sHccx(Ponnc z(4Q?iMv@u6quZT(GY7{lW!9X?ZTgF5wTQjVI!>Y6W`Oy7a09CS0lBRCbYJ#*9 z>(rEWvil_7&GuL65!I-W@~&HR0dl*A>HCQyk-b!9wrK4A#U7gLh8lL2BZL`|&LZAx zU-cy4`J2I_mYHMsi5myglQh6HYAyGw=$VbW1Ss7VQ-y6^_C&lV%FUexq>_m8*b2@whH>WqhQR@9qIPZks!i*1;KKk$8WxJdDzC#LM_ z_zW9vHjk!7)N5w%?d-qOjKO={=@Z$nU&uYF+)Ob!u3g=4Om{hrex<`g`B=A?%0kq( z7|0TN3Uq2DR-#*^siP89{6}ZlY;x~(?2T12iUwcdPU!q5=nEMg8P^{?u}u0>_L#8N zhH1UK@Jf5MHTWaq!_7Qu!hozE`0x1v_|5F)$t|xX^hZ74e#{SU1WX79lg}`%R6eX1 zuI}bzpbeRd9N&s4+4AF|9v)n7JR2q-(m&pE?PL0J(u(2^`q=`I)msLB8U zU(f09D-C3W0Dz=ZrU{A3r@|8mNz_vwt{^Z9_#WoWS(FwSj$|Ux>KjKGqqV>?B-0VS zZTp6;#pHPF{dKPu5CCX=_gt@OAa7OXRiqa4HX61u##tY;LNQ;W4WQ}hjlO>XIQ75i diff --git a/aio/assets/templates/durable/durable_data_current_max.xlsx b/aio/assets/templates/durable/durable_data_current_max.xlsx index f408976aa53d1ad5ed053585cd5276d6301247a7..a9e1e5f410ff525257c8b868dd29dce0629e74c0 100644 GIT binary patch delta 1583 zcmY+EdpOg39LIl~`;sk8D?8!n7@Ccf+-jB;DmKH!np7@NheBtTOEo{DMMN2?SWKlz zF4dZ>&YUjj;!;`{ODmajiOB5;JJxfO^ZDcZc|Mot{k*@QKVGxgN2|1{9xAH(003wL zIL=A!N=+PRBp@L;5PkA42JE}Dzk^IIsmLc6t|tZSrZKwX8LsVa>E0qC#)_eF*syU@ zG5vb0zEe8y5=Q1Y66hPCeKR~|qmYvIgaTDvmm@LB*l2i<{qbtg?_L1;T^%qt?J{Bpugz&*bYl6Bd8_vIDc=L9H$R=!;>O+ise|OGpti808?Sm`{ zxY%Xa{FrAh@1q#VrJtsrg2;}R=ijD`8ZwG~zVyq=y%zp{B;ZV7p(#Qg017bxpa%fg zKSFTopzG5|o$9V>n>J}#QMC+3f^Fjfryd$PgBNABgl?vEhBU(h+wqwQJYPMsUWi*&S=E_^^_=23*KUkfxSn6?pDMpWEj~zqr-Pf=2wu{CcDFql(vR zH}<2CZQ)5vobk)|zfl8EXl!oZ73v@#B5h~%kCk|R4SXs4mO_M!c1mQqmY^hKuI34b&P+8|CH1piXeuIXW0oh>yid%&wbrWkjRM-T#8~{46r(Vr^R_w9_*P5 z&ZOUZ4Cs|#XKt2NWt4h}WPgp~IbKH3;w~-yI7??s$d_Cv5)M>}UP-BO6Hkqf;*ET> z<1H2R8==7iz2hhzDn!^=0;by}9>ktQ=?NQi(rpqBV)r-R9TcI&2&Y67RxL?UG|3jf zQO@(@7El5BROPXlI`nm4;{Ep@IK2u#m^>`g?GI44Z? zHRalMy%o%j1FW*5tYQ|hjFd$+&RzYfbTv8Um50NyNF8(uQ!&}lv;>yQRPSV!G7$%@ zFp0g!m-icoYC4jVsV&6?Ei8C2zVCjtk*Wlqs%_$Kj(D_;)qX~oH1L2oWtCdI{O}2r zZcR0kV@i~huUp!kCSUP!1kD}sdn%g0-h6i(dG{8rnxzN(gt~_#w0_$1bTk<+@d9UJ zNmPPM6M~rvx4^L*ODmm7jdhYR$);TxVQbnc+sD(REoM)1+zQOcijsYg zoGQrOds(sajbZu=I{I7dy&2=2mGl8ZUR%etA&@({Dmo}5Mr1CjDG0QB*=ZV?_<302 z)P@}kdvz$WQc!v2y?nD=Lo$kCC06VqtQZyBWDYX^fC9jxx%?xNAPOA-*uf0j8-vFwU#bTLst^1?JGUB%hJJ!`TadpfH9ya3x^iI# i7Dh_V0uCwF5CQ-%=MXo?z4=IjSaN*~%+zDQH~$4z6usX7 delta 1736 zcmY+Fc~DbV6vkf`BtQyDcz{4`00EUHAXs7)2-UENEV6~DU|ubyvIS)kS@a1;f>05O z#85T?(Sn$2!LSNMKo-F$h-t*Iv-nlbpzBy-p=ic+j`T8wCSYdbV zM4>?d05AYE=`2==VJ6Ko4UWy&pS`sX?!TEhdfLx5lx*Zo>nHi> zF#jq_9MkjH(t?a(p(KpDNXqBIU;RUrLUskc9j_X0gE0BBcSfK|x97AtY#!{ie=d$% zxR;t?a_8Yh){XnM-+<=F9I|;s6Sc~+@>2Aw^vJje2RV*|leg?t^p;`-`GwEn%93iK zVu(#W)agcTb#iL+y0cDns@Bl7+~NcQ6~R7XU^Cm(CY*4;zGd(OId3;s+mz%K(?v}V z9h1kBI2OO`F9>Vcv5#GMqjkg6nlw^q`#YO$QiGPd;MEdjkhlyEV6FW9EVD4Acr9)f z02HqS0Br!Mn?{gV5tauMuutpB1vCJt8vwv+fCqsFa6zFwuE+y-lI2>ZYCB+y&C3tE zp-YqHT=g_7kVi$IwzkOM1&qoX#?v?3$}=l#W3g%Sf#UFExzOAm%J`!b8|BY>W{$99 zrCec4+UwRglaSAMsR673S$i{&QX8l3ftWymTn44s9(O{ zD-)){EsB)L8KL@AIF`Y>*l6i&uoVi7Dvw$Dk zB;PczsF@jIQ?wSv_ugF?%M6}wW3ZZU5A}EOaUW7NM+E ztWZ{}wSw>IfwtM|#ZVtz#RY^mK>83B>ULaP@nF3tRgBQCI=;Tczr(I0t|L3yjefH7 zr+aD)uRshP!AJ5Dd=z8A-o*1vMZGrB&d(qVxdOT=JG&Sfq`Q6w{mn1%IojPT5XPs&l~3ry4bqfZnt&6#ylP<4|CwOl@E)T z2;(02y7YvYM|8N+Jr7;)f*+e6no#Xi_KXZWtLz|Z>_a`egwejdS2_JQEb3wuh<^JO z=aJ|7LB_|k`Lq%r zg!|`BrlL@%{^;RIxZZcS*lopSjPq&wyGi{!&9b8E5Rrf5dEelPnxDgX={iKj7_U^ve3iv= G1K=NX75GR1 diff --git a/aio/code/durable_action/factory_test.py b/aio/code/durable_action/factory_test.py index cb6e157..3dc30e6 100644 --- a/aio/code/durable_action/factory_test.py +++ b/aio/code/durable_action/factory_test.py @@ -7,6 +7,7 @@ from time import sleep, time, strftime, localtime from pandas import DataFrame from openpyxl import load_workbook from math import sqrt +from numpy import power tab_name = 'Durable Action' count = 0 @@ -215,7 +216,6 @@ def get_durable_data(path, data, scenario_time, wait_time, rcs, hr, w2t): # f_obj.write(f"{_}\n") _d2d_trq = {0: [], 1: [], 2: [], 3: [], 4: [], 5: []} - _d2d_trq_max = {0: [], 1: [], 2: [], 3: [], 4: [], 5: []} for line in _data_list: for item in line['data']: @@ -225,14 +225,24 @@ def get_durable_data(path, data, scenario_time, wait_time, rcs, hr, w2t): _d2d_trq[i].extend(item['value']) if len(_d2d_trq[0]) / 1000 > scenario_time + 1: + this_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time())) + next_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time()+wait_time+10+scenario_time)).split()[-1] _df = DataFrame(_d2d_trq) for i in range(6): - _ = sqrt(100*_df[i].apply(lambda x: (rcs[i]*x/10000)**2).sum()/len(_df[i])) + try: + _ = sqrt(_df[i].apply(lambda x: power((rcs[i]*x/1000), 2)).sum()/len(_df[i])) + except: + _df.to_excel(path+"\\err_data.xlsx") + w2t(f"{i}calculate error", 0, 11, 'red', tab_name) del data[0][f"axis{i + 1}"][0] data[0][f"axis{i + 1}"].append(_) + del data[0]['time'][0] + data[0]['time'].append(next_time) _ = rcs[i] * _df[i].abs().max() / 1000 del data[1][f"axis{i + 1}"][0] data[1][f"axis{i + 1}"].append(_) + del data[1]['time'][0] + data[1]['time'].append(this_time.split()[-1]) _df_1 = DataFrame(data[0]) _df_2 = DataFrame(data[1]) @@ -247,13 +257,11 @@ def get_durable_data(path, data, scenario_time, wait_time, rcs, hr, w2t): sleep(1) global count count += 1 - this_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time())) - next_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time()+wait_time+10+scenario_time)).split()[-1] w2t(f"[{this_time}] 当前次数:{count:09d} | 预计下次数据更新时间:{next_time}", 0, 0, '#008B8B', tab_name) break else: with open(f'{path}\\device_servo_trq_feedback_0.txt', 'w', encoding='utf-8') as f_obj: - for _ in _d2d_trq['device_servo_trq_feedback_0']: + for _ in _d2d_trq[0]: f_obj.write(f"{_}\n") w2t("采集的数据时间长度不够,需要确认。", 0, 2, 'red', tab_name)