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

started working on the tex-part

Browse Source 
started working on eval-graphics
ned helper methods
tested some new aspects
some fixes and changes
added some graphics
new test-floorplan
many cleanups
This commit is contained in:
FrankE
2016-02-03 21:17:15 +01:00
parent 8a57b4cdbd
commit c5a5acbbf6
40 changed files with 69163 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/main.cpp
View File

@@ -11,8 +11,12 @@
#include "DijkstraMapper.h"
#include "eval/Eval.h"
#include "eval/Eval1.h"
#include "eval/EvalBase.h"
#include "eval/PaperVisImportance.h"
#include "eval/PaperVisDijkstra.h"
Settings settings;
void testModelWalk() {
@@ -31,6 +35,10 @@ void testModelWalk() {
vis.addFloor(floors.f2, floors.h2);
vis.addFloor(floors.f3, floors.h3);
vis.gp << "set xrange [1100:1800]\n";
vis.gp << "set yrange [4500:5200]\n";
// vis.gp << "set xrange [1000:4000]\n";
// vis.gp << "set yrange [1000:4000]\n";
// vis.gp << "set zrange [0:600]\n";
@@ -48,16 +56,17 @@ void testModelWalk() {
// track the number-of-visits for each node to draw something like a particle-heat-map?
// show the importance factors
// vis.addGrid(grid);
// vis.show();
// sleep(100);
// vis.removeGrid();
vis.addGrid(grid);
vis.show();
sleep(100);
vis.removeGrid();
Distribution::Normal<float> wDist(0.3, 0.3);
Distribution::Normal<float> wHead(0.3, 0.3);
while(true) {
for (GridWalkState<MyGridNode>& state : states) {
state = walk.getDestination(grid, state, std::abs(wDist.draw()) );
state = walk.getDestination(grid, state, std::abs(wDist.draw()), wHead.draw());
}
usleep(1000*80);
vis.showStates(states);
@@ -74,11 +83,14 @@ void testModelWalk() {
int main(void) {
//testModelWalk();
// testModelWalk();
Eval eval;
eval.setEval1();
eval.run();
// Eval1 eval;
// eval.setEval1();
// eval.run();
PaperVisImportance::createImportance();
PaperVisImportance::createPath();
return 0;