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

Merge branch 'master' of https://git.frank-ebner.de/FHWS/museumLoc

Browse Source
This commit is contained in:
Markus Bullmann
2018-07-31 15:38:14 +02:00
parent 3aaa470422 1e52b377dc
commit 713494a675
7 changed files with 241 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Settings.h
View File

@@ -62,13 +62,14 @@ namespace Settings {
constexpr float WAF = -11.0;
const bool optimize = true;
const bool useRegionalOpt = true;
// 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);
const VAPGrouper vg_eval = VAPGrouper(VAPGrouper::Mode::LAST_MAC_DIGIT_TO_ZERO, VAPGrouper::Aggregation::MAXIMUM, VAPGrouper::TimeAggregation::AVERAGE, 1);
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 {
@@ -89,9 +90,13 @@ namespace Settings {
constexpr bool useMainThread = false; // perform filtering in the main thread
}
const std::string mapDir = "../map/";
const std::string dataDir = "../measurements/";
const std::string errorDir = dataDir + "results/";
// const std::string mapDir = "../map/";
// const std::string dataDir = "../measurements/";
// const std::string errorDir = dataDir + "results/";
const std::string mapDir = "/apps/museum/maps/";
const std::string dataDir = "/apps/";
const std::string errorDir = dataDir + "museum/results/";
/** describes one dataset (map, training, parameter-estimation, ...) */
struct DataSetup {
@@ -171,7 +176,7 @@ namespace Settings {
dataDir + "museum/Nexus/Path3_4519.csv",
dataDir + "museum/Nexus/Path3_5929.csv",
dataDir + "museum/Pixel/Path3_6307.csv",
dataDir + "museum/Pixel/Path3_5451.csv",
//dataDir + "museum/Pixel/Path3_5451.csv", //geht nur bis gt-punkt 31
dataDir + "museum/Pixel/Path3_9243.csv",
//dataDir + "museum/Samsung/Path3_7610.csv",
//dataDir + "museum/Samsung/Path3_7819.csv"