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 0000000..b1ea901 Binary files /dev/null and b/Code-C/main differ 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