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

Minor fixes for MSVC

Browse Source
This commit is contained in:
Markus Bullmann
2018-03-28 10:57:08 +02:00
parent 97ce18f5f1
commit 6286f02db7
2 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main.cpp
View File

@@ -1,4 +1,4 @@
#include "main.h"
//#include "main.h"
#include "navMesh/mesh.h"
#include "navMesh/filter.h"
@@ -8,6 +8,7 @@
#include <memory>
#include <thread>
#include <experimental/filesystem>
#include <Indoor/floorplan/v2/FloorplanReader.h>
#include <Indoor/sensors/radio/model/WiFiModelLogDistCeiling.h>
@@ -24,7 +25,6 @@
#include <Indoor/smc/filtering/resampling/ParticleFilterResamplingSimpleImpoverishment.h>
#include <sys/stat.h>
Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std::string folder) {
@@ -34,24 +34,23 @@ Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std::string
WiFiFingerprints fingerprints(setup.fingerprints);
std::ifstream inp(setup.wifiModel, std::ifstream::binary);
//ground truth
// ground truth
std::vector<int> gtPath;
for(int i = 0; i < setup.numGTPoints; ++i){gtPath.push_back(i);}
Interpolator<uint64_t, Point3> gtInterpolator = fr.getGroundTruthPath(map, gtPath);
Stats::Statistics<float> errorStats;
//error file
// error file
const long int t = static_cast<long int>(time(NULL));
const std::string evalDir = Settings::errorDir + folder;
struct stat statStruct;
stat(evalDir.c_str(), &statStruct);
if(!S_ISDIR(statStruct.st_mode)){
if(mkdir(evalDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == -1){
Assert::doThrow("Eval folder couldn't be created!");
}
}
auto evalDir = std::experimental::filesystem::path(Settings::errorDir);
evalDir.append(folder);
if (!std::experimental::filesystem::exists(evalDir)) {
std::experimental::filesystem::create_directory(evalDir);
}
std::ofstream errorFile;
errorFile.open (evalDir + "/" + std::to_string(numFile) + "_" + std::to_string(t) + ".csv");
errorFile.open (evalDir.string() + "/" + std::to_string(numFile) + "_" + std::to_string(t) + ".csv");
// wifi
@@ -219,7 +218,7 @@ Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std::string
if(ts.ms() == 13410 || ts.ms() == 20802){
std::ofstream plotFile;
plotFile.open(evalDir + "/" + std::to_string(numFile) + "_" + std::to_string(t) + "_plot_zwischendrin_" + std::to_string(ts.ms()) + ".gp");
plotFile.open(evalDir.string() + "/" + std::to_string(numFile) + "_" + std::to_string(t) + "_plot_zwischendrin_" + std::to_string(ts.ms()) + ".gp");
plot.saveToFile(plotFile);
plotFile.close();
}