From a8c235bc65673fdb67a474ee36367f93dc4165b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Gauthier?= Date: Fri, 24 Jun 2022 17:50:54 +0200 Subject: [PATCH] first try after first fix strsep --- Code-C/average.c | 6 ++++-- Code-C/getArray.c | 4 ++-- Code-C/main.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Code-C/average.c b/Code-C/average.c index 73ba64f..82c72c4 100644 --- a/Code-C/average.c +++ b/Code-C/average.c @@ -11,15 +11,17 @@ */ void averageCalculation(long **p, double averageArray[]) { + printArrayData(p, nRowRawData, nCol); + printf("\n"); for (int i = 1; i < nCol; i++) { int j = 0; averageArray[i] = 0; while (j < nRowRawData) { - printf("pij = %ld\n" , p[i][j]); + printf("pij = %ld\n", p[i][j]); averageArray[i - 1] += (double)p[i][j]; - printf("%f , %ld\n", averageArray[i] , p[i][j]); + // printf("%f , %ld\n", averageArray[i], p[i][j]); j++; } averageArray[i] /= nRowRawData; diff --git a/Code-C/getArray.c b/Code-C/getArray.c index 635189c..f276180 100644 --- a/Code-C/getArray.c +++ b/Code-C/getArray.c @@ -38,9 +38,9 @@ void fillArrayWithRawData(char *rawDataFileName, long **p, int N, int M) for (i = 0; i < N; i++) { long t, c1, c2, c3; - while (fscanf(f, "%ld,%ld,%ld,%ld\n", &t, &c1, &c2, &c3)) + while (fscanf(f, "%ld,%ld,%ld,%ld\n", &t, &c1, &c2, &c3) != EOF) { // séparation valeur par virgule initiale : csv - printf("%ld,%ld,%ld,%ld\n", t, c1, c2, c3); + // printf("%ld,%ld,%ld,%ld\n", t, c1, c2, c3); p[i][0] = t; p[i][1] = c1; p[i][2] = c2; diff --git a/Code-C/main.c b/Code-C/main.c index e5f6c0e..3b90d1a 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -96,6 +96,7 @@ void *threadCalculGrowthRate(void *vargp) { rawDataQueue = queueGetNextE(rawDataQueue); fileName = queueGetTabChar(rawDataQueue); + printf("%s\n", fileName); if (i < 2) { if (i == 1)