From 9f8e046e226ff64b6b305c65d7bc1e38be2502c8 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Wed, 3 Jun 2015 20:09:23 +0300 Subject: clang-format --- geometry/point2d.hpp | 5 ++-- routing/cross_mwm_road_graph.cpp | 8 +++--- routing/cross_mwm_road_graph.hpp | 6 +++-- routing/cross_mwm_router.cpp | 2 +- routing/cross_routing_context.cpp | 10 +++++--- routing/cross_routing_context.hpp | 6 +++-- routing/osrm_router.cpp | 37 +++++++++++++++------------ routing/osrm_router.hpp | 12 ++++++++- routing/routing_tests/cross_routing_tests.cpp | 5 ++-- 9 files changed, 58 insertions(+), 33 deletions(-) diff --git a/geometry/point2d.hpp b/geometry/point2d.hpp index da19528268..d4e61f2620 100644 --- a/geometry/point2d.hpp +++ b/geometry/point2d.hpp @@ -393,8 +393,9 @@ bool AlmostEqualULPs(m2::Point const & p1, m2::Point const & p2, unsigned } -//hash function for unordered map realisation. -namespace boost{ +// hash function for unordered map realisation. +namespace boost +{ template <> struct hash { diff --git a/routing/cross_mwm_road_graph.cpp b/routing/cross_mwm_road_graph.cpp index a9dff4bb4d..3f42cc9dd8 100644 --- a/routing/cross_mwm_road_graph.cpp +++ b/routing/cross_mwm_road_graph.cpp @@ -96,11 +96,11 @@ IRouter::ResultCode CrossMwmGraph::SetFinalNode(CrossNode const & finalNode) } BorderCross CrossMwmGraph::FindNextMwmNode(OutgoingCrossNode const & startNode, - TRoutingMappingPtr const & currentMapping) const + TRoutingMappingPtr const & currentMapping) const { m2::PointD const & startPoint = startNode.m_point; - //Check cached crosses. + // Check cached crosses. auto const it = m_cachedNextNodes.find(startPoint); if (it != m_cachedNextNodes.end()) { @@ -123,9 +123,9 @@ BorderCross CrossMwmGraph::FindNextMwmNode(OutgoingCrossNode const & startNode, kMwmCrossingNodeEqualityRadiusMeters) { BorderCross const cross(CrossNode(startNode.m_nodeId, currentMapping->GetName(), - MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x)), + MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x)), CrossNode(i->m_nodeId, nextMwm, - MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x))); + MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x))); m_cachedNextNodes.insert(make_pair(startPoint, cross)); return cross; } diff --git a/routing/cross_mwm_road_graph.hpp b/routing/cross_mwm_road_graph.hpp index 07c16ecb9a..748c8aa7da 100644 --- a/routing/cross_mwm_road_graph.hpp +++ b/routing/cross_mwm_road_graph.hpp @@ -30,6 +30,7 @@ struct CrossNode CrossNode() : node(INVALID_NODE_ID), point(m2::PointD::Zero()) {} inline bool IsValid() const { return node != INVALID_NODE_ID; } + inline bool operator==(CrossNode const & a) const { return node == a.node && mwmName == a.mwmName; @@ -97,11 +98,12 @@ private: friend class Graph; BorderCross FindNextMwmNode(OutgoingCrossNode const & startNode, - TRoutingMappingPtr const & currentMapping) const; + TRoutingMappingPtr const & currentMapping) const; // Graph implementation: void GetOutgoingEdgesListImpl(BorderCross const & v, vector & adj) const; - void GetIngoingEdgesListImpl(BorderCross const & /* v */, vector & /* adj */) const + void GetIngoingEdgesListImpl(BorderCross const & /* v */, + vector & /* adj */) const { NOTIMPLEMENTED(); } diff --git a/routing/cross_mwm_router.cpp b/routing/cross_mwm_router.cpp index d4ceb06033..727016a51b 100644 --- a/routing/cross_mwm_router.cpp +++ b/routing/cross_mwm_router.cpp @@ -25,7 +25,7 @@ IRouter::ResultCode CalculateRoute(BorderCross const & startPos, BorderCross con } my::HighResTimer timer(true); - TAlgorithm::Result const result =m_algo.FindPath(startPos, finalPos, route, onVisitedVertex); + TAlgorithm::Result const result = m_algo.FindPath(startPos, finalPos, route, onVisitedVertex); LOG(LINFO, ("Duration of the cross MWM path finding", timer.ElapsedNano())); switch (result) { diff --git a/routing/cross_routing_context.cpp b/routing/cross_routing_context.cpp index 9c3dafbf1b..c750cd17b5 100644 --- a/routing/cross_routing_context.cpp +++ b/routing/cross_routing_context.cpp @@ -110,7 +110,8 @@ pair CrossRoutingContextReader::Ge return make_pair(m_outgoingNodes.cbegin(), m_outgoingNodes.cend()); } -WritedEdgeWeightT CrossRoutingContextReader::GetAdjacencyCost(IngoingEdgeIteratorT ingoing, OutgoingEdgeIteratorT outgoing) const +WritedEdgeWeightT CrossRoutingContextReader::GetAdjacencyCost(IngoingEdgeIteratorT ingoing, + OutgoingEdgeIteratorT outgoing) const { if (!mp_reader) return INVALID_CONTEXT_EDGE_WEIGHT; @@ -159,7 +160,8 @@ void CrossRoutingContextWriter::AddIngoingNode(size_t const nodeId, m2::PointD c m_ingoingNodes.push_back(IngoingCrossNode(nodeId, point)); } -void CrossRoutingContextWriter::AddOutgoingNode(size_t const nodeId, string const & targetMwm, m2::PointD const & point) +void CrossRoutingContextWriter::AddOutgoingNode(size_t const nodeId, string const & targetMwm, + m2::PointD const & point) { auto it = find(m_neighborMwmList.begin(), m_neighborMwmList.end(), targetMwm); if (it == m_neighborMwmList.end()) @@ -172,7 +174,9 @@ void CrossRoutingContextWriter::ReserveAdjacencyMatrix() m_adjacencyMatrix.resize(m_ingoingNodes.size() * m_outgoingNodes.size(), INVALID_CONTEXT_EDGE_WEIGHT); } -void CrossRoutingContextWriter::SetAdjacencyCost(IngoingEdgeIteratorT ingoing, OutgoingEdgeIteratorT outgoin, WritedEdgeWeightT value) +void CrossRoutingContextWriter::SetAdjacencyCost(IngoingEdgeIteratorT ingoing, + OutgoingEdgeIteratorT outgoin, + WritedEdgeWeightT value) { m_adjacencyMatrix[GetIndexInAdjMatrix(ingoing, outgoin)] = value; } diff --git a/routing/cross_routing_context.hpp b/routing/cross_routing_context.hpp index c7c272f730..88a7bcf8be 100644 --- a/routing/cross_routing_context.hpp +++ b/routing/cross_routing_context.hpp @@ -64,7 +64,8 @@ public: pair GetOutgoingIterators() const; - WritedEdgeWeightT GetAdjacencyCost(IngoingEdgeIteratorT ingoing, OutgoingEdgeIteratorT outgoing) const; + WritedEdgeWeightT GetAdjacencyCost(IngoingEdgeIteratorT ingoing, + OutgoingEdgeIteratorT outgoing) const; }; /// Helper class to generate cross context section in mwm.routing file @@ -86,7 +87,8 @@ public: void ReserveAdjacencyMatrix(); - void SetAdjacencyCost(IngoingEdgeIteratorT ingoing, OutgoingEdgeIteratorT outgoin, WritedEdgeWeightT value); + void SetAdjacencyCost(IngoingEdgeIteratorT ingoing, OutgoingEdgeIteratorT outgoin, + WritedEdgeWeightT value); pair GetIngoingIterators() const; diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp index ac3c9af2d7..d1f54bd670 100644 --- a/routing/osrm_router.cpp +++ b/routing/osrm_router.cpp @@ -39,7 +39,6 @@ namespace routing { - size_t constexpr kMaxNodeCandidatesCount = 10; double constexpr kFeatureFindingRectSideRadiusMeters = 1000.0; double constexpr kTimeOverhead = 1.; @@ -376,10 +375,11 @@ public: CalculateOffsets(node); } - res.erase(remove_if(res.begin(), - res.end(), - [](FeatureGraphNode const & f) {return f.mwmName.empty();}), - res.end()); + res.erase(remove_if(res.begin(), res.end(), [](FeatureGraphNode const & f) + { + return f.mwmName.empty(); + }), + res.end()); } }; @@ -527,7 +527,7 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRoute(m2::PointD const & startPoint, TFeatureGraphNodeVec startTask; { - ResultCode const code = FindPhantomNodes(startMapping->GetName(), startPoint, startDirection, + ResultCode const code = FindPhantomNodes(startPoint, startDirection, startTask, kMaxNodeCandidatesCount, startMapping); if (code != NoError) return code; @@ -536,7 +536,7 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRoute(m2::PointD const & startPoint, if (finalPoint != m_CachedTargetPoint) { ResultCode const code = - FindPhantomNodes(targetMapping->GetName(), finalPoint, m2::PointD::Zero(), + FindPhantomNodes(finalPoint, m2::PointD::Zero(), m_CachedTargetTask, kMaxNodeCandidatesCount, targetMapping); if (code != NoError) return code; @@ -876,7 +876,8 @@ void OsrmRouter::GetPossibleTurns(NodeID node, m2::PointD const & p1, m2::PointD ft.ParseGeometry(FeatureType::BEST_GEOMETRY); m2::PointD const p2 = ft.GetPoint(seg.m_pointStart < seg.m_pointEnd ? seg.m_pointStart + 1 : seg.m_pointStart - 1); - ASSERT_LESS(MercatorBounds::DistanceOnEarth(p, ft.GetPoint(seg.m_pointStart)), kFeaturesNearTurnM, ()); + ASSERT_LESS(MercatorBounds::DistanceOnEarth(p, ft.GetPoint(seg.m_pointStart)), + kFeaturesNearTurnM, ()); double const a = my::RadToDeg(ang::TwoVectorsAngle(p, p1, p2)); @@ -951,7 +952,9 @@ void OsrmRouter::GetTurnDirection(RawPathData const & node1, RawPathData const & ft1.ParseGeometry(FeatureType::BEST_GEOMETRY); ft2.ParseGeometry(FeatureType::BEST_GEOMETRY); - ASSERT_LESS(MercatorBounds::DistanceOnEarth(ft1.GetPoint(seg1.m_pointEnd), ft2.GetPoint(seg2.m_pointStart)), kFeaturesNearTurnM, ()); + ASSERT_LESS(MercatorBounds::DistanceOnEarth(ft1.GetPoint(seg1.m_pointEnd), + ft2.GetPoint(seg2.m_pointStart)), + kFeaturesNearTurnM, ()); m2::PointD const p = ft1.GetPoint(seg1.m_pointEnd); m2::PointD const p1 = GetPointForTurnAngle(seg1, ft1, p, @@ -1046,20 +1049,22 @@ void OsrmRouter::GetTurnDirection(RawPathData const & node1, RawPathData const & turn.m_turn = turns::TurnDirection::UTurn; } -IRouter::ResultCode OsrmRouter::FindPhantomNodes(string const & mapName, m2::PointD const & point, m2::PointD const & direction, - TFeatureGraphNodeVec & res, size_t maxCount, TRoutingMappingPtr const & mapping) +IRouter::ResultCode OsrmRouter::FindPhantomNodes(m2::PointD const & point, + m2::PointD const & direction, + TFeatureGraphNodeVec & res, size_t maxCount, + TRoutingMappingPtr const & mapping) { Point2PhantomNode getter(mapping->m_segMapping, m_pIndex, direction); getter.SetPoint(point); - m_pIndex->ForEachInRectForMWM( - getter, MercatorBounds::RectByCenterXYAndSizeInMeters(point, kFeatureFindingRectSideRadiusMeters), - scales::GetUpperScale(), mapping->GetMwmId()); + m_pIndex->ForEachInRectForMWM(getter, MercatorBounds::RectByCenterXYAndSizeInMeters( + point, kFeatureFindingRectSideRadiusMeters), + scales::GetUpperScale(), mapping->GetMwmId()); if (!getter.HasCandidates()) - return StartPointNotFound; + return RouteNotFound; - getter.MakeResult(res, maxCount, mapName); + getter.MakeResult(res, maxCount, mapping->GetName()); return NoError; } diff --git a/routing/osrm_router.hpp b/routing/osrm_router.hpp index 944bbc815a..d897d1870b 100644 --- a/routing/osrm_router.hpp +++ b/routing/osrm_router.hpp @@ -61,7 +61,17 @@ public: RawRoutingResult & rawRoutingResult); protected: - IRouter::ResultCode FindPhantomNodes(string const & mapName, m2::PointD const & point, + /*! + * \brief FindPhantomNodes finds OSRM graph nodes by point and graph name. + * \param mapName Name of the map without data file extension. + * \param point Point in lon/lat coordinates. + * \param direction Movement direction vector in planar coordinates. + * \param res Result graph nodes. + * \param maxCount Maximum count of graph nodes in the result vector. + * \param mapping Reference to routing indexes. + * \return NoError if there are any nodes in res. RouteNotFound otherwise. + */ + IRouter::ResultCode FindPhantomNodes(m2::PointD const & point, m2::PointD const & direction, TFeatureGraphNodeVec & res, size_t maxCount, TRoutingMappingPtr const & mapping); diff --git a/routing/routing_tests/cross_routing_tests.cpp b/routing/routing_tests/cross_routing_tests.cpp index 526406b6a4..5e31f496dd 100644 --- a/routing/routing_tests/cross_routing_tests.cpp +++ b/routing/routing_tests/cross_routing_tests.cpp @@ -53,7 +53,7 @@ UNIT_TEST(TestAdjacencyMatrix) auto ins = context.GetIngoingIterators(); auto outs = context.GetOutgoingIterators(); context.SetAdjacencyCost(ins.first, outs.first, 5); - context.SetAdjacencyCost(ins.first+1, outs.first, 9); + context.SetAdjacencyCost(ins.first + 1, outs.first, 9); } vector buffer; @@ -67,7 +67,8 @@ UNIT_TEST(TestAdjacencyMatrix) auto outs = newContext.GetOutgoingIterators(); TEST_EQUAL(newContext.GetAdjacencyCost(ins.first, outs.first), 5, ()); TEST_EQUAL(newContext.GetAdjacencyCost(ins.first + 1, outs.first), 9, ()); - TEST_EQUAL(newContext.GetAdjacencyCost(ins.first + 2, outs.first), routing::INVALID_CONTEXT_EDGE_WEIGHT, ("Default cost")); + TEST_EQUAL(newContext.GetAdjacencyCost(ins.first + 2, outs.first), + routing::INVALID_CONTEXT_EDGE_WEIGHT, ("Default cost")); } } -- cgit v1.2.3