next commit

This commit is contained in:
2017-04-05 18:45:00 +02:00
parent 6171582b40
commit b2adb16b49
18 changed files with 1602 additions and 360 deletions

View File

@@ -20,6 +20,7 @@ namespace Settings {
const std::string wifiAllOptPar = pathWiFi + "allOptPar.xml";
const std::string wifiEachOptPar = pathWiFi + "eachOptPar.xml";
const std::string wifiEachOptParPos = pathWiFi + "eachOptParPos.xml";
const std::string wifiEachOptParPosNoStairNoOut = pathWiFi + "eachOptParPosNoStairNoOut.xml";
@@ -33,10 +34,10 @@ namespace Settings {
float smartphoneAboveGround = 1.3;
namespace IMU {
const float turnSigma = 1.5 + 0.5;//1.5;
const float stepLength = 0.85;
const float stepSigma = 0.40;
const float absHeadSigma = 90;
const float turnSigma = 1.25;//1.5;
const float stepLength = 0.70;
const float stepSigma = 0.45;
const float absHeadSigma = 80;
}
namespace Grid {
@@ -57,19 +58,19 @@ namespace Settings {
namespace WiFiModel {
constexpr float sigma = 8.0;
constexpr float sigma = 11.0;
/** if the wifi-signal-strengths are stored on the grid-nodes, this needs a grid rebuild! */
constexpr float TXP = -44;
constexpr float EXP = 2.5;
constexpr float WAF = -8.0;
// constexpr float TXP = -44;
// constexpr float EXP = 2.5;
// constexpr float WAF = -8.0;
// constexpr float TXP = -64.5896;
// constexpr float EXP = 1.25986;
// constexpr float WAF = -2.47467;
// how to perform VAP grouping
const VAPGrouper vg_calib = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::AVERAGE);
const VAPGrouper vg_eval = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::AVERAGE);
const VAPGrouper vg_calib = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::MEDIAN);
const VAPGrouper vg_eval = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::MEDIAN);
}