move .h in include

.vscode/launch.json

@@ -0,0 +1,7 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": []
+}

.vscode/settings.json

@@ -16,6 +16,10 @@
         "type_traits": "c",
         "simulateflux.h": "c",
         "pthread.h": "c",
-        "types.h": "c"
+        "types.h": "c",
+        "average.h": "c",
+        "queue.h": "c",
+        "growthrate.h": "c",
+        "stdbool.h": "c"
     }
 }

Code-C/average.c

@@ -1,8 +1,8 @@
-#include "average.h"
+#include "include/average.h"
-#include "getArray.h"
+#include "include/getArray.h"
-#include "fileGestion.h"
+#include "include/fileGestion.h"
-#include "initialParameters.h"
+#include "include/initialParameters.h"
-#include "queue.h"
+#include "include/queue.h"
 /**
  * @brief realize the average calcul
  *

Code-C/b2hd.c

@@ -1,4 +1,4 @@
-#include "b2hd.h"
+#include "include/b2hd.h"
 #include <time.h>
 
 

Code-C/ctest.c

@@ -5,13 +5,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "fileGestion.h"
+#include "include/fileGestion.h"
-#include "getArray.h"
+#include "include/getArray.h"
-#include "growthRate.h"
+#include "include/growthRate.h"
-#include "power.c"
+#include "include/power.h"
-#include "simulateFlux.h"
+#include "include/simulateFlux.h"
-#include "queue.h"
+#include "include/queue.h"
-#include "average.h"
+#include "include/average.h"
 //#include "b2hd.h"
 
 bool rawDataWriteFlag;

Code-C/fileGestion.c

@@ -1,4 +1,4 @@
-#include "fileGestion.h"
+#include "include/fileGestion.h"
 
 /**
  * @brief function that delete nRow lign in the beginning of the file rawData.csv . This function is necessary to not deal with the same ligns over and over

Code-C/getArray.c

@@ -1,6 +1,6 @@
-#include "getArray.h"
+#include "include/getArray.h"
-#include "fileGestion.h"
+#include "include/fileGestion.h"
-#include "initialParameters.h"
+#include "include/initialParameters.h"
 //#include <string.h>
 
 long **getlongArray(int N, int M) /* Allocate the array */

Code-C/growthRate.c

@@ -1,7 +1,7 @@
-#include "initialParameters.h"
+#include "include/initialParameters.h"
-#include "fileGestion.h"
+#include "include/fileGestion.h"
-#include "getArray.h"
+#include "include/getArray.h"
-#include "growthRate.h"
+#include "include/growthRate.h"
 /**
  * @brief calculate de growth rate between to point next to each other
  * 

Code-C/main.c

@@ -1,15 +1,16 @@
 #include <pthread.h>
 #include <stdbool.h>
-#include "simulateFlux.h"
+
-#include "power.h"
+#include "include/simulateFlux.h"
-#include "initialParameters.h"
+#include "include/power.h"
-#include "queue.h"
+#include "include/initialParameters.h"
-#include "average.h"
+#include "include/queue.h"
-#include "growthRate.h"
+#include "include/average.h"
-#include "getArray.h"
+#include "include/growthRate.h"
+#include "include/getArray.h"
 
 bool rawDataWriteFlag;
-int nRowRawData = 500;
+int nRowRawData = 5000;
 int nRowGR = 150;
 int nCol = 1;
 double freqEch = 250;
@@ -19,7 +20,7 @@ int nbRowIgnore = 19;
 
 Pqueue firstRawDataQueue;
 // Captor                    1     2     3      4      5      6     7      8
-bool selectionCaptors[] = {true, false, true, false, false, false, true, false};
+bool selectionCaptors[] = {true, false, false, false, false, false, true, false};
 
 int cptData = 0;
 int cptFile = 1;
@@ -56,6 +57,7 @@ void *threadCalculAverage(void *vargp)
         {
             rawDataQueue = queueGetNextE(rawDataQueue);
             fileName = queueGetTabChar(rawDataQueue);
+            printf("%s\n", fileName);
             averageFunction(fileName, NULL);
             remove(fileName);
         }
@@ -142,6 +144,7 @@ int main(int argc, char **argv)
             nCol++;
         }
     }
+    printf("%d", nCol);
 
     rawDataWriteFlag = true;
 
@@ -156,12 +159,12 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-    // pthread_t calculAverage;
+    pthread_t calculAverage;
-    // if (pthread_create(&calculAverage, NULL, threadCalculAverage, "threadCalculAverage"))
+    if (pthread_create(&calculAverage, NULL, threadCalculAverage, "threadCalculAverage"))
-    // {
+    {
-    //     perror("threadCalculAverage() error");
+        perror("threadCalculAverage() error");
-    //     exit(1);
+        exit(1);
-    // }
+    }
 
     // pthread_t calculGrowthRate;
     // if (pthread_create(&calculGrowthRate, NULL, threadCalculGrowthRate, "threadCalculGrowthRate"))

Code-C/power.c

@@ -1,9 +1,10 @@
 #include <math.h>
-#include "power.h"
+
-#include "getArray.h"
+#include "include/power.h"
-#include "fileGestion.h"
+#include "include/getArray.h"
-#include "initialParameters.h"
+#include "include/fileGestion.h"
-#include "queue.h"
+#include "include/initialParameters.h"
+#include "include/queue.h"
 
 /**
  * @brief realize the powerThreadFunction calcul

Code-C/queue.c

@@ -3,7 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include "queue.h"
+
+#include "include/queue.h"
 
 /**
  * @brief struct queue struct used for queueing string name

Code-C/simulateFlux.c

@@ -1,6 +1,6 @@
-#include "simulateFlux.h"
+#include "include/simulateFlux.h"
-#include "initialParameters.h"
+#include "include/initialParameters.h"
-#include "queue.h"
+#include "include/queue.h"
 
 #include <time.h>
 #include <errno.h>