fixed fallback step-logger

moved vap-grouping to settings-file
sanity-checks

Settings.h

@@ -3,6 +3,7 @@
 
 #include <Indoor/grid/GridPoint.h>
 #include <Indoor/data/Timestamp.h>
+#include <Indoor/sensors/radio/VAPGrouper.h>
 
 #include <QFile>
 
@@ -25,6 +26,9 @@ namespace Settings {
 	}
 
 
+
+
+
 	//const GridPoint destination = GridPoint(70*100, 35*100, 0*100);		// use destination
 	const GridPoint destination = GridPoint(0,0,0);							// do not use destination
 
@@ -33,11 +37,21 @@ namespace Settings {
 	}
 
 	namespace WiFiModel {
+
 		constexpr float sigma = 13.0;
+
 		/** if the wifi-signal-strengths are stored on the grid-nodes, this needs a grid rebuild! */
 		constexpr float TXP = -48;
 		constexpr float EXP = 2.5;
 		constexpr float WAF = -5.0;
+
+		// how to perform VAP grouping. see
+		// - calibration in Controller.cpp
+		// - eval in Filter.h
+		// NOTE: maybe the UAH does not allow valid VAP grouping? delete the grid and rebuild without!
+		const VAPGrouper vg_calib = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::AVERAGE);
+		const VAPGrouper vg_eval  = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::AVERAGE);
+
 	}
 
 
@@ -71,7 +85,8 @@ namespace Settings {
 				if (QFile(f2.c_str()).exists()) {return f2;}
 				throw Exception("data folder missing");
 			#else
-                    return "/home/toni/Documents/programme/localization/YASMIN/YASMIN_DATA/";
+				//return "/home/toni/Documents/programme/localization/YASMIN/YASMIN_DATA/";
+				return "/apps/android/workspace/YASMIN_DATA/";
 			#endif
 		}