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

minor changes

Browse Source
This commit is contained in:
kazu
2018-06-06 08:56:58 +02:00
parent 06f05891cc
commit 8a08ae32d8
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
walky/ParticleWalkNavMesh.h
View File

@@ -4,6 +4,8 @@
#include "file.h" #include "file.h"
#include <Indoor/math/distribution/Const.h>
#include <Indoor/floorplan/v2/Floorplan.h> #include <Indoor/floorplan/v2/Floorplan.h>
#include <Indoor/floorplan/v2/FloorplanReader.h> #include <Indoor/floorplan/v2/FloorplanReader.h>
#include <Indoor/floorplan/v2/FloorplanHelper.h> #include <Indoor/floorplan/v2/FloorplanHelper.h>
@@ -12,7 +14,7 @@
#include <Indoor/navMesh/NavMesh.h> #include <Indoor/navMesh/NavMesh.h>
#include <Indoor/navMesh/NavMeshFactory.h> #include <Indoor/navMesh/NavMeshFactory.h>
#include <Indoor/navMesh/NavMeshDebug.h> //#include <Indoor/navMesh/NavMeshDebug.h>
#include <Indoor/navMesh/walk/NavMeshWalkSimple.h> #include <Indoor/navMesh/walk/NavMeshWalkSimple.h>
#include <Indoor/navMesh/walk/NavMeshWalkRandom.h> #include <Indoor/navMesh/walk/NavMeshWalkRandom.h>
#include <Indoor/navMesh/walk/NavMeshWalkSemiRandom.h> #include <Indoor/navMesh/walk/NavMeshWalkSemiRandom.h>
@@ -200,8 +202,8 @@ public:
// Offline::FileReader reader(File::getData("/walks/walk_in_circles_around_hole.csv")); //const Point3 startP3 = Point3(0,0,0); // Offline::FileReader reader(File::getData("/walks/walk_in_circles_around_hole.csv")); //const Point3 startP3 = Point3(0,0,0);
// const float startHead = 0; // const float startHead = 0;
Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(File::getData("/walks/walk_stair_down_and_up_again_map_b.xml"));const Point3 startP3 = Point3(0,0,6); Floorplan::IndoorMap* map = Floorplan::Reader::readFromFile(File::getData("walk_stair_down_and_up_again_map_b.xml"));const Point3 startP3 = Point3(0,0,6);
Offline::FileReader reader(File::getData("/walks/walk_stair_down_and_up_again.csv")); Offline::FileReader reader(File::getData("walk_stair_down_and_up_again.csv"));
const float startHead = 0; const float startHead = 0;
Offline::FilePlayer player(&reader, &test); Offline::FilePlayer player(&reader, &test);
@@ -223,7 +225,7 @@ public:
vizNM.addMesh(mesh); vizNM.addMesh(mesh);
#define WALK_MODE 4 #define WALK_MODE 1
//#define WALK_USE_MANY //#define WALK_USE_MANY
#if (WALK_MODE==1) #if (WALK_MODE==1)
@@ -432,7 +434,7 @@ public:
PERF_DUMP(); PERF_DUMP();
//std::this_thread::sleep_for(std::chrono::milliseconds(50)); std::this_thread::sleep_for(std::chrono::milliseconds(35));
} }

2
walky/ProbViz.h
View File

@@ -8,7 +8,7 @@
#include <KLib/misc/gnuplot/GnuplotSplot.h> #include <KLib/misc/gnuplot/GnuplotSplot.h>
#include <KLib/misc/gnuplot/GnuplotSplotElementHeatMap.h> #include <KLib/misc/gnuplot/GnuplotSplotElementHeatMap.h>
#include <Indoor/math/Distributions.h> #include <Indoor/math/distribution/Normal.h>
#include <vector> #include <vector>
class ProbViz { class ProbViz {

4
walky/file.h
View File

@@ -5,10 +5,10 @@
namespace File { namespace File {
const std::string basePath = "/apps/paper/diss/code/walkModel/"; const std::string basePath = "/apps/paper/DSem1/walky/";
//const std::string basePath = "/mnt/vm/paper/diss/code/walkModel/"; //const std::string basePath = "/mnt/vm/paper/diss/code/walkModel/";
const std::string dataPath = "/apps/paper/diss/data/"; const std::string dataPath = "/apps/paper/DSem1/walky/";
//const std::string dataPath = "/mnt/vm/paper/diss/data"; //const std::string dataPath = "/mnt/vm/paper/diss/data";
static inline std::string get(const std::string& name) { static inline std::string get(const std::string& name) {