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

added per-floor optimization

Browse Source
This commit is contained in:
k-a-z-u
2018-05-16 13:05:17 +02:00
parent 4b90ba9ca4
commit 1e52b377dc
3 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Settings.h
View File

@@ -56,13 +56,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 {
@@ -83,9 +84,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 {