some fixes [multithreading,..]

needed interface changes [new options]
logger for android
wifi-ap-optimization
new test-cases

sensors/radio/model/WiFiModel.h

@@ -16,6 +16,9 @@ public:
 //	/** get the given access-point's RSSI at the provided location */
 //	virtual float getRSSI(const LocatedAccessPoint& ap, const Point3 p) = 0;
 
+	/** get a list of all APs known to the model */
+	virtual std::vector<AccessPoint> getAllAPs() const = 0;
+
 	/**
 	 * get the RSSI expected at the given location (in meter)
 	 * for an AP identified by the given MAC.

sensors/radio/model/WiFiModelLogDist.h

@@ -36,6 +36,13 @@ public:
 		;
 	}
 
+	/** get a list of all APs known to the model */
+	std::vector<AccessPoint> getAllAPs() const {
+		std::vector<AccessPoint> aps;
+		for (const auto it : accessPoints) {aps.push_back(AccessPoint(it.first));}
+		return aps;
+	}
+
 	/** make the given AP (and its parameters) known to the model */
 	void addAP(const MACAddress& accessPoint, const APEntry& params) {
 

sensors/radio/model/WiFiModelLogDistCeiling.h

@@ -39,9 +39,12 @@ private:
 
 public:
 
-	/** ctor */
+	/** ctor with floorplan (needed for ceiling position) */
 	WiFiModelLogDistCeiling(const Floorplan::IndoorMap* map) {
 
+		// sanity checks
+		Assert::isTrue(map->floors.size() >= 1, "map has no floors?!");
+
 		// position of all ceilings
 		for (Floorplan::Floor* f : map->floors) {
 			ceilingsAtHeight_m.push_back(f->atHeight);
@@ -49,6 +52,25 @@ public:
 
 	}
 
+	/** get a list of all APs known to the model */
+	std::vector<AccessPoint> getAllAPs() const {
+		std::vector<AccessPoint> aps;
+		for (const auto it : accessPoints) {aps.push_back(AccessPoint(it.first));}
+		return aps;
+	}
+
+	/** load AP information from the floorplan. use the given fixed TXP/EXP/WAF for all APs */
+	void loadAPs(const Floorplan::IndoorMap* map, const float txp = -40.0f, const float exp = 2.5f, const float waf = -8.0f) {
+
+		for (const Floorplan::Floor* floor : map->floors) {
+			for (const Floorplan::AccessPoint* ap : floor->accesspoints) {
+				const APEntry ape(ap->getPos(floor), txp, exp, waf);
+				addAP(MACAddress(ap->mac), ape);
+			}
+		}
+
+	}
+
 	/** make the given AP (and its parameters) known to the model */
 	void addAP(const MACAddress& accessPoint, const APEntry& params) {
 
@@ -57,11 +79,18 @@ public:
 		Assert::isBetween(params.txp, -50.0f, -30.0f, "TXP out of bounds [-50:-30]");
 		Assert::isBetween(params.exp, 1.0f, 4.0f, "EXP out of bounds [1:4]");
 
+		Assert::equal(accessPoints.find(accessPoint), accessPoints.end(), "AccessPoint already present!");
+
 		// add
 		accessPoints.insert( std::pair<MACAddress, APEntry>(accessPoint, params) );
 
 	}
 
+	/** remove all added APs */
+	void clear() {
+		accessPoints.clear();
+	}
+
 	float getRSSI(const MACAddress& accessPoint, const Point3 position_m) const override {
 
 		// try to get the corresponding parameters
@@ -90,6 +119,28 @@ public:
 protected:
 
 	FRIEND_TEST(LogDistanceCeilingModel, numCeilings);
+	FRIEND_TEST(LogDistanceCeilingModel, numCeilingsFloat);
+
+
+	/** get the number of ceilings between z1 and z2 */
+	float numCeilingsBetweenFloat(const Point3 pos1, const Point3 pos2) const {
+
+
+		const float zMin = std::min(pos1.z, pos2.z);
+		const float zMax = std::max(pos1.z, pos2.z);
+
+		float cnt = 0;
+
+		for (const float z : ceilingsAtHeight_m) {
+			if (zMin < z && zMax > z) {
+				const float dmax = zMax - z;
+				cnt += (dmax > 1) ? (1) : (dmax);
+			}
+		}
+
+		return cnt;
+
+	}
 
 	/** get the number of ceilings between z1 and z2 */
 	int numCeilingsBetween(const Point3 pos1, const Point3 pos2) const {
@@ -98,6 +149,24 @@ protected:
 		const float zMin = std::min(pos1.z, pos2.z);
 		const float zMax = std::max(pos1.z, pos2.z);
 
+#ifdef WITH_ASSERTIONS
+
+		static int numNear = 0;
+		static int numFar = 0;
+		for (const float z : ceilingsAtHeight_m) {
+			const float diff = std::min( std::abs(z-zMin), std::abs(z-zMax) );
+			if (diff < 0.1) {++numNear;} else {++numFar;}
+		}
+		if ((numNear + numFar) > 150000) {
+			Assert::isTrue(numNear < numFar*0.1,
+			    "many requests to the WiFiModel address nodes (very) near to a ground! \
+			    due to rounding issues, determining the number of floors between AP and point-in-question is NOT possible! \
+			    expect very wrong outputs! \
+			    consider adding the person's height to the questioned positions: p += Point3(0,0,1.3) "
+			);
+		}
+#endif
+
 		for (const float z : ceilingsAtHeight_m) {
 			if (zMin < z && zMax > z) {++cnt;}
 		}