From 36c64b503286dd05866ff0fe755d748f89011312 Mon Sep 17 00:00:00 2001 From: Markus Bullmann Date: Wed, 25 Sep 2019 09:25:23 +0200 Subject: [PATCH] Added printErrorStats function --- code/mainProb.cpp | 9 ++------- code/mainTrilat.cpp | 9 ++------- code/misc.h | 10 ++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/mainProb.cpp b/code/mainProb.cpp index c48cb40..b45b21b 100644 --- a/code/mainProb.cpp +++ b/code/mainProb.cpp @@ -259,12 +259,7 @@ static CombinedStats run(Settings::DataSetup setup, int walkIdx, std::str printf(""); } - 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; + printErrorStats(errorStats); return errorStats; } @@ -282,7 +277,7 @@ int mainProp(int argc, char** argv) 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"; for (int i = 0; i < 1; ++i) diff --git a/code/mainTrilat.cpp b/code/mainTrilat.cpp index 103d2e4..008836a 100644 --- a/code/mainTrilat.cpp +++ b/code/mainTrilat.cpp @@ -196,12 +196,7 @@ static CombinedStats run(Settings::DataSetup setup, int walkIdx, std::str plotta.add("estPathRssi", estPathRssi); plotta.frame(); - std::cout << "Walk error:" << "\n"; - 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; + printErrorStats(errorStats); return errorStats; } @@ -218,7 +213,7 @@ int mainTrilat(int argc, char** argv) 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"; for (int i = 0; i < 1; ++i) diff --git a/code/misc.h b/code/misc.h index e4309a8..e565f34 100644 --- a/code/misc.h +++ b/code/misc.h @@ -48,6 +48,16 @@ struct CombinedStats { Stats::Statistics rssi; }; +template +void printErrorStats(const CombinedStats& 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 filterOfflineData(const Offline::FileReader& fr)