diff options
author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-05-29 16:37:48 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:51:31 +0300 |
commit | 97f1f8ce8402e6c397e33d65ac3597d0bc469bd3 (patch) | |
tree | 4a93c42679945074b600e218f3dae17779d2194e /routing/cross_mwm_road_graph.cpp | |
parent | 34ed0224ed338825c9bdabb353ad1ddc52546b01 (diff) |
another PR fixes
Diffstat (limited to 'routing/cross_mwm_road_graph.cpp')
-rw-r--r-- | routing/cross_mwm_road_graph.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/routing/cross_mwm_road_graph.cpp b/routing/cross_mwm_road_graph.cpp index 0350e34733..37017f458e 100644 --- a/routing/cross_mwm_road_graph.cpp +++ b/routing/cross_mwm_road_graph.cpp @@ -141,20 +141,20 @@ void CrossMwmGraph::GetOutgoingEdgesListImpl(TCrossPair const & v, currentMapping->LoadCrossContext(); CrossRoutingContextReader const & currentContext = currentMapping->m_crossContext; - auto current_in_iterators = currentContext.GetIngoingIterators(); - auto current_out_iterators = currentContext.GetOutgoingIterators(); + auto inRange = currentContext.GetIngoingIterators(); + auto outRange = currentContext.GetOutgoingIterators(); // Find income node. - auto iit = current_in_iterators.first; - while (iit != current_in_iterators.second) + auto iit = inRange.first; + while (iit != inRange.second) { if (iit->m_nodeId == v.second.node) break; ++iit; } - CHECK(iit != current_in_iterators.second, ()); + CHECK(iit != inRange.second, ()); // Find outs. Generate adjacency list. - for (auto oit = current_out_iterators.first; oit != current_out_iterators.second; ++oit) + for (auto oit = outRange.first; oit != outRange.second; ++oit) { EdgeWeight const outWeight = currentContext.getAdjacencyCost(iit, oit); if (outWeight != INVALID_CONTEXT_EDGE_WEIGHT && outWeight != 0) @@ -166,9 +166,10 @@ void CrossMwmGraph::GetOutgoingEdgesListImpl(TCrossPair const & v, } } -double CrossMwmGraph::HeuristicCostEstimateImpl(const TCrossPair &v, const TCrossPair &w) const +double CrossMwmGraph::HeuristicCostEstimateImpl(TCrossPair const & v, TCrossPair const & w) const { - return ms::DistanceOnEarth(v.second.point.y, v.second.point.x, w.second.point.y, w.second.point.x) / kMediumSpeedMPS; + return ms::DistanceOnEarth(v.second.point.y, v.second.point.x, + w.second.point.y, w.second.point.x) / kMediumSpeedMPS; } } // namespace routing |