FHWS/FtmPrologic
Archived
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unused stuff from settings.h

Browse Source
This commit is contained in:
Markus Bullmann
2019-10-08 13:37:06 +02:00
parent 704b64bfcf
commit 9b9feaa2c2
1 changed files with 4 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
code/Settings.h
View File

@@ -2,95 +2,10 @@
#include <cassert> #include <cassert>
#include <Indoor/grid/GridPoint.h>
#include <Indoor/data/Timestamp.h>
#include <Indoor/sensors/radio/VAPGrouper.h>
namespace Settings { namespace Settings {
const bool useKLB = false;
const int numParticles = 5000; const int numParticles = 5000;
const int numBSParticles = 50;
namespace IMU {
const float turnSigma = 2.5; // 3.5
const float stepLength = 1.00;
const float stepSigma = 0.15; //toni changed
}
const float smartphoneAboveGround = 1.3;
const float offlineSensorSpeedup = 2;
namespace Grid {
constexpr int gridSize_cm = 20;
}
namespace Smoothing {
const bool activated = true;
const double stepLength = 0.7;
const double stepSigma = 0.2;
const double headingSigma = 25.0;
const double zChange = 0.0; // mu change in height between two time steps
const double zSigma = 0.1;
const int lag = 5;
}
namespace KDE {
const Point2 bandwidth(1,1);
const float gridSize = 0.2;
}
namespace KDE3D {
const Point3 bandwidth(1, 1, 1);
const Point3 gridSize(0.2, 0.2, 1); // in meter
}
//const GridPoint destination = GridPoint(70*100, 35*100, 0*100); // use destination
const GridPoint destination = GridPoint(0,0,0); // do not use destination
namespace SensorDebug {
const Timestamp updateEvery = Timestamp::fromMS(200);
}
namespace WiFiModel {
constexpr float sigma = 8.0;
/** if the wifi-signal-strengths are stored on the grid-nodes, this needs a grid rebuild! */
constexpr float TXP = -45;
constexpr float EXP = 2.3;
constexpr float WAF = -11.0;
const bool optimize = false;
const bool useRegionalOpt = false;
// how to perform VAP grouping. see
// - calibration in Controller.cpp
// - eval in Filter.h
// NOTE: maybe the UAH does not allow valid VAP grouping? delete the grid and rebuild without!
const VAPGrouper vg_calib = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::MAXIMUM, VAPGrouper::TimeAggregation::AVERAGE, 1); // Frank: WAS MAXIMUM
const VAPGrouper vg_eval = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::MAXIMUM, VAPGrouper::TimeAggregation::AVERAGE, 1); // Frank: WAS MAXIMUM
}
namespace BeaconModel {
constexpr float sigma = 8.0;
constexpr float TXP = -71;
constexpr float EXP = 1.5;
constexpr float WAF = -20.0; //-5 //20??
}
namespace MapView3D {
const int maxColorPoints = 1000;
constexpr int fps = 15;
const Timestamp msPerFrame = Timestamp::fromMS(1000/fps);
}
namespace Filter {
const Timestamp updateEvery = Timestamp::fromMS(500);
constexpr bool useMainThread = false; // perform filtering in the main thread
}
const std::string mapDir = "../map/"; const std::string mapDir = "../map/";
const std::string dataDir = "../measurements/data/"; const std::string dataDir = "../measurements/data/";
const std::string errorDir = "../measurements/error/"; const std::string errorDir = "../measurements/error/";
@@ -111,7 +26,9 @@ namespace Settings {
if (addr == Settings::NUC2) return 1; if (addr == Settings::NUC2) return 1;
if (addr == Settings::NUC3) return 2; if (addr == Settings::NUC3) return 2;
if (addr == Settings::NUC4) return 3; if (addr == Settings::NUC4) return 3;
else assert(false); else {
assert(false); return 0;
}
} }
static MACAddress nucFromIndex(int idx) static MACAddress nucFromIndex(int idx)
@@ -122,7 +39,7 @@ namespace Settings {
case 1: return NUC2; case 1: return NUC2;
case 2: return NUC3; case 2: return NUC3;
case 3: return NUC4; case 3: return NUC4;
default: assert(false); default: assert(false); return NUC1;
} }
} }