mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] Add const to DijkstraRouter.

Browse source
This commit is contained in:
Denis Koronchik 2014-07-13 21:29:33 +02:00 • committed by Alex Zolotarev
parent dd9a0b7940
commit 687f4994db
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routing/dijkstra_router.cpp
View file

@ -28,9 +28,9 @@ void DijkstraRouter::CalculateRoute(vector<RoadPos> const & startPos, vector<Roa
set<RoadPos> startSet(startPos.begin(), startPos.end());
while (!m_queue.empty())
{
double cost = m_queue.top().m_cost;
ShortestPath const * pEntry = m_queue.top().m_pEntry;
ShortestPath const * pParentEntry = m_queue.top().m_pParentEntry;
double const cost = m_queue.top().m_cost;
ShortestPath const * const pEntry = m_queue.top().m_pEntry;
ShortestPath const * const pParentEntry = m_queue.top().m_pParentEntry;
m_queue.pop();
LOG(LDEBUG, ("Visiting", pEntry->GetPos(), "with cost", cost));
@ -57,11 +57,8 @@ void DijkstraRouter::CalculateRoute(vector<RoadPos> const & startPos, vector<Roa
{
LOG(LDEBUG, ("Found result!"));
// Reached one of the starting points!
while (pEntry != ShortestPath::FINAL_POS)
{
route.push_back(pEntry->GetPos());
pEntry = pEntry->GetParentEntry();
}
for (ShortestPath const * pE = pEntry; pE != ShortestPath::FINAL_POS; pE = pE->GetParentEntry())
route.push_back(pE->GetPos());
LOG(LDEBUG, (route));
return;
}