diff --git a/.gitignore b/.gitignore index 2a3e17d..7ecb25c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.png *.exe *.csv +*.png +*.dia Code-C/main Code-C/exect diff --git a/Code-C/getArray.c b/Code-C/getArray.c index 51e26db..1fe1691 100644 --- a/Code-C/getArray.c +++ b/Code-C/getArray.c @@ -24,28 +24,10 @@ double **getDoubleArray(int N, int M) /* Allocate the array */ array[i] = (double *)malloc(M * sizeof(double)); return array; } -/** - * @brief print all the element of a bidimensionnal array p of shape : N x M - */ -void printArrayData(long **p) -{ - for (int i = 0; i < nRowRawData; i++) - { - printf("line n°%d : ", i); - for (int j = 0; j < nCol; j++) - { - printf("%ld , ", p[i][j]); - if (j == (nCol - 1)) - printf("\n"); - } - } -} + void fillArrayWithRawData(char *rawDataFileName, long **p, int N, int M) { -<<<<<<< HEAD int i = 0, j; -======= ->>>>>>> 1c7d7edaaed0245806ce2b0f5538935709632a03 char *buffer; size_t bufsize = 200; buffer = (char *)malloc(bufsize * sizeof(char)); @@ -180,8 +162,6 @@ void printArrayData(long **p, int N, int M) printf("\n"); } } - printArrayData(p); - fclose(f); } /** * @brief verify if all the element of an array are not NULL, return diff --git a/Code-C/getArray.h b/Code-C/getArray.h index 556d0ee..575eb7f 100644 --- a/Code-C/getArray.h +++ b/Code-C/getArray.h @@ -6,7 +6,7 @@ #include long **getRawDataArray(char *rawDataFileName); -void printArrayData(long **p); +void printArrayData(long **p , int N , int M); void freeArray(long **p, int N); bool checkArrayFullyFill(long **p, int N); double **getDoubleArray(int N, int M); \ No newline at end of file diff --git a/Code-C/main.c b/Code-C/main.c index d1ed804..6ee1fb8 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -18,7 +18,7 @@ int nbRowBinFile = 900011; int nbRowIgnore = 19; Pqueue firstRawDataQueue; -// Captor 1 2 3 4 5 6 7 8 +// Captor 1 2 3 4 5 6 7 8 bool selectionCaptors[] = {true, false, true, false, false, false, true, false}; int cptData = 0;