Refactored code to walk multiple runs

code/Settings.h

@@ -10,8 +10,9 @@ namespace Settings {
 	const std::string dataDir = "../measurements/data/";
 	const std::string errorDir = "../measurements/error/";
     const std::string plotDataDir = "../plots/data/";
+    const std::string outputDir = "../output/";
     
-    const bool UseKalman = false;
+    const bool UseKalman = true;
 
     /** describes one dataset (map, training, parameter-estimation, ...) */
 
@@ -56,6 +57,7 @@ namespace Settings {
     };
 
     struct DataSetup {
+        std::string name;
         std::string map;
         std::vector<std::string> training;
         std::unordered_map<MACAddress, NUCSettings> NUCs;
@@ -77,6 +79,7 @@ namespace Settings {
     const struct Data {
 
         const DataSetup Path0 = {
+            "path0",
             mapDir + "map0_ap_path0.xml",
             {
                 dataDir + "Pixel2/Path0_0605.csv",
@@ -94,6 +97,7 @@ namespace Settings {
 
         // 1 Path: U von TR nach TD und zurück;
         const DataSetup Path1 = {
+            "path1",
             mapDir + "map2_ap_path1.xml",
             {
                 dataDir + "Pixel2/path1/1560153927208_2_1.csv",
@@ -115,6 +119,7 @@ namespace Settings {
 
         // 2 Path: Wie 2 nur von TD zu TR
         const DataSetup Path2 = {
+            "path2",
             mapDir + "map2_ap_path1.xml",
             {
                 dataDir + "Pixel2/path2/1560154622883_3_1.csv",
@@ -137,6 +142,7 @@ namespace Settings {
 
         // 3 Path: U von TR nach TD; 4 mal das U
         const DataSetup Path3 = {
+            "path3",
             mapDir + "map2_ap_path2.xml",
             {
                 dataDir + "Pixel2/path3/1560155227376_4_1.csv",
@@ -158,6 +164,7 @@ namespace Settings {
 
         // 4 Path: In Räumen
         const DataSetup Path4 = {
+            "path4",
             mapDir + "map2_ap_path2.xml",
             {
                 dataDir + "Pixel2/path4/1560156876457_5_1.csv",
@@ -180,6 +187,7 @@ namespace Settings {
 
         // 5 Path: In Räumen extendend
         const DataSetup Path5 = {
+            "path5",
             mapDir + "map2_ap_path2.xml",
             {
                 dataDir + "Pixel2/path5/1560158444772_6_1.csv",
@@ -202,6 +210,7 @@ namespace Settings {
 
         // 6 Path: SHL Path 1
         const DataSetup Path6 = {
+            "path6",
             mapDir + "shl.xml",
             {
                 dataDir + "Pixel2/path6/14681054221905_6_1.csv"
@@ -219,6 +228,7 @@ namespace Settings {
 
         // 7 Path: SHL Path 2; Versuche mit NUCs in den Räumen war nicht vielversprechend ...
         const DataSetup Path7 = {
+            "path7",
             mapDir + "shl.xml",
             {
                 dataDir + "Pixel2/path7/23388354821394.csv",
@@ -239,6 +249,7 @@ namespace Settings {
 
         // 8 Path: Wie SHL Path 2 nur, dass die NUCs im Gang stehen
         const DataSetup Path8 = {
+            "path8",
             mapDir + "shl.xml",
             {
                 dataDir + "Pixel2/path8/25967118530318.csv", // gang
@@ -257,6 +268,7 @@ namespace Settings {
 
         // 9 Path: SHL Path 3, NUCs stehen im Gang
         const DataSetup Path9 = {
+            "path9",
             mapDir + "shl_nuc_gang.xml",
             {
                 dataDir + "Pixel2/path9/27911186920065.csv",
@@ -273,11 +285,8 @@ namespace Settings {
             { 200, 201, 203, 104, 204, 205, 206, 207, 206, 208, 209, 210, 211, 212 },
             true
         };
-
-
-        const DataSetup CurrentPath = Path7;
-
     } data;
 
+    static DataSetup CurrentPath = data.Path7;
 }