diff --git a/Code-C/main b/Code-C/main index a762195..ba3c2e9 100755 Binary files a/Code-C/main and b/Code-C/main differ 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);