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

adjusted to match new dijkstra interface

Browse Source
This commit is contained in:
FrankE
2016-03-18 10:20:32 +01:00
parent 4c1e73e3cf
commit 1d64cedd29
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/CMakeLists.txt
View File

@@ -67,6 +67,7 @@ ADD_DEFINITIONS(
-O2 -O2
-DWITH_TESTS -DWITH_TESTS
-DWITH_ASSERTIONS -DWITH_ASSERTIONS
-DWITH_DEBUG_LOG
) )

6
code/eval/PaperVisImportance.h
View File

@@ -124,7 +124,7 @@ public:
DijkstraMapperNormal accNormal(grid); DijkstraMapperNormal accNormal(grid);
// path without importance // path without importance
dijkstra.build(gnStart, gnStart, accNormal); dijkstra.build(&gnStart, accNormal);
DijkstraPath<MyGridNode> pathNormal(dijkstra.getNode(gnEnd), dijkstra.getNode(gnStart)); DijkstraPath<MyGridNode> pathNormal(dijkstra.getNode(gnEnd), dijkstra.getNode(gnStart));
// stamp importance information onto the grid-nodes // stamp importance information onto the grid-nodes
@@ -132,7 +132,7 @@ public:
gridImp.addImportance(grid, h0.cm()); gridImp.addImportance(grid, h0.cm());
// path WITH importance // path WITH importance
dijkstra.build(gnStart, gnStart, accImp); dijkstra.build(&gnStart, accImp);
DijkstraPath<MyGridNode> pathImp(dijkstra.getNode(gnEnd), dijkstra.getNode(gnStart)); DijkstraPath<MyGridNode> pathImp(dijkstra.getNode(gnEnd), dijkstra.getNode(gnStart));
// build plot // build plot
@@ -240,7 +240,7 @@ public:
// path WITH importance // path WITH importance
DijkstraMapper accImp(grid); DijkstraMapper accImp(grid);
dijkstra.build(gnStart, gnStart, accImp); dijkstra.build(&gnStart, accImp);
DijkstraPath<MyGridNode> pathImp(dijkstra.getNode(gnEnd), dijkstra.getNode(gnStart)); DijkstraPath<MyGridNode> pathImp(dijkstra.getNode(gnEnd), dijkstra.getNode(gnStart));
// stamp distance information onto the grid // stamp distance information onto the grid