From f4fd64e63c22220f94f5c02de69f4caa6bccfd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Gauthier?= Date: Fri, 17 Jun 2022 17:46:53 +0200 Subject: [PATCH] forget to save main.c --- Code-C/main.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Code-C/main.c b/Code-C/main.c index bf7038c..5872b31 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -82,15 +82,6 @@ void *threadCalculGrowthRate(void * vargp){ fileName = queueGetTabChar(rawDataQueue); if(i < 2){ if(i == 1){ -<<<<<<< HEAD - printf("zedfghjio\n"); - powerFunction(fileName, dataLign[1]); - growthRateFunction(**dataLign); - }else{ - printf("zedfghjio\n"); - - powerFunction(fileName, dataLign[0]); -======= powerFunction(fileName, dataLignPw); averageFunction(fileName , dataLignAv); growthRateFunction(dataLignPw , "growthRatePw.csv"); @@ -98,7 +89,6 @@ void *threadCalculGrowthRate(void * vargp){ }else{ averageFunction(fileName , dataLignAv); powerFunction(fileName, dataLignPw); ->>>>>>> e06c7602e0dade3bd0d2e88e88cacaab8de6f9ea } i++; }else{ @@ -106,17 +96,10 @@ void *threadCalculGrowthRate(void * vargp){ dataLignPw[0][y] = dataLignPw[1][y]; dataLignAv[0][y] = dataLignAv[1][y]; } -<<<<<<< HEAD - printf("zedfghjio\n"); - - powerFunction(fileName, dataLign[1]); - growthRateFunction(**dataLign); -======= powerFunction(fileName, dataLignPw); averageFunction(fileName , dataLignAv); growthRateFunction(dataLignPw,"growthRatePw.csv"); growthRateFunction(dataLignPw,"growthRateAv.csv"); ->>>>>>> e06c7602e0dade3bd0d2e88e88cacaab8de6f9ea } remove(fileName); }