Added plotta, added probabilistic code
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
|
||||
#include <Indoor/grid/GridPoint.h>
|
||||
#include <Indoor/data/Timestamp.h>
|
||||
#include <Indoor/sensors/radio/VAPGrouper.h>
|
||||
@@ -93,7 +95,7 @@ namespace Settings {
|
||||
const std::string dataDir = "../measurements/data/";
|
||||
const std::string errorDir = "../measurements/error/";
|
||||
|
||||
const bool UseKalman = true;
|
||||
const bool UseKalman = false;
|
||||
|
||||
/** describes one dataset (map, training, parameter-estimation, ...) */
|
||||
|
||||
@@ -102,6 +104,27 @@ namespace Settings {
|
||||
const MACAddress NUC3("1c:1b:b5:ef:a2:9a");
|
||||
const MACAddress NUC4("1c:1b:b5:ec:d1:82");
|
||||
|
||||
static int nucIndex(const MACAddress& addr)
|
||||
{
|
||||
if (addr == Settings::NUC1) return 0;
|
||||
if (addr == Settings::NUC2) return 1;
|
||||
if (addr == Settings::NUC3) return 2;
|
||||
if (addr == Settings::NUC4) return 3;
|
||||
else assert(false);
|
||||
}
|
||||
|
||||
static MACAddress nucFromIndex(int idx)
|
||||
{
|
||||
switch (idx)
|
||||
{
|
||||
case 0: return NUC1;
|
||||
case 1: return NUC2;
|
||||
case 2: return NUC3;
|
||||
case 3: return NUC4;
|
||||
default: assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
struct NUCSettings
|
||||
{
|
||||
int ID = 0;
|
||||
@@ -119,6 +142,11 @@ namespace Settings {
|
||||
std::vector<std::string> training;
|
||||
std::unordered_map<MACAddress, NUCSettings> NUCs;
|
||||
std::vector<int> gtPath;
|
||||
|
||||
NUCSettings nucInfo(int idx) const
|
||||
{
|
||||
return NUCs.at(nucFromIndex(idx));
|
||||
}
|
||||
};
|
||||
|
||||
/** all configured datasets */
|
||||
@@ -233,10 +261,10 @@ namespace Settings {
|
||||
dataDir + "Pixel2/path5/1560158988785_6_6.csv"
|
||||
},
|
||||
{
|
||||
{ NUC1, {1, { 8.1, 18.7, 0.8}, 2.00, 0, 3.0f} }, // NUC 1
|
||||
{ NUC2, {2, { 8.4, 27.3, 0.8}, 1.25, 0, 3.0f} }, // NUC 2
|
||||
{ NUC3, {3, {21.3, 19.3, 0.8}, 2.75, 0, 3.0f} }, // NUC 3
|
||||
{ NUC4, {4, {20.6, 26.8, 0.8}, 2.25, 0, 3.0f} }, // NUC 4
|
||||
{ NUC1, {1, { 8.1, 18.7, 0.8}, 2.00, 3.375, 3.0f} }, // NUC 1
|
||||
{ NUC2, {2, { 8.4, 27.3, 0.8}, 1.25, 3.375, 3.0f} }, // NUC 2
|
||||
{ NUC3, {3, {21.3, 19.3, 0.8}, 2.75, 3.250, 3.0f} }, // NUC 3
|
||||
{ NUC4, {4, {20.6, 26.8, 0.8}, 2.25, 3.375, 3.0f} }, // NUC 4
|
||||
},
|
||||
{ 0, 1, 2, 11, 10, 9, 10, 11, 2, 6, 5, 12, 13, 12, 5, 6, 7, 8 }
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user