pgp/Traitement-signal-plantes
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge Data

Browse source
This commit is contained in:
QuentinPerret 2023-05-09 13:41:59 +02:00
parent 4be1462614
commit 118504546e
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Code-C/main.c
View file

@ -75,15 +75,9 @@ void *threadCalculBoth(void *vargp)
{ {
rawDataQueue = queueGetNextE(rawDataQueue); rawDataQueue = queueGetNextE(rawDataQueue);
fileName = queueGetTabChar(rawDataQueue); fileName = queueGetTabChar(rawDataQueue);
<<<<<<< HEAD
power(fileName,nRow,nCol,period,invTimeBandWidth);
average(fileName,nRow,nCol);
//remove(fileName);
=======
powerFunction(fileName, NULL); powerFunction(fileName, NULL);
averageFunction(fileName, NULL); averageFunction(fileName, NULL);
remove(fileName); remove(fileName);
>>>>>>> Data
} }
} }
return NULL; return NULL;