current state

EvalWiFiSigStrength.h

@@ -103,18 +103,118 @@ public:
 			std::vector<WiFiMeasurement> mes = fp.getAllForMAC(mac);
 
 			if (!mes.empty()) {
-
 				const float rssi = mes.front().getRSSI();
 				const float s = scale(rssi, -100, -40);
 				const Color c = Color::fromHSV(s*100, 255, 255);
+				p->addFloorRect(fp.pos_m, 1, c);
+			}
 
-				// fingerprint onto the floor
-				p->addFloorRect(fp.pos_m - Point3(0,0,1.3), 1, c);
+		}
+
+	}
+
+	/** SPECIAL PAPER_PLOT OUTPUT */
+	void forPaperNN(Plotty* p, const MACAddress& mac) {
+
+		VAPGrouper vap(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::AVERAGE);
+
+		// get AP/floor
+		std::pair<Floorplan::AccessPoint*, Floorplan::Floor*> _ap = FloorplanHelper::getAP(map, mac);
+		const Floorplan::Floor* floor = _ap.second;
+		const Floorplan::AccessPoint* ap = _ap.first;
+
+		// copy
+		WiFiFingerprints calib = this->calib;
+		for (WiFiFingerprint& fp : calib.getFingerprints()) {
+			fp.measurements = vap.group(fp.measurements);
+		}
+
+		const Point3 apPos3 = ap->getPos(floor);
+		K::GnuplotPoint3 apPos(apPos3.x, apPos3.y, apPos3.z);
+		p->points.add(apPos);
+		p->points.setPointSize(1.5);		// The AP
+
+		// get all positions
+		struct Entry {
+			Point3 pos;
+			float rssi;
+			Entry(Point3 pos, float rssi) : pos(pos), rssi(rssi) {;}
+		};
+		std::vector<Entry> entries;
+
+		// process every fingerprint location
+		for (const WiFiFingerprint& fp : calib.getFingerprints()) {
+
+			// either 0 entries [ap not seen here] or 1 entry due to vap grouping [ap seen here]
+			std::vector<WiFiMeasurement> mes = fp.getAllForMAC(mac);
+
+			if (!mes.empty()) {
+
+				const float rssi = mes.front().getRSSI();
+				Entry e(fp.pos_m - Point3(0,0,1.3), rssi);
+
+				// only floor 0!!!!!
+				if (e.pos.z != 0) {continue;}
+
+				entries.push_back(e);
 
 			}
 
 		}
 
+		const float ss = 1.0;
+
+		for (const Floorplan::Floor* f : map->floors) {
+
+			// only floor 0!!!!!
+			if (f->atHeight != 0) {continue;}
+
+			BBox3 bb = FloorplanHelper::getBBox(f);
+			for (float y = bb.getMin().y; y < bb.getMax().y; y += ss) {
+				for (float x = bb.getMin().x; x < bb.getMax().x; x += ss) {
+
+
+					const Point3 pos(x,y,f->atHeight);
+//					float rssi = 0; float distSum = 0.01;
+//					for (const Entry& e : entries) {
+//						const float dist = e.pos.getDistance(pos);
+//						const float imp = 1.0 / std::pow((dist), 4);
+//						rssi += e.rssi * imp;
+//						distSum += imp;
+//						if (dist < 5) {rssi = e.rssi; distSum = 1;}
+//					}
+//					rssi /= distSum;
+
+					auto comp = [&] (const Entry& e1, const Entry& e2) {return e1.pos.getDistance(pos) < e2.pos.getDistance(pos);};
+					const auto& it = std::min_element(entries.begin(), entries.end(), comp);
+
+					if (it->pos.getDistance(pos) > 2.99) {continue;}
+
+//					const float rssi = it->rssi;
+//					const float s = scale(rssi, -100, -40);
+//					const Color c = Color::fromHSV(s*100, 255, 255);
+//					p->addFloorRect(pos, ss/2, c);
+
+				}
+			}
+		}
+
+		for (Entry e : entries) {
+
+			// FIX ONE FP NEAR THE AP
+			if (e.pos.xy().getDistance(Point2(67.2,32.1)) < 0.1) {
+				e.pos.y += 0.75;
+			}
+
+			p->gp << "set label '\\scriptsize{" << std::round(e.rssi) << "}' front at " << (e.pos.x-2) << "," << e.pos.y << "\n";
+
+			const float rssi = e.rssi;
+			const float s = scale(rssi, -100, -40);
+			const Color c = Color::fromHSV(s*100, 255, 255);
+			p->addFloorRect(e.pos, 2.6, c, 1.4);
+
+		}
+
 	}
 
 	void perAP_avg() {