Added printErrorStats function

This commit is contained in:
2019-09-25 09:25:23 +02:00
parent a7ad0e346a
commit 36c64b5032
3 changed files with 14 additions and 14 deletions

View File

@@ -259,12 +259,7 @@ static CombinedStats<float> run(Settings::DataSetup setup, int walkIdx, std::str
printf(""); printf("");
} }
std::cout << "Walk error:" << "\n"; printErrorStats(errorStats);
std::cout << "[m] " << std::setw(10) << "mean" << std::setw(10) << "stdDev" << std::setw(10) << "median" << "\n";
std::cout << "FTM " << std::setw(10) << errorStats.ftm.getAvg() << std::setw(10) << errorStats.ftm.getStdDev() << std::setw(10) << errorStats.ftm.getMedian() << "\n";
std::cout << "RSSI " << std::setw(10) << errorStats.rssi.getAvg() << std::setw(10) << errorStats.rssi.getStdDev() << std::setw(10) << errorStats.rssi.getMedian() << "\n";
std::cout << std::endl;
return errorStats; return errorStats;
} }
@@ -282,7 +277,7 @@ int mainProp(int argc, char** argv)
std::string evaluationName = "prologic/tmp"; std::string evaluationName = "prologic/tmp";
for (size_t walkIdx = 0; walkIdx < 6; walkIdx++) for (size_t walkIdx = 0; walkIdx < Settings::data.CurrentPath.training.size(); walkIdx++)
{ {
std::cout << "Executing walk " << walkIdx << "\n"; std::cout << "Executing walk " << walkIdx << "\n";
for (int i = 0; i < 1; ++i) for (int i = 0; i < 1; ++i)

View File

@@ -196,12 +196,7 @@ static CombinedStats<float> run(Settings::DataSetup setup, int walkIdx, std::str
plotta.add("estPathRssi", estPathRssi); plotta.add("estPathRssi", estPathRssi);
plotta.frame(); plotta.frame();
std::cout << "Walk error:" << "\n"; printErrorStats(errorStats);
std::cout << "[m] " << " mean \t stdDev median" << "\n";
std::cout << "FTM " << errorStats.ftm.getAvg() << "\t" << errorStats.ftm.getStdDev() << "\t" << errorStats.ftm.getMedian() << "\n";
std::cout << "RSSI " << errorStats.rssi.getAvg() << "\t" << errorStats.rssi.getStdDev() << "\t" << errorStats.rssi.getMedian() << "\n";
std::cout << std::endl;
return errorStats; return errorStats;
} }
@@ -218,7 +213,7 @@ int mainTrilat(int argc, char** argv)
std::string evaluationName = "prologic/tmp"; std::string evaluationName = "prologic/tmp";
for (size_t walkIdx = 0; walkIdx < 6; walkIdx++) for (size_t walkIdx = 0; walkIdx < Settings::data.CurrentPath.training.size(); walkIdx++)
{ {
std::cout << "Executing walk " << walkIdx << "\n"; std::cout << "Executing walk " << walkIdx << "\n";
for (int i = 0; i < 1; ++i) for (int i = 0; i < 1; ++i)

View File

@@ -48,6 +48,16 @@ struct CombinedStats {
Stats::Statistics<T> rssi; Stats::Statistics<T> rssi;
}; };
template<typename T>
void printErrorStats(const CombinedStats<T>& errorStats)
{
std::cout << "Walk error:" << "\n";
std::cout << "[m] " << std::setw(10) << "mean" << std::setw(10) << "stdDev" << std::setw(10) << "median" << "\n";
std::cout << "FTM " << std::setw(10) << errorStats.ftm.getAvg() << std::setw(10) << errorStats.ftm.getStdDev() << std::setw(10) << errorStats.ftm.getMedian() << "\n";
std::cout << "RSSI " << std::setw(10) << errorStats.rssi.getAvg() << std::setw(10) << errorStats.rssi.getStdDev() << std::setw(10) << errorStats.rssi.getMedian() << "\n";
std::cout << std::endl;
}
static std::vector<WifiMeas> filterOfflineData(const Offline::FileReader& fr) static std::vector<WifiMeas> filterOfflineData(const Offline::FileReader& fr)