merge

Code-C/main.c

@@ -19,10 +19,9 @@ int main(int argc , char** argv){
 
     double period = 1 / freqEch;
     double invTimeBandWidth = 1 /(nRow * period);
-    Pqueue new = createE
-/*
+    
     pthread_t rawData;
     pthread_create(&rawData , NULL, simulateFlux, (void *)&rawData);
     pthread_exit(NULL);
-*/
+
 }

Code-C/queue.c

@@ -23,7 +23,11 @@ typedef struct queue *Pqueue;
  * 
  * @return Pqueue 
  */
+<<<<<<< HEAD
 Pqueue queueCreateEmpty(){
+=======
+Pqueue createE(int lenChar){
+>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
     Pqueue new = (Pqueue) malloc(sizeof(struct queue));
     assert(new);
     new->charLen = 0;
@@ -99,6 +103,7 @@ char * queueGetTabChar(Pqueue elem){
     return elem->tabChar;
 }
 
+<<<<<<< HEAD
                                     /************       ************/
 
 /**
@@ -113,6 +118,24 @@ Pqueue queueCreateE(int lenChar, const char* _tabChar){
     queueSetTabChar(new, lenChar, _tabChar);
     new->pNextE = NULL;
     return new;
+=======
+void setCharLen(Pqueue elem , int _charLen){
+    assert(elem);
+    elem->charLen = _charLen;
+}
+
+void setTabChar(Pqueue elem , int _charLen , char *_tabChar){
+    assert(elem);
+    elem->charLen = _charLen;
+    elem->tabChar = (char *) malloc(_charLen * sizeof(char));
+    elem->tabChar = _tabChar;
+>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
+}
+
+void setNextE(Pqueue elem , Pqueue next){
+    assert(elem);
+    assert(next);
+    elem -> pNextE = next;
 }
 
 /**
@@ -177,10 +200,18 @@ Pqueue queueAddLastQ(Pqueue elem, const char* str, int len){
         previous = tmp;
         tmp = queueGetNextE(tmp);
     }
+<<<<<<< HEAD
     tmp = queueCreateE(len);
     tmp->tabChar = str;
     tmp->charLen = len;
     return tmp;
+=======
+    tmp -> pNextE = createE(len);
+    Pqueue next  = getNextE(tmp);
+    next->tabChar = str;
+    next->charLen = len;
+    return next;
+>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
 }
 
 /**

Code-C/queue.h

@@ -10,8 +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

Code-C/simulateFlux.c

@@ -107,7 +107,7 @@ bool writeOneRawData(FILE *rawDataFile){
             }
         }
     cptData++;
-    sleep(0.004); //simul la freq ech
+    //sleep(0.004); //simul la freq ech
     return true;
     } 
     else {