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

forget to save main.c

Browse source
This commit is contained in:
Aurélien Gauthier 2022-06-17 17:46:53 +02:00
parent e1c631229d
commit f4fd64e63c
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Code-C/main.c
View file

@ -82,15 +82,6 @@ void *threadCalculGrowthRate(void * vargp){
fileName = queueGetTabChar(rawDataQueue); fileName = queueGetTabChar(rawDataQueue);
if(i < 2){ if(i < 2){
if(i == 1){ if(i == 1){
<<<<<<< HEAD
printf("zedfghjio\n");
powerFunction(fileName, dataLign[1]);
growthRateFunction(**dataLign);
}else{
printf("zedfghjio\n");
powerFunction(fileName, dataLign[0]);
=======
powerFunction(fileName, dataLignPw); powerFunction(fileName, dataLignPw);
averageFunction(fileName , dataLignAv); averageFunction(fileName , dataLignAv);
growthRateFunction(dataLignPw , "growthRatePw.csv"); growthRateFunction(dataLignPw , "growthRatePw.csv");
@ -98,7 +89,6 @@ void *threadCalculGrowthRate(void * vargp){
}else{ }else{
averageFunction(fileName , dataLignAv); averageFunction(fileName , dataLignAv);
powerFunction(fileName, dataLignPw); powerFunction(fileName, dataLignPw);
>>>>>>> e06c7602e0dade3bd0d2e88e88cacaab8de6f9ea
} }
i++; i++;
}else{ }else{
@ -106,17 +96,10 @@ void *threadCalculGrowthRate(void * vargp){
dataLignPw[0][y] = dataLignPw[1][y]; dataLignPw[0][y] = dataLignPw[1][y];
dataLignAv[0][y] = dataLignAv[1][y]; dataLignAv[0][y] = dataLignAv[1][y];
} }
<<<<<<< HEAD
printf("zedfghjio\n");
powerFunction(fileName, dataLign[1]);
growthRateFunction(**dataLign);
=======
powerFunction(fileName, dataLignPw); powerFunction(fileName, dataLignPw);
averageFunction(fileName , dataLignAv); averageFunction(fileName , dataLignAv);
growthRateFunction(dataLignPw,"growthRatePw.csv"); growthRateFunction(dataLignPw,"growthRatePw.csv");
growthRateFunction(dataLignPw,"growthRateAv.csv"); growthRateFunction(dataLignPw,"growthRateAv.csv");
>>>>>>> e06c7602e0dade3bd0d2e88e88cacaab8de6f9ea
} }
remove(fileName); remove(fileName);
} }