interface changes

added new data-strcutures for new sensors
new helper methods
fixed some issues

sensors/radio/WiFiMeasurements.h

@@ -23,8 +23,8 @@ struct WiFiMeasurements {
 	}
 
 	/** get the measurements for the given MAC [if available] otherwise null */
-	WiFiMeasurement* getForMac(const MACAddress& mac) {
-		for (WiFiMeasurement& m : entries) {
+	const WiFiMeasurement* getForMac(const MACAddress& mac) const {
+		for (const WiFiMeasurement& m : entries) {
 			if (m.getAP().getMAC() == mac) {
 				return &m;
 			}
@@ -32,6 +32,46 @@ struct WiFiMeasurements {
 		return nullptr;
 	}
 
+	/** remove the entry for the given MAC (if any) */
+	void remove(const MACAddress& mac) {
+		for (size_t i = 0; i < entries.size(); ++i) {
+			if (entries[i].getAP().getMAC() == mac) {
+				entries.erase(entries.begin() + i);
+				break;
+			}
+		}
+	}
+
+
+	/** create a combination */
+	static WiFiMeasurements mix(const WiFiMeasurements& a, const WiFiMeasurements& b, float sec = 3) {
+
+		Timestamp max;
+		WiFiMeasurements res;
+
+		for (const WiFiMeasurement& m : a.entries) {
+			res.entries.push_back(m);
+			if (m.getTimestamp() > max) {max = m.getTimestamp();}
+		}
+
+		for (const WiFiMeasurement& m : b.entries) {
+			res.entries.push_back(m);
+			if (m.getTimestamp() > max) {max = m.getTimestamp();}
+		}
+
+		std::vector<WiFiMeasurement> tmp;
+		std::swap(res.entries, tmp);
+
+		for (const WiFiMeasurement& m : tmp) {
+			if ((max - m.getTimestamp()).sec() < sec) {
+				res.entries.push_back(m);
+			}
+		}
+
+		return res;
+
+	}
+
 };
 
 #endif // WIFIMEASUREMENTS_H