From f9a6f00972184c59ab46a5f9144444be2f7f9330 Mon Sep 17 00:00:00 2001 From: "quentin.perret" Date: Tue, 14 Jun 2022 18:01:52 +0200 Subject: [PATCH] trying to debug power --- Code-C/Makefile | 5 +---- Code-C/average.c | 24 ++++++++++-------------- Code-C/average.h | 2 +- Code-C/fileGestion.c | 5 ++--- Code-C/fileGestion.h | 2 +- Code-C/getArray.c | 13 ++++++++----- Code-C/getArray.h | 2 +- Code-C/initialParameters.h | 3 +-- Code-C/main | Bin 24800 -> 39640 bytes Code-C/main.c | 23 +++++++++++++++-------- Code-C/power.c | 30 +++++++++++------------------- Code-C/power.h | 2 +- Code-C/simulateFlux.c | 13 ++++++------- 13 files changed, 58 insertions(+), 66 deletions(-) diff --git a/Code-C/Makefile b/Code-C/Makefile index 6107882..0328aff 100644 --- a/Code-C/Makefile +++ b/Code-C/Makefile @@ -1,7 +1,4 @@ CC = gcc all: - $(CC) fileGestion.c getArray.c average.c power.c queue.c simulateFlux.c main.c -lm -lpthread -o main - -# $(CC) queue.c simulateFlux.c main.c -lm -lpthread -o main - ./main < ../02400031.TXT \ No newline at end of file + $(CC) -g fileGestion.c getArray.c average.c power.c queue.c simulateFlux.c main.c -lm -lpthread -o main \ No newline at end of file diff --git a/Code-C/average.c b/Code-C/average.c index 79dbf4a..dd83fe7 100644 --- a/Code-C/average.c +++ b/Code-C/average.c @@ -8,18 +8,16 @@ * * @param p array with all the values that will be used for the calcul * @param averageArray array where results are stocked - * @param N number of rows in p - * @param M number of columns in p */ -void averageCalculation(long **p, double averageArray[] , int N, int M){ - for(int i = 0; i < M-1; i++){ +void averageCalculation(long **p, double averageArray[]){ + for(int i = 0; i < nCol-1; i++){ int j = 0; averageArray[i] = 0; - while(j < N){ + while(j < nRow){ averageArray[i] += p[i][j]; j++; } - averageArray[i] /= N; + averageArray[i] /= nRow; //printf("%f\n", powerArray[i]); } } @@ -28,15 +26,13 @@ void averageCalculation(long **p, double averageArray[] , int N, int M){ * @brief function that realize all the action to write one lign in the file averageData.csv * * @param rawDataFileName name of the raw data file to use to realize the calcul - * @param N number of rows in the file - * @param M number of columns in the file */ -void average(char* rawDataFileName,int N , int M){ - long **p = getRawDataArray(rawDataFileName,N, M); - double aver[8]; +void average(char* rawDataFileName){ + long **p = getRawDataArray(rawDataFileName); + double aver[nCol -1]; if(p !=NULL){ - averageCalculation(p,aver,N,M); - writeDataInFile("averageData.csv",aver,8); - freeArray(p,N); + averageCalculation(p,aver); + appendDataInFile("averageData.csv",aver,nCol-1); + freeArray(p,nRow); } } \ No newline at end of file diff --git a/Code-C/average.h b/Code-C/average.h index b4bdf81..25be1e0 100644 --- a/Code-C/average.h +++ b/Code-C/average.h @@ -1,4 +1,4 @@ #include #include -void average(char* rawDataFileName,int N , int M); \ No newline at end of file +void average(char* rawDataFileName); \ No newline at end of file diff --git a/Code-C/fileGestion.c b/Code-C/fileGestion.c index 57aa3e9..7749080 100644 --- a/Code-C/fileGestion.c +++ b/Code-C/fileGestion.c @@ -26,7 +26,7 @@ void clearRawData(int nRow){ * @param array array that contaign all the values to write in the file * @param nCol size of the array (correspond to the number of captor used) */ -void writeDataInFile(char* fileName , double array[], int nCol){ +void appendDataInFile(char* fileName , double array[], int nCol){ FILE *f = fopen(fileName,"a+"); for(int i = 0 ; i < nCol ; i++){ if( i < nCol-1){ @@ -36,5 +36,4 @@ void writeDataInFile(char* fileName , double array[], int nCol){ } } fclose(f); -} - +} \ No newline at end of file diff --git a/Code-C/fileGestion.h b/Code-C/fileGestion.h index b001d93..02e8bb8 100644 --- a/Code-C/fileGestion.h +++ b/Code-C/fileGestion.h @@ -5,4 +5,4 @@ void clearRawData(int N); -void writeDataInFile(char* fileName , double a[], int N); \ No newline at end of file +void appendDataInFile(char* fileName , double a[], int N); \ No newline at end of file diff --git a/Code-C/getArray.c b/Code-C/getArray.c index dd3f1fe..77a71ba 100644 --- a/Code-C/getArray.c +++ b/Code-C/getArray.c @@ -1,5 +1,6 @@ #include "getArray.h" #include "fileGestion.h" +#include "initialParameters.h" //#include long **get(int N, int M) /* Allocate the array */ @@ -55,7 +56,7 @@ void printArrayData(long** p, int N, int M) { * @return true if the array contaign no NULL element * @return false if at least one element is null */ -bool checkArrayFullyFill(long **p, int N , int M){ +bool checkArrayFullyFill(long **p, int N){ for(int i = 0 ; i < N ; i++){ if(p[i][0] == '\0'){ return false; } } @@ -83,11 +84,13 @@ void freeArray(long **p, int N) { * @param M numbers of columns to have i the array * @return long** the array fill with raw data */ -long **getRawDataArray(char* rawDataFileName , int N , int M){ +long **getRawDataArray(char* rawDataFileName){ long **p; - p = get(N, M); - fillArrayWithRawData(rawDataFileName,p ,N, M); - if(checkArrayFullyFill(p,N,M)){ + p = get(nRow, nCol); + printf("before fill\n"); + fillArrayWithRawData(rawDataFileName,p ,nRow, nCol); + printf("after fill\n"); + if(checkArrayFullyFill(p,nRow, nCol)){ //clearRawData(N); return p; } diff --git a/Code-C/getArray.h b/Code-C/getArray.h index 6a501b1..6a0c836 100644 --- a/Code-C/getArray.h +++ b/Code-C/getArray.h @@ -5,7 +5,7 @@ #include #include -long **getRawDataArray(char *rawDataFileName, int N , int M); +long **getRawDataArray(char *rawDataFileName); void printArrayData(long** p, int N, int M); void freeArray(long **p, int N); bool checkArrayFullyFill(long **p, int N , int M); \ No newline at end of file diff --git a/Code-C/initialParameters.h b/Code-C/initialParameters.h index ba11617..546b17a 100644 --- a/Code-C/initialParameters.h +++ b/Code-C/initialParameters.h @@ -9,7 +9,6 @@ extern double freqEch; extern double period; extern double invTimeBandWidth; -extern int selectionCaptors[]; -extern int sizeSelectionArray; +extern bool selectionCaptors[]; extern Pqueue firstRawDataQueue; diff --git a/Code-C/main b/Code-C/main index 69213d78d46a50620a794cc57b661390d41c589d..7652bd45e2c84a2e894b391e4ab9b663e3d55698 100755 GIT binary patch literal 39640 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 #include -bool power(char* rawDataFileName,int N , int M, double periode , double invTimeBandwidth); \ No newline at end of file +void power(char* rawDataFileName); \ No newline at end of file diff --git a/Code-C/simulateFlux.c b/Code-C/simulateFlux.c index 3066bf3..07a350c 100644 --- a/Code-C/simulateFlux.c +++ b/Code-C/simulateFlux.c @@ -19,7 +19,7 @@ char* convertIntegerToChar(int N) } char* arr; char arr1[digit]; - arr = (char*)malloc(digit); + arr = (char*)malloc(digit*sizeof(char)); int index = 0; while (N) { arr1[++index] = N % 10 + '0'; @@ -42,6 +42,9 @@ char *createNewRawDataFileName(){ char *fileName = "../RawDataFiles/RawData"; char *extension = ".csv\0"; char *fileNumber = convertIntegerToChar(cptFile); + //char *fileNumber; + //sprintf(fileNumber, "%d", cptFile); + //printf("%s\n" , fileNumber); char fileNameNumber[strlen(fileName)+strlen(fileNumber)]; char *fullFileName = malloc((strlen(fileNameNumber)+strlen(extension)) * sizeof(char*)); @@ -94,21 +97,18 @@ bool writeOneRawData(FILE *rawDataFile){ uint32_t valbin[8]; quartet value; - if(fread(&buff, 26, 1, stdin)) { fprintf(rawDataFile , "%d,", millis()); if (strncmp(buff, "#################\n", (size_t)18) == 0) { if (!(fread(&buff2, 18, 1, stdin))) { fprintf(stderr, "Erreur lecture après ###...#"); - return 2; } else { strncpy(buff, &buff[18], 8); strncpy(&buff[8], buff2, 18); } } - int maxCApteurNb = maxInArray(selectionCaptors,sizeSelectionArray); for (int i = 1; i < 9; i++){ - if(intInArray(i,selectionCaptors,sizeSelectionArray)==0){ + if(selectionCaptors[i]){ value.octet1 = buff[3*i+1]; value.octet2 = buff[3*i+2]; value.octet3 = buff[3*i+3]; @@ -117,8 +117,7 @@ bool writeOneRawData(FILE *rawDataFile){ valbin[i] = buff[3*i+1]*256*256*256 + buff[3*i+2]*256*256 + buff[3*i+3]*256; memcpy(&values[i], &valbin[i], sizeof(uint32_t)); - - if(i==maxCApteurNb){ + if(i==8){ fprintf(rawDataFile, "%d\n", values[i]/256); } else{