FHWS/FtmPrologic
Archived
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed silly compiler issues under linux and gcc

Browse Source
This commit is contained in:
toni
2019-09-18 10:47:48 +02:00
parent 22c2bc95c9
commit 51117d7559
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/CMakeLists.txt
View File

@@ -69,9 +69,9 @@ else()
# system specific compiler flags # system specific compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
#-std=gnu++14 -std=gnu++17
-lstdc++fs #-lstdc++fs
-Wall -Wall
-Werror=return-type -Werror=return-type

6
code/Plotta.h
View File

@@ -136,14 +136,14 @@ namespace Plotta
} }
template<> template<>
static plottastream& operator<<(plottastream& stream, const float& value) inline plottastream& operator<<(plottastream& stream, const float& value)
{ {
return stream << (isnan(value) ? "float(\"nan\")" : std::to_string(value)); return stream << (isnan(value) ? "float(\"nan\")" : std::to_string(value));
} }
template<> template<>
static plottastream& operator<<(plottastream& stream, const Point2& value) inline plottastream& operator<<(plottastream& stream, const Point2& value)
{ {
return stream << std::initializer_list<float>{ value.x, value.y }; return stream << std::initializer_list<float>{ value.x, value.y };
} }
} }

6
code/main.cpp
View File

@@ -204,11 +204,11 @@ static Stats::Statistics<float> run(Settings::DataSetup setup, int walkIdx, std:
// error file // error file
const long int t = static_cast<long int>(time(NULL)); const long int t = static_cast<long int>(time(NULL));
auto evalDir = std::experimental::filesystem::path(Settings::errorDir); auto evalDir = std::filesystem::path(Settings::errorDir);
evalDir.append(folder); evalDir.append(folder);
if (!std::experimental::filesystem::exists(evalDir)) { if (!std::filesystem::exists(evalDir)) {
std::experimental::filesystem::create_directory(evalDir); std::filesystem::create_directory(evalDir);
} }
std::ofstream errorFile; std::ofstream errorFile;

8
code/mainFtm.cpp
View File

@@ -53,11 +53,11 @@ static Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std:
// error file // error file
const long int t = static_cast<long int>(time(NULL)); const long int t = static_cast<long int>(time(NULL));
auto evalDir = std::experimental::filesystem::path(Settings::errorDir); auto evalDir = std::filesystem::path(Settings::errorDir);
evalDir.append(folder); evalDir.append(folder);
if (!std::experimental::filesystem::exists(evalDir)) { if (!std::filesystem::exists(evalDir)) {
std::experimental::filesystem::create_directory(evalDir); std::filesystem::create_directory(evalDir);
} }
std::ofstream errorFile; std::ofstream errorFile;
@@ -201,7 +201,7 @@ static Stats::Statistics<float> run(Settings::DataSetup setup, int numFile, std:
plot.addEstimationNode(est.pos.pos); plot.addEstimationNode(est.pos.pos);
plot.setActivity((int) act.get()); plot.setActivity((int) act.get());
plot.splot.getView().setCamera(0, 0); plot.splot.getView().setCamera(0, 0);
plot.splot.getView().setEqualXY(true); //plot.splot.getView().setEqualXY(true);
plot.plot(); plot.plot();

6
code/trilateration.h
View File

@@ -5,8 +5,8 @@
#include <eigen3/Eigen/Eigen> #include <eigen3/Eigen/Eigen>
#include "..\Indoor\geo\Point2.h" #include <Indoor/geo/Point2.h>
#include "..\Indoor\geo\Point3.h" #include <Indoor/geo/Point3.h>
namespace Trilateration namespace Trilateration
{ {
@@ -92,4 +92,4 @@ namespace Trilateration
return Point3(location.x(), location.y(), location.z()); return Point3(location.x(), location.y(), location.z());
} }
} }