Merge branch 'SimulFlux' of https://git.cohabit.fr/pgp/Traitement-signal-plantes into SimulFlux

Code-C/queue.c

@@ -19,52 +19,100 @@ struct queue {
 typedef struct queue *Pqueue;
 
 /**
- * @brief Create Element of queue
+ * @brief create an empty element of queue
  * 
- * @param lenChar size of char array that will be created 
+ * @return Pqueue 
- * @return Pqueue new element created
  */
-Pqueue createE(int lenChar){
+Pqueue queueCreateEmpty(){
     Pqueue new = (Pqueue) malloc(sizeof(struct queue));
     assert(new);
-                                                            /* ???? tab char create or give pointer ???*/
+    new->charLen = 0;
-    new->charLen = lenChar;
+    new->tabChar = NULL;
-    new->tabChar = (char *) malloc(lenChar * sizeof(char));
     new->pNextE = NULL;
     return new;
 }
 
+                                    /************ SETTER ************/
+
+/**
+ * @brief set char size array
+ * 
+ * @param elem targeted element
+ * @param _charLen size of char array
+ * @return Pqueue 
+ */
+Pqueue queueSetCharLen(Pqueue elem, int _charLen){
+    assert(elem);
+    elem->charLen = _charLen;
+}
+
+/**
+ * @brief set the char array in the element
+ * 
+ * @param elem targeted element
+ * @param _charLen char array size
+ * @param _tabChar pointer to static char array
+ * @return Pqueue 
+ */
+Pqueue queueSetTabChar(Pqueue elem, int _charLen, const char *_tabChar){
+    assert(elem);
+    assert(_tabChar);
+    elem->charLen = _charLen;
+    elem->tabChar = (char *) malloc(_charLen * sizeof(char));
+    for(int i = 0; i < _charLen; i++){
+        new->tabChar[i] = _tabChar[i];
+    }
+}
+
+                                    /************ GETTER ************/
+
 /**
  * @brief switch to the next element
  * 
  * @param elem current element
  * @return Pqueue next element
  */
-Pqueue getNextE(Pqueue elem){
+Pqueue queueGetNextE(Pqueue elem){
     assert(elem);
     return elem->pNextE;
 }
 
-int getCharLen(Pqueue elem){
+/**
+ * @brief get the size char array
+ * 
+ * @param elem targeted element
+ * @return int 
+ */
+int queueGetCharLen(Pqueue elem){
     assert(elem);
     return elem->charLen;
 }
 
-char * gettabChar(Pqueue elem){
+/**
+ * @brief get the pointer of char array
+ * 
+ * @param elem targeted elemnt
+ * @return char* 
+ */
+char * queueGetTabChar(Pqueue elem){
     assert(elem);
     return elem->tabChar;
 }
 
-void setCharLen(Pqueue elem , int _charLen){
+                                    /************       ************/
-    assert(elem);
-    elem->charLen = _charLen;
-}
 
-void setTabChar(Pqueue elem , int _charLen , char *_tabChar){
+/**
-    assert(elem);
+ * @brief Create Element of queue
-    elem->charLen = _charLen;
+ * 
-    elem->tabChar = (char *) malloc(_charLen * sizeof(char));
+ * @param lenChar size of char array that will be created 
-    elem->tabChar = _tabChar;
+ * @return Pqueue new element created
+ */
+Pqueue queueCreateE(int lenChar, const char* _tabChar){
+    Pqueue new = (Pqueue) malloc(sizeof(struct queue));
+    assert(new);
+    queueSetTabChar(new, lenChar, _tabChar);
+    new->pNextE = NULL;
+    return new;
 }
 
 void setNextE(Pqueue elem , Pqueue next){
@@ -79,12 +127,12 @@ void setNextE(Pqueue elem , Pqueue next){
  * @param elem current element
  * @return Pqueue current element
  */
-Pqueue rmLastE(Pqueue elem){
+Pqueue queueRmLastE(Pqueue elem){
     assert(elem);
     Pqueue tmp = elem, previous = NULL;
     while(elem->pNextE != NULL){
         previous = tmp;
-        tmp = getNextE(tmp);
+        tmp = queueGetNextE(tmp);
     }
     free(tmp->tabChar);
     free(tmp);
@@ -98,7 +146,7 @@ Pqueue rmLastE(Pqueue elem){
  * @param elem target to remove (the element need to be the first)
  * @return Pqueue the second element after remove first
  */
-Pqueue rmFrstE(Pqueue elem){
+Pqueue queueRmFrstE(Pqueue elem){
     assert(elem);
     Pqueue tmp = elem->pNextE;
     free(elem->tabChar);
@@ -112,10 +160,10 @@ Pqueue rmFrstE(Pqueue elem){
  * @param elem 
  * @return Pqueue 
  */
-Pqueue nextDelFrst(Pqueue elem){
+Pqueue queueNextDelFrst(Pqueue elem){
     assert(elem);
     Pqueue tmp = elem->pNextE;
-    rmFrstE(elem);
+    queueRmFrstE(elem);
     return tmp;
 }
 
@@ -127,23 +175,27 @@ Pqueue nextDelFrst(Pqueue elem){
  * @param len the lenght of char array
  * @return Pqueue pointer to the last element
  */
-Pqueue addLastQ(Pqueue elem, const char* str, int len){
+Pqueue queueAddLastQ(Pqueue elem, const char* str, int len){
     assert(elem);
     assert(str);
     Pqueue tmp = elem, previous = NULL;
     while(elem->pNextE != NULL){
         previous = tmp;
-        tmp = getNextE(tmp);
+        tmp = queueGetNextE(tmp);
     }
-    tmp -> pNextE = createE(len);
+    tmp = queueCreateE(len);
-    Pqueue next  = getNextE(tmp);
+    tmp->tabChar = str;
-    next->tabChar = str;
+    tmp->charLen = len;
-    next->charLen = len;
+    return tmp;
-    return next;
 }
 
-void printE(Pqueue elem){
+/**
-    Pqueue next = getNextE(elem);
+ * @brief Print targeted element
+ * 
+ * @param elem targeted element
+ */
+void queuePrintE(Pqueue elem){
+    Pqueue next = queueGetNextE(elem);
     printf("File Name : %s \n(size of the file name : %d)\n",elem -> tabChar , elem -> charLen );
     if(next != NULL){
         printf("Next File : %s\n", next ->tabChar);

Code-C/queue.h

@@ -1,9 +1,8 @@
 typedef struct queue *Pqueue;
 
 //Constructors
-Pqueue createE(int lenChar);
+Pqueue createE(int lenChar, const char* _tabChar);
-Pqueue createEEmpty(); //create a new element but all variables in are null, use to create the first element of the queue in the main before define the elements in
+Pqueue createEmpty(); 
-// constructeur avec 2 paramètres : strlen et tabchar
 
 //Getters
 Pqueue getNextE(Pqueue elem);
@@ -11,10 +10,15 @@ Pqueue getNextE(Pqueue elem);
 char * gettabChar(Pqueue elem);
 
 //Setters
+<<<<<<< HEAD
+Pqueue setCharLen(Pqueue elem , int _charLen);
+Pqueue setTabChar(Pqueue elem , int _charLen, const char *_tabChar);
+=======
 void setCharLen(Pqueue elem , int _charLen);
 void setTabChar(Pqueue elem , int _charLen , char *_tabChar);
 void setNextE(Pqueue elem , Pqueue next);
 
+>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
 Pqueue addLastQ(Pqueue elem, const char* str, int len);
 
 //Removers