added beacon stuff similiar architecture then wifi \n added activity percentage stuff \n added testcases

sensors/radio/LocatedAccessPoint.h

@@ -1,27 +0,0 @@
-#ifndef LOCATEDACCESSPOINT_H
-#define LOCATEDACCESSPOINT_H
-
-#include "AccessPoint.h"
-#include "../../geo/Point3.h"
-#include "../../floorplan/v2/Floorplan.h"
-
-/**
- * describes an access-point including its position (in meter)
- */
-class LocatedAccessPoint : public AccessPoint, public Point3 {
-
-public:
-
-	/** ctor */
-	LocatedAccessPoint(const std::string& mac, const Point3 pos_m) : AccessPoint(mac, ""), Point3(pos_m) {
-		;
-	}
-
-	/** ctor */
-	LocatedAccessPoint(const Floorplan::AccessPoint& ap) : AccessPoint(ap.mac, ap.name), Point3(ap.pos) {
-		;
-	}
-
-};
-
-#endif // LOCATEDACCESSPOINT_H

sensors/radio/WiFiMeasurement.h

@@ -9,7 +9,7 @@
  */
 class WiFiMeasurement {
 
-public:
+private:
 
 	friend class VAPGrouper;
 
@@ -19,6 +19,9 @@ public:
 	/** the measured signal strength */
 	float rssi;
 
+    /** OPTIONAL. frequence the signal was received */
+    float freq;
+
 	/** OPTIONAL. timestamp the measurement was recorded at */
 	Timestamp ts;
 
@@ -29,11 +32,21 @@ public:
 		;
 	}
 
+    /** ctor with freq*/
+    WiFiMeasurement(const AccessPoint& ap, const float rssi, const float freq) : ap(ap), rssi(rssi), freq(freq) {
+            ;
+    }
+
 	/** ctor with timestamp */
 	WiFiMeasurement(const AccessPoint& ap, const float rssi, const Timestamp ts) : ap(ap), rssi(rssi), ts(ts) {
 		;
 	}
 
+    /** ctor with timestamp and freq*/
+    WiFiMeasurement(const AccessPoint& ap, const float rssi, const float freq, const Timestamp ts) : ap(ap), rssi(rssi), freq(freq), ts(ts) {
+            ;
+    }
+
 public:
 
 	/** get the AP we got the measurement for */
@@ -45,6 +58,13 @@ public:
 	/** OPTIONAL: get the measurement's timestamp (if known!) */
 	const Timestamp& getTimestamp() const {return ts;}
 
+    /** OPTIONAL: get the measurement's frequence (if known!) */
+    float getFrequency() const {return freq;}
+
+    /** set another signal strength */
+    void setRssi(float value){rssi = value;}
 };
 
+
+
 #endif // WIFIMEASUREMENT_H

sensors/radio/WiFiProbabilityFree.h

@@ -5,6 +5,7 @@
 #include "model/WiFiModel.h"
 #include "../../math/Distributions.h"
 #include "VAPGrouper.h"
+#include "../../floorplan/v2/Floorplan.h"
 
 #include <unordered_map>
 

sensors/radio/WiFiProbabilityGrid.h

@@ -59,7 +59,7 @@ public:
 		// after some runtime, check whether the wifi timestamps make sense
 		// those must not be zero, otherwise something is wrong!
 		if (!obs.entries.empty()) {
-			Assert::isFalse(curTime.ms() > 10000 && obs.entries.front().ts.isZero(), "WiFiMeasurement timestamp is 0. this does not make sense...");
+            Assert::isFalse(curTime.ms() > 10000 && obs.entries.front().getTimestamp().isZero(), "WiFiMeasurement timestamp is 0. this does not make sense...");
 		}
 
 		// process each observed measurement
@@ -73,7 +73,7 @@ public:
 			const Timestamp age = curTime - measurement.getTimestamp();
 
 			// sigma grows with measurement age
-			float sigma = this->sigma + this->sigmaPerSecond * age.sec();
+                        float sigma = this->sigma + this->sigmaPerSecond * age.sec();
 
 			// the RSSI from the scan
 			const float measuredRSSI = measurement.getRSSI();

sensors/radio/model/WiFiModel.h

@@ -1,7 +1,8 @@
 #ifndef WIFIMODEL_H
 #define WIFIMODEL_H
 
-#include "../LocatedAccessPoint.h"
+#include "../AccessPoint.h"
+#include "../../../geo/Point3.h"
 
 /**
  * interface for signal-strength prediction models.

sensors/radio/model/WiFiModelLogDist.h

@@ -4,6 +4,8 @@
 #include "WiFiModel.h"
 #include "LogDistanceModel.h"
 
+#include <unordered_map>
+
 /**
  * signal-strength estimation using log-distance model
  */

sensors/radio/setup/WiFiFingerprint.h

@@ -46,9 +46,9 @@ struct WiFiFingerprint {
 			const WiFiMeasurements& apMeasurements = it.second;
 			WiFiMeasurement avg = apMeasurements.entries.front();			// average starts with a copy of the first entry (to get all data-fields beside the rssi)
 			for (int i = 1; i < (int)apMeasurements.entries.size(); ++i) {		// sum up all other entries [1:end]
-				avg.rssi += apMeasurements.entries[i].rssi;
+                avg.setRssi(avg.getRSSI() + apMeasurements.entries[i].getRSSI());
 			}
-			avg.rssi /= apMeasurements.entries.size();
+            avg.setRssi(avg.getRSSI() / apMeasurements.entries.size());
 			res.entries.push_back(avg);										// add to output
 		}
 
@@ -62,7 +62,7 @@ struct WiFiFingerprint {
 		out << "pos: " << pos_m.x << " " << pos_m.y << " " << pos_m.z << "\n";
 		out << "num: " << measurements.entries.size() << "\n";
 		for (const WiFiMeasurement& wm : measurements.entries) {
-			out << wm.getTimestamp().ms() << " " << wm.ap.getMAC().asString() << " " << wm.getRSSI() << "\n";
+            out << wm.getTimestamp().ms() << " " << wm.getAP().getMAC().asString() << " " << wm.getRSSI() << "\n";
 		}
 	}
 

sensors/radio/setup/WiFiOptimizer.h

@@ -89,7 +89,7 @@ public:
 
 		// add each available AP to its slot (lookup map)
 		for (const WiFiMeasurement& m : measurements.entries) {
-			const RSSIatPosition rap(fp.pos_m, m.rssi);
+            const RSSIatPosition rap(fp.pos_m, m.getRSSI());
 			apMap[m.getAP().getMAC()].push_back(rap);
 		}