toni/IPIN2016
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

final version of paper

Browse Source
This commit is contained in:
toni
2016-06-02 15:57:53 +02:00
parent 0f4435f86a
commit 927bec3e60
14 changed files with 119 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
code/eval/Eval1.h
View File

@@ -247,9 +247,9 @@ public:
void bergwerk_path1_nexus_simple() {
void bergwerk_path1_nexus_simple(std::string name) {
runName = "bergwerk_path1_nexus_simple";
runName = name;
BarometerEvaluation::barometerSigma = 0.10;
sr = new SensorReader("./measurements/bergwerk/path1/nexus/vor/1454775984079.csv"); // forward
@@ -264,6 +264,7 @@ public:
}
//bergwerk
void bergwerk_path1_nexus_imp() {
@@ -280,9 +281,9 @@ public:
}
void bergwerk_path1_nexus_multi() {
void bergwerk_path1_nexus_multi(std::string name) {
runName = "bergwerk_path1_nexus_multi";
runName = name;
BarometerEvaluation::barometerSigma = 0.10;
sr = new SensorReader("./measurements/bergwerk/path1/nexus/vor/1454775984079.csv"); // forward
@@ -322,9 +323,9 @@ public:
gtw = getGroundTruthWay(*sr, floors.gtwp, path2dbl);
}
void bergwerk_path2_nexus_simple() {
void bergwerk_path2_nexus_simple(std::string name) {
runName = "bergwerk_path2_nexus_simple";
runName = name;
bergwerk_path2_nexus();
for (auto& n : grid) {n.imp = 1;} // remove importance
@@ -344,9 +345,9 @@ public:
}
void bergwerk_path2_nexus_multi() {
void bergwerk_path2_nexus_multi(std::string name) {
runName = "bergwerk_path2_nexus_multi";
runName = name;
bergwerk_path2_nexus();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path2dbl.back()]) );
@@ -377,9 +378,9 @@ public:
gtw = getGroundTruthWay(*sr, floors.gtwp, path3dbl);
}
void bergwerk_path3_nexus_simple() {
void bergwerk_path3_nexus_simple(std::string name) {
runName = "bergwerk_path3_nexus_simple";
runName = name;
bergwerk_path3_nexus();
for (auto& n : grid) {n.imp = 1;} // remove importance
@@ -399,9 +400,9 @@ public:
}
void bergwerk_path3_nexus_multi() {
void bergwerk_path3_nexus_multi(std::string name) {
runName = "bergwerk_path3_nexus_multi";
runName = name;
bergwerk_path3_nexus();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path3dbl.back()]) );
@@ -438,9 +439,9 @@ public:
//}
}
void bergwerk_path4_nexus_simple() {
void bergwerk_path4_nexus_simple(std::string name) {
runName = "bergwerk_path4_nexus_simple";
runName = name;
bergwerk_path4_nexus();
for (auto& n : grid) {n.imp = 1;} // remove importance
@@ -460,9 +461,9 @@ public:
}
void bergwerk_path4_nexus_multi() {
void bergwerk_path4_nexus_multi(std::string name) {
runName = "bergwerk_path4_nexus_multi";
runName = name;
bergwerk_path4_nexus();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path4dbl.back()]) );
@@ -493,16 +494,16 @@ public:
gtw = getGroundTruthWay(*sr, floors.gtwp, path1dbl);
}
void bergwerk_path1_galaxy_simple() {
runName = "bergwerk_path1_galaxy_simple";
void bergwerk_path1_galaxy_simple(std::string name) {
runName = name;
bergwerk_path1_galaxy();
for (auto& n : grid) {n.imp = 1;} // remove importance
GridWalkSimpleControl<MyGridNode>* walk = new GridWalkSimpleControl<MyGridNode>();
pf->setTransition( std::unique_ptr<MyTransition>( new MyTransition(grid, *walk)) );
}
void bergwerk_path1_galaxy_multi() {
runName = "bergwerk_path1_galaxy_multi";
void bergwerk_path1_galaxy_multi(std::string name) {
runName = name;
bergwerk_path1_galaxy();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path1dbl.back()]) );
GridWalkPathControl<MyGridNode>* walk = new GridWalkPathControl<MyGridNode>(grid, DijkstraMapper(grid), end);
@@ -530,16 +531,16 @@ public:
gtw = getGroundTruthWay(*sr, floors.gtwp, path2dbl);
}
void bergwerk_path2_galaxy_simple() {
runName = "bergwerk_path2_galaxy_simple";
void bergwerk_path2_galaxy_simple(std::string name) {
runName = name;
bergwerk_path2_galaxy();
for (auto& n : grid) {n.imp = 1;} // remove importance
GridWalkSimpleControl<MyGridNode>* walk = new GridWalkSimpleControl<MyGridNode>();
pf->setTransition( std::unique_ptr<MyTransition>( new MyTransition(grid, *walk)) );
}
void bergwerk_path2_galaxy_multi() {
runName = "bergwerk_path2_galaxy_multi";
void bergwerk_path2_galaxy_multi(std::string name) {
runName = name;
bergwerk_path2_galaxy();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path2dbl.back()]) );
GridWalkPathControl<MyGridNode>* walk = new GridWalkPathControl<MyGridNode>(grid, DijkstraMapper(grid), end);
@@ -567,16 +568,16 @@ public:
gtw = getGroundTruthWay(*sr, floors.gtwp, path3dbl);
}
void bergwerk_path3_galaxy_simple() {
runName = "bergwerk_path3_galaxy_simple";
void bergwerk_path3_galaxy_simple(std::string name) {
runName = name;
bergwerk_path3_galaxy();
for (auto& n : grid) {n.imp = 1;} // remove importance
GridWalkSimpleControl<MyGridNode>* walk = new GridWalkSimpleControl<MyGridNode>();
pf->setTransition( std::unique_ptr<MyTransition>( new MyTransition(grid, *walk)) );
}
void bergwerk_path3_galaxy_multi() {
runName = "bergwerk_path3_galaxy_multi";
void bergwerk_path3_galaxy_multi(std::string name) {
runName = name;
bergwerk_path3_galaxy();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path3dbl.back()]) );
GridWalkPathControl<MyGridNode>* walk = new GridWalkPathControl<MyGridNode>(grid, DijkstraMapper(grid), end);
@@ -606,16 +607,16 @@ public:
gtw = getGroundTruthWay(*sr, floors.gtwp, path4dbl);
}
void bergwerk_path4_galaxy_simple() {
runName = "bergwerk_path4_galaxy_simple";
void bergwerk_path4_galaxy_simple(std::string name) {
runName = name;
bergwerk_path4_galaxy();
for (auto& n : grid) {n.imp = 1;} // remove importance
GridWalkSimpleControl<MyGridNode>* walk = new GridWalkSimpleControl<MyGridNode>();
pf->setTransition( std::unique_ptr<MyTransition>( new MyTransition(grid, *walk)) );
}
void bergwerk_path4_galaxy_multi() {
runName = "bergwerk_path4_galaxy_multi";
void bergwerk_path4_galaxy_multi(std::string name) {
runName = name;
bergwerk_path4_galaxy();
MyGridNode& end = (MyGridNode&)grid.getNodeFor( conv(floors.gtwp[path4dbl.back()]) );
GridWalkPathControl<MyGridNode>* walk = new GridWalkPathControl<MyGridNode>(grid, DijkstraMapper(grid), end);