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

first try after first fix strsep

Browse source
This commit is contained in:
Aurélien Gauthier 2022-06-24 17:50:54 +02:00
parent fecd2124d7
commit a8c235bc65
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Code-C/average.c
View file

@ -11,6 +11,8 @@
*/ */
void averageCalculation(long **p, double averageArray[]) void averageCalculation(long **p, double averageArray[])
{ {
printArrayData(p, nRowRawData, nCol);
printf("\n");
for (int i = 1; i < nCol; i++) for (int i = 1; i < nCol; i++)
{ {
int j = 0; int j = 0;
@ -19,7 +21,7 @@ void averageCalculation(long **p, double averageArray[])
{ {
printf("pij = %ld\n", p[i][j]); printf("pij = %ld\n", p[i][j]);
averageArray[i - 1] += (double)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++; j++;
} }
averageArray[i] /= nRowRawData; averageArray[i] /= nRowRawData;

4
Code-C/getArray.c
View file

@ -38,9 +38,9 @@ void fillArrayWithRawData(char *rawDataFileName, long **p, int N, int M)
for (i = 0; i < N; i++) for (i = 0; i < N; i++)
{ {
long t, c1, c2, c3; 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 { // 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][0] = t;
p[i][1] = c1; p[i][1] = c1;
p[i][2] = c2; p[i][2] = c2;

1
Code-C/main.c
View file

@ -96,6 +96,7 @@ void *threadCalculGrowthRate(void *vargp)
{ {
rawDataQueue = queueGetNextE(rawDataQueue); rawDataQueue = queueGetNextE(rawDataQueue);
fileName = queueGetTabChar(rawDataQueue); fileName = queueGetTabChar(rawDataQueue);
printf("%s\n", fileName);
if (i < 2) if (i < 2)
{ {
if (i == 1) if (i == 1)