From 9cf444c47e69a0c2e73773299029cfc63caeff27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Gauthier?= Date: Wed, 15 Jun 2022 16:27:56 +0200 Subject: [PATCH] osef test error --- Code-C/main | Bin 41632 -> 41640 bytes Code-C/main.c | 5 +++-- Code-C/power.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Code-C/main b/Code-C/main index a7621956ed14f17d53e56e87cac60e60efa9efa9..ba3c2e9ea63c687254272a0b4b4102c3ac980646 100755 GIT binary patch delta 1853 zcmY+Fdr(w$6vuzRyL(w)%UvESh_)&jDvu>tUNxwzAWK6NrW>H8I3mU5Oq0RDP9-S# z*jZPllSL{7PE(lup=}y2nK+FIy#~jTp_v@1G?ySj%n=g0eeYd0yMKH?=lp)>p7Y!D zJ9oC_ywG-D*uQ{#8x~#-)Ek-l=#3P{69XaxeQqS>@w1@?$v*EPDN5*wSd$#FwQKg7 zn=21Lb5LlDsGRElYQ5VlERv)@W-(@U>FZQv?Q+izTNYJQW_4v<_G8SObX}IM&YW?p zx~?dYw-Kk zVpf-J)auGXlP_9b(^Brq^27dL{RIbi*}T~H`nJ0#AKC82_E|Mw7k+J-WXxvFQkd_` zGGeAIFXTD;EVewy9m{HqW71}IB^a>0Du3Y=F2&!=Q{0}!H2!(gQbD(AONG6XF@Py(R45a%)pQpfgHnK4ZZ<3f?Z&{_$p&*n9ZND zP>#vg;=4HsJ`PU9Cz1_r1WUmdupZ34E6X2&)5mde&#gDRmtbO3snPC_H-GV~DLLF5XG%2e#kOyk@ke48$1hAkn6ox*axpRhYv=Z{;( z(p$KMBC==3a2+*eM)LtWotewW-TbMu8tTp}60|1wyu}S#!K@{VFx~y#vZiQmc9*Xk z;kr_>5E+iq`jY64r6GzfG~`Q%(RN-sYp?1qHMA=37U@mZEioKb+=}~dQK%;Y>v+<9 zU}5Eqm+5_}HZvBIq=YZmZNhdxT`7rvaru13)-<%$7&a+;*})$8LPLQe4j%x|33^%G zZm%&Y^UZVhGXPD)Qa>fLHNcm-D0C_wVR$S)urNF0#k6`u7I(Sd+3>C;J}UkFAB%nw<84YwJ<|tdD@vihOmY->C5KYmZprb)f_t+3 zuU%R&6T$ty`N-}Yr`Gs8jWphEU{jNFRY#%F- z9J8ij`1!mU;>Dv2C%VLmUTSGRUu0pn4^>$JOGx1dvD2d9hi&e_!|5G>;gStKbUk|mJJ$?oBO*g zCxh{KP>d27U*3`BZD6rSmRmu;Kd=EXyib-#K`R)BdbWcZpbh6;1onelz&Nx{16T&O zflc5QP=_`d1)ISz0iOwGfZ6E0B2e$OA_0s_w0Q$~0c->3qhYUt6=-cge~vo=P6wyp zjw}KU&-jhxU(ItVSNZsZ#*&2E&!^E7l71~XW zP?=6ZBj_6RQyNF)vlN-B*yc=A-@sTa2DrU zziNPK%Y;I#Zl>ar@R!Si6`ObFiJ#zjSXsnw)y+1vDDG=wrRtU#zEIqa58NW-{#h8u zGsg!mWIe}L2l-N!b6jw;5^mP6!E_g0D+ym|j!|rlv(;)?qs%P~JPMz8E;YpCqOhC^ zuc*^)R)ca6m?bC_&^WXGmCTFvzRX3&!32ciG5f%Uyveab$}i1gHrJlg_e3F2(Cb#X z;wyRu)=7bz`@$oVg|J~EXjnJ#m>_;D1RoV96bb>G1g6nb=$50b$8~Yb9j)v5wtR+~ zQONd0CXso2D091(Z`b;v-%4vXW2mQQ3GYQs-)`cS+Mc#w;8{I6>ylWPtD{cKSTmh- zq+=Uw_uC>r7(u%l69Yz+zb<%?_;ll9WYISz=^yVA*7benhr?vHt;tSFlw8 diff --git a/Code-C/main.c b/Code-C/main.c index 5d747ef..bdb297f 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -53,6 +53,8 @@ void *threadCalculBoth(void *vargp){ char* fileName; while(rawDataWriteFlag){ while(queueGetNextE(rawDataQueue) != NULL){ + + printf("ertyu\n"); rawDataQueue = queueGetNextE(rawDataQueue); fileName = queueGetTabChar(rawDataQueue); powerFunction(fileName, NULL); @@ -108,10 +110,9 @@ int main(int argc , char** argv){ period = 1 / freqEch; invTimeBandWidth = 1 /(nRow * period); firstRawDataQueue = queueCreateEmpty(); // change this for create empty - + pthread_t rawData; pthread_create(&rawData , NULL, threadSimulateFlux, (void *)&rawData); - pthread_t calcul; pthread_create(&calcul , NULL, threadCalculBoth, (void *)&calcul); diff --git a/Code-C/power.c b/Code-C/power.c index b6ba5d9..a3aa974 100644 --- a/Code-C/power.c +++ b/Code-C/power.c @@ -36,8 +36,10 @@ void powerFunction(char* rawDataFileName, double **pw){ if(p !=NULL){ if(pw == NULL){ powerCalculation(p,pww); + }else{ powerCalculation(p,*pw); + } appendDataInFile("powerData.csv",*pw,nCol-1); freeArray(p,nRow);