diff --git a/Code-C/main b/Code-C/main index 942736d..b7250cc 100755 Binary files a/Code-C/main and b/Code-C/main differ diff --git a/Code-C/main.c b/Code-C/main.c index 2aa513f..86ff80a 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -29,8 +29,6 @@ void *threadCalcul(void *vargp){ rawDataQueue = queueGetNextE(rawDataQueue); fileName = queueGetTabChar(rawDataQueue); power(fileName,nRow,nCol,period,invTimeBandWidth); - /*remove(queueGetTabChar(rawDataQueue)); - rawDataQueue = queueRmFrstE(rawDataQueue);*/ } } } diff --git a/Code-C/power.c b/Code-C/power.c index 4b58106..7852277 100644 --- a/Code-C/power.c +++ b/Code-C/power.c @@ -26,6 +26,7 @@ bool power(char* rawDataFileName,int N , int M, double periode , double invTimeB powerCalculation(p,pw,N,M,periode,invTimeBandwidth); writePowerData(pw,8); freeArray(p,N); + remove(rawDataFileName); return true; } else{ diff --git a/Code-C/queue.c b/Code-C/queue.c index 3aff95f..432807e 100644 --- a/Code-C/queue.c +++ b/Code-C/queue.c @@ -150,12 +150,10 @@ Pqueue queueRmLastE(Pqueue elem){ * @param elem target to remove (the element need to be the first) * @return Pqueue the second element after remove first */ -Pqueue queueRmFrstE(Pqueue elem){ +void queueRmFrstE(Pqueue elem){ assert(elem); - Pqueue tmp = elem->pNextE; free(elem->tabChar); free(elem); - return tmp; } /** diff --git a/Code-C/queue.h b/Code-C/queue.h index 198710c..c2ec7a5 100644 --- a/Code-C/queue.h +++ b/Code-C/queue.h @@ -19,7 +19,7 @@ void queueAddLastQ(Pqueue elem, const char* str, int len); //Removers Pqueue queueRmLastE(Pqueue elem); -Pqueue queueRmFrstE(Pqueue elem); +void queueRmFrstE(Pqueue elem); Pqueue queueNextDelFrst(Pqueue elem); //print function