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

Compare commits

base: pgp:d6f1fc5cfaad7d2665c7864a6a09caf2d86f3a0a
Branches Tags
pgp:master
pgp:Data
pgp:UserInterface
pgp:SimulFlux
..
compare: pgp:21cb319b25a36f2714e6c79b5ae2e3a9dc22378c
Branches Tags
pgp:master
pgp:Data
pgp:UserInterface
pgp:SimulFlux

No commits in common. "d6f1fc5cfaad7d2665c7864a6a09caf2d86f3a0a" and "21cb319b25a36f2714e6c79b5ae2e3a9dc22378c" have entirely different histories.
d6f1fc5cfa ... 21cb319b25

3 changed files with 2 additions and 5 deletions
Show stats Expand all files Collapse all files

BIN
Code-C/main Executable file
View file

Binary file not shown.

3
Code-C/main.c
View file

@ -53,8 +53,6 @@ void *threadCalculBoth(void *vargp){
char* fileName; char* fileName;
while(rawDataWriteFlag){ while(rawDataWriteFlag){
while(queueGetNextE(rawDataQueue) != NULL){ while(queueGetNextE(rawDataQueue) != NULL){
printf("ertyu\n");
rawDataQueue = queueGetNextE(rawDataQueue); rawDataQueue = queueGetNextE(rawDataQueue);
fileName = queueGetTabChar(rawDataQueue); fileName = queueGetTabChar(rawDataQueue);
powerFunction(fileName, NULL); powerFunction(fileName, NULL);
@ -113,6 +111,7 @@ int main(int argc , char** argv){
pthread_t rawData; pthread_t rawData;
pthread_create(&rawData , NULL, threadSimulateFlux, (void *)&rawData); pthread_create(&rawData , NULL, threadSimulateFlux, (void *)&rawData);
pthread_t calcul; pthread_t calcul;
pthread_create(&calcul , NULL, threadCalculBoth, (void *)&calcul); pthread_create(&calcul , NULL, threadCalculBoth, (void *)&calcul);

2
Code-C/power.c
View file

@ -36,10 +36,8 @@ void powerFunction(char* rawDataFileName, double **pw){
if(p !=NULL){ if(p !=NULL){
if(pw == NULL){ if(pw == NULL){
powerCalculation(p,pww); powerCalculation(p,pww);
}else{ }else{
powerCalculation(p,*pw); powerCalculation(p,*pw);
} }
appendDataInFile("powerData.csv",*pw,nCol-1); appendDataInFile("powerData.csv",*pw,nCol-1);
freeArray(p,nRow); freeArray(p,nRow);