From 46e02c1d6d849d619e85b56a4487ba283ce818ab Mon Sep 17 00:00:00 2001 From: "quentin.perret" Date: Thu, 9 Jun 2022 17:56:45 +0200 Subject: [PATCH] add bool in code --- Code-C/.vscode/settings.json | 5 +++++ Code-C/getArray.c | 6 +++--- Code-C/getArray.h | 3 ++- Code-C/main | Bin 0 -> 18040 bytes Code-C/main.c | 2 +- Code-C/power.c | 7 +++---- Code-C/power.h | 1 + Code-C/simulateFlux.c | 16 ---------------- Code-C/simulateFlux.h | 7 ------- 9 files changed, 15 insertions(+), 32 deletions(-) create mode 100644 Code-C/.vscode/settings.json create mode 100755 Code-C/main diff --git a/Code-C/.vscode/settings.json b/Code-C/.vscode/settings.json new file mode 100644 index 0000000..c70a9f1 --- /dev/null +++ b/Code-C/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "power.h": "c" + } +} \ No newline at end of file diff --git a/Code-C/getArray.c b/Code-C/getArray.c index d6543a1..73e6893 100644 --- a/Code-C/getArray.c +++ b/Code-C/getArray.c @@ -57,11 +57,11 @@ void printArrayData(long** p, int N, int M) { * @param M * @return int */ -int checkArrayFullyFill(long **p, int N , int M){ +bool checkArrayFullyFill(long **p, int N , int M){ for(int i = 0 ; i < N ; i++){ - if(p[i][0] == '\0'){ return 1; } + if(p[i][0] == '\0'){ return false; } } - return 0; + return true; } void freeArray(long **p, int N) { diff --git a/Code-C/getArray.h b/Code-C/getArray.h index 3d6e16a..c975391 100644 --- a/Code-C/getArray.h +++ b/Code-C/getArray.h @@ -2,9 +2,10 @@ #include #include #include +#include #include long **getRawDataArray(); void printArrayData(long** p, int N, int M); void freeArray(long **p, int N); -int checkArrayFullyFill(long **p, int N , int M); \ No newline at end of file +bool checkArrayFullyFill(long **p, int N , int M); \ No newline at end of file diff --git a/Code-C/main b/Code-C/main new file mode 100755 index 0000000000000000000000000000000000000000..b1ea901faa9c5d42d4d906ade817b5986164298a GIT binary patch literal 18040 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 I49ZyXKgxq>jQ{`u literal 0 HcmV?d00001 diff --git a/Code-C/main.c b/Code-C/main.c index 5de3cde..aae4870 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -21,5 +21,5 @@ int main(int argc , char** argv){ pthread_t rawData; pthread_create(&rawData , NULL, simulateFlux, (void *)&rawData); pthread_exit(NULL); - while(power(nRow,nCol,period,invTimeBandWidth)==0){} + while(power(nRow,nCol,period,invTimeBandWidth)){} } \ No newline at end of file diff --git a/Code-C/power.c b/Code-C/power.c index e672b4f..b99ad45 100644 --- a/Code-C/power.c +++ b/Code-C/power.c @@ -16,17 +16,16 @@ void powerCalculation(long **p, double powerArray[] , int N, int M , double peri //printf("%f\n", powerArray[i]); } } -int power(int N , int M, double periode , double invTimeBandwidth){ +bool power(int N , int M, double periode , double invTimeBandwidth){ long **p = getRawDataArray(N, M); - //printArrayData(p,N,M); double pw[8]; if(p !=NULL){ powerCalculation(p,pw,N,M,periode,invTimeBandwidth); writePowerData(pw,8); freeArray(p,N); - return 0; + return true; } else{ - return 1; + return false; } } \ No newline at end of file diff --git a/Code-C/power.h b/Code-C/power.h index 0da1b44..f83ba8c 100644 --- a/Code-C/power.h +++ b/Code-C/power.h @@ -1,3 +1,4 @@ #include +#include int power(int N , int M, double periode , double timeBandwidth); \ No newline at end of file diff --git a/Code-C/simulateFlux.c b/Code-C/simulateFlux.c index 381471f..b3e20c2 100644 --- a/Code-C/simulateFlux.c +++ b/Code-C/simulateFlux.c @@ -1,24 +1,8 @@ #include "simulateFlux.h" #include "initialParameters.h" -typedef struct { - char *fileName; -} nameFill; - - -typedef struct { - nameFill curentFile; - nameFill *nextFile; -}rawDataFile; - -nameFill getNameFill(int N){ - nameFill file; - file.fileName = (char *) malloc(N*sizeof(char *)); - return file; -} int cptData = 0; int cptFile = 1; -nameFill FirstFile; char* convertIntegerToChar(int N) { diff --git a/Code-C/simulateFlux.h b/Code-C/simulateFlux.h index 77fdc3e..b9edec8 100644 --- a/Code-C/simulateFlux.h +++ b/Code-C/simulateFlux.h @@ -13,12 +13,5 @@ typedef struct { uint8_t octet4; } quartet; -extern struct nameFill; - - -extern struct rawDataFile; - -nameFill getNameFill(int N); - bool writeOneRawData(FILE *f); void *simulateFlux(void *vargp); \ No newline at end of file