FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

fixed fallback step-logger

Browse Source 
moved vap-grouping to settings-file
sanity-checks
This commit is contained in:
FrankE
2016-10-02 18:28:17 +02:00
parent a4a8593023
commit 3a1cd1bccc
9 changed files with 95 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nav/Filter.h
View File

@@ -154,9 +154,6 @@ class PFEval : public K::ParticleFilterEvaluation<MyState, MyObservation> {
//WiFiObserverFree wiFiProbability; // free-calculation
WiFiObserverGrid<MyGridNode> wiFiProbability; // grid-calculation
// how to perform VAP grouping. also see calibration in Controller.cpp
VAPGrouper vg = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::AVERAGE);
// smartphone is 1.3 meter above ground
const Point3 person = Point3(0,0,Settings::smartphoneAboveGround);
@@ -203,7 +200,7 @@ public:
// vap-grouping
const int numAP1 = observation.wifi.entries.size();
const WiFiMeasurements wifiObs = vg.group(_observation.wifi);
const WiFiMeasurements wifiObs = Settings::WiFiModel::vg_eval.group(_observation.wifi);
const int numAP2 = wifiObs.entries.size();
Log::add("Filter", "VAP: " + std::to_string(numAP1) + " -> " + std::to_string(numAP2));