From 21455b4c03bb429d41d3f4646d5beddc2d539e84 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Tue, 7 Apr 2015 15:14:11 +0300 Subject: [PATCH] Clang-format style fixes --- map/routing_session.cpp | 12 +++---- routing/astar_router.hpp | 4 ++- routing/async_router.cpp | 46 ++++++++++++------------- routing/async_router.hpp | 15 +++------ routing/osrm2feature_map.cpp | 4 +-- routing/osrm2feature_map.hpp | 3 +- routing/osrm_router.cpp | 63 +++++++++++++++++------------------ routing/osrm_router.hpp | 19 +++++++---- routing/road_graph_router.cpp | 8 ++--- routing/road_graph_router.hpp | 9 +++-- routing/router.hpp | 7 ++-- 11 files changed, 90 insertions(+), 100 deletions(-) diff --git a/map/routing_session.cpp b/map/routing_session.cpp index 5da1c53b6a..f13cff21d3 100644 --- a/map/routing_session.cpp +++ b/map/routing_session.cpp @@ -16,12 +16,11 @@ namespace routing static int const ON_ROUTE_MISSED_COUNT = 5; - RoutingSession::RoutingSession() - : m_router(nullptr) - , m_route(string()) - , m_state(RoutingNotActive) - , m_endPoint(m2::PointD::Zero()) + : m_router(nullptr), + m_route(string()), + m_state(RoutingNotActive), + m_endPoint(m2::PointD::Zero()) { } @@ -43,7 +42,8 @@ void RoutingSession::RebuildRoute(m2::PointD const & startPoint, TReadyCallbackF // Use old-style callback constraction, because lambda constructs buggy function on Android // (callback param isn't captured by value). - m_router->CalculateRoute(startPoint, startPoint - m_lastGoodPosition, m_endPoint, DoReadyCallback(*this, callback, m_routeSessionMutex)); + m_router->CalculateRoute(startPoint, startPoint - m_lastGoodPosition, m_endPoint, + DoReadyCallback(*this, callback, m_routeSessionMutex)); } void RoutingSession::DoReadyCallback::operator() (Route & route, IRouter::ResultCode e) diff --git a/routing/astar_router.hpp b/routing/astar_router.hpp index 9f1af09819..5637bf3c8e 100644 --- a/routing/astar_router.hpp +++ b/routing/astar_router.hpp @@ -15,7 +15,9 @@ public: AStarRouter(Index const * pIndex = 0) : BaseT(pIndex) {} virtual string GetName() const { return "pedestrian"; } - void CalculateRouteOnMwm(vector const & startPos, vector const & finalPos, vector & route) override; + void CalculateRouteOnMwm(vector const & startPos, + vector const & finalPos, + vector & route) override; protected: diff --git a/routing/async_router.cpp b/routing/async_router.cpp index f4457eff81..ccc4aa6474 100644 --- a/routing/async_router.cpp +++ b/routing/async_router.cpp @@ -6,18 +6,14 @@ namespace routing { - AsyncRouter::AsyncRouter() { m_requestCancel = false; m_isReadyThread.clear(); } -void AsyncRouter::CalculateRoute( - m2::PointD const & startPt, - m2::PointD const & direction, - m2::PointD const & finalPt, - ReadyCallback const & callback) +void AsyncRouter::CalculateRoute(m2::PointD const & startPt, m2::PointD const & direction, + m2::PointD const & finalPt, ReadyCallback const & callback) { { threads::MutexGuard guard(m_paramsMutex); @@ -71,33 +67,33 @@ void AsyncRouter::CalculateRouteAsync(ReadyCallback const & callback) code = CalculateRouteImpl(startPt, startDr, finalPt, m_requestCancel, route); switch (code) { - case StartPointNotFound: - LOG(LWARNING, ("Can't find start or end node")); - break; - case EndPointNotFound: - LOG(LWARNING, ("Can't find end point node")); - break; - case PointsInDifferentMWM: - LOG(LWARNING, ("Points are in different MWMs")); - break; - case RouteNotFound: - LOG(LWARNING, ("Route not found")); - break; - case RouteFileNotExist: - LOG(LWARNING, ("There are no routing file")); - break; + case StartPointNotFound: + LOG(LWARNING, ("Can't find start or end node")); + break; + case EndPointNotFound: + LOG(LWARNING, ("Can't find end point node")); + break; + case PointsInDifferentMWM: + LOG(LWARNING, ("Points are in different MWMs")); + break; + case RouteNotFound: + LOG(LWARNING, ("Route not found")); + break; + case RouteFileNotExist: + LOG(LWARNING, ("There are no routing file")); + break; - default: - break; + default: + break; } } catch (Reader::Exception const & e) { - LOG(LERROR, ("Routing index is absent or incorrect. Error while loading routing index:", e.Msg())); + LOG(LERROR, + ("Routing index is absent or incorrect. Error while loading routing index:", e.Msg())); code = InternalError; } GetPlatform().RunOnGuiThread(bind(callback, route, code)); } - } diff --git a/routing/async_router.hpp b/routing/async_router.hpp index e87e84593a..405651b5da 100644 --- a/routing/async_router.hpp +++ b/routing/async_router.hpp @@ -8,7 +8,6 @@ namespace routing { - class AsyncRouter : public IRouter { public: @@ -24,11 +23,8 @@ public: /// @param direction start direction for routers with high cost of the turnarounds /// @param finalPt target point for route /// @param callback function to return routing result - void CalculateRoute( - m2::PointD const & startPt, - m2::PointD const & direction, - m2::PointD const & finalPt, - ReadyCallback const & callback) override; + void CalculateRoute(m2::PointD const & startPt, m2::PointD const & direction, + m2::PointD const & finalPt, ReadyCallback const & callback) override; /// Interrupt routing and clear buffers virtual void ClearState(); @@ -42,11 +38,9 @@ public: /// @param finalPt target point for route /// @param requestCancel interruption flag. You must stop processing when it is true. /// @param callback function to return routing result - virtual ResultCode CalculateRouteImpl(m2::PointD const & startPt, - m2::PointD const & startDr, + virtual ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt, - CancelFlagT const & requestCancel, - Route & route) = 0; + CancelFlagT const & requestCancel, Route & route) = 0; private: void CalculateRouteAsync(ReadyCallback const & callback); @@ -58,5 +52,4 @@ private: m2::PointD m_startPt, m_finalPt, m_startDr; }; - } diff --git a/routing/osrm2feature_map.cpp b/routing/osrm2feature_map.cpp index 4324945a88..156f49971c 100644 --- a/routing/osrm2feature_map.cpp +++ b/routing/osrm2feature_map.cpp @@ -163,8 +163,8 @@ void OsrmFtSegMapping::DumpSegmentByNode(TOsrmNodeId nodeId) const #endif } - -void OsrmFtSegMapping::GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res, atomic const & requestCancel) const +void OsrmFtSegMapping::GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res, + atomic const & requestCancel) const { auto addResFn = [&] (uint64_t seg, size_t idx, bool forward) { diff --git a/routing/osrm2feature_map.hpp b/routing/osrm2feature_map.hpp index 67edbbfc72..00dadb8da4 100644 --- a/routing/osrm2feature_map.hpp +++ b/routing/osrm2feature_map.hpp @@ -142,7 +142,8 @@ public: } typedef unordered_map > OsrmNodesT; - void GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res, atomic const & requestCancel) const; + void GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res, + atomic const & requestCancel) const; void GetSegmentByIndex(size_t idx, OsrmMappingTypes::FtSeg & seg) const; diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp index 245290ba90..6cea92e2e8 100644 --- a/routing/osrm_router.cpp +++ b/routing/osrm_router.cpp @@ -258,7 +258,8 @@ public: node.m_node.reverse_weight = 0; } - void MakeResult(FeatureGraphNodeVecT & res, size_t maxCount,AsyncRouter::CancelFlagT const & requestCancel) + void MakeResult(FeatureGraphNodeVecT & res, size_t maxCount, + AsyncRouter::CancelFlagT const & requestCancel) { if (m_mwmId == numeric_limits::max()) return; @@ -361,11 +362,8 @@ RoutingMappingPtrT RoutingIndexManager::GetMappingByName(string const & fName, I return new_mapping; } - - OsrmRouter::OsrmRouter(Index const * index, CountryFileFnT const & fn) - : m_pIndex(index), m_indexManager(fn), - m_additionalFeatures(false) + : m_pIndex(index), m_indexManager(fn), m_additionalFeatures(false) { #ifdef DEBUG m_additionalFeatures = true; @@ -483,7 +481,9 @@ size_t OsrmRouter::FindNextMwmNode(OutgoingCrossNode const & startNode, RoutingM return INVALID_NODE_ID; } -OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const & path, CancelFlagT const & requestCancel, Route & route) +OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const & path, + CancelFlagT const & requestCancel, + Route & route) { Route::TurnsT TurnsDir; Route::TimesT Times; @@ -517,7 +517,8 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const & Route::TimesT mwmTimes; vector mwmPoints; turns::TurnsGeomT mwmTurnsGeom; - MakeTurnAnnotation(routingResult, mwmMapping, mwmPoints, requestCancel, mwmTurnsDir, mwmTimes, mwmTurnsGeom); + MakeTurnAnnotation(routingResult, mwmMapping, mwmPoints, requestCancel, mwmTurnsDir, mwmTimes, + mwmTurnsGeom); // And connect it to result route for (auto turn : mwmTurnsDir) @@ -616,13 +617,17 @@ public: } }; -OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt, CancelFlagT const & requestCancel, Route & route) +OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt, + m2::PointD const & startDr, + m2::PointD const & finalPt, + CancelFlagT const & requestCancel, + Route & route) { my::HighResTimer timer(true); RoutingMappingPtrT startMapping = m_indexManager.GetMappingByPoint(startPt, m_pIndex); RoutingMappingPtrT targetMapping = m_indexManager.GetMappingByPoint(finalPt, m_pIndex); - m_indexManager.Clear(); // TODO (Dragunov) make proper index manager cleaning + m_indexManager.Clear(); // TODO (Dragunov) make proper index manager cleaning if (!startMapping->IsValid()) { @@ -654,26 +659,17 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt FeatureGraphNodeVecT startTask; { - ResultCode const code = FindPhantomNodes(startMapping->GetName(), - startPt, - startDr, - startTask, - MAX_NODE_CANDIDATES, - startMapping, - requestCancel); + ResultCode const code = FindPhantomNodes(startMapping->GetName(), startPt, startDr, startTask, + MAX_NODE_CANDIDATES, startMapping, requestCancel); if (code != NoError) return code; } { if (finalPt != m_CachedTargetPoint) { - ResultCode const code = FindPhantomNodes(targetMapping->GetName(), - finalPt, - m2::PointD::Zero(), - m_CachedTargetTask, - MAX_NODE_CANDIDATES, - targetMapping, - requestCancel); + ResultCode const code = + FindPhantomNodes(targetMapping->GetName(), finalPt, m2::PointD::Zero(), + m_CachedTargetTask, MAX_NODE_CANDIDATES, targetMapping, requestCancel); if (code != NoError) return code; m_CachedTargetPoint = finalPt; @@ -712,7 +708,8 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt vector points; turns::TurnsGeomT turnsGeom; - MakeTurnAnnotation(routingResult, startMapping, points, requestCancel, turnsDir, times, turnsGeom); + MakeTurnAnnotation(routingResult, startMapping, points, requestCancel, turnsDir, times, + turnsGeom); route.SetGeometry(points.begin(), points.end()); route.SetTurnInstructions(turnsDir); @@ -1000,13 +997,10 @@ m2::PointD OsrmRouter::GetPointForTurnAngle(OsrmMappingTypes::FtSeg const & seg, return nextPnt; } -OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation(RawRoutingResultT const & routingResult, - RoutingMappingPtrT const & mapping, - vector & points, - CancelFlagT const & requestCancel, - Route::TurnsT & turnsDir, - Route::TimesT & times, - turns::TurnsGeomT & turnsGeom) +OsrmRouter::ResultCode OsrmRouter::MakeTurnAnnotation( + RawRoutingResultT const & routingResult, RoutingMappingPtrT const & mapping, + vector & points, CancelFlagT const & requestCancel, Route::TurnsT & turnsDir, + Route::TimesT & times, turns::TurnsGeomT & turnsGeom) { typedef OsrmMappingTypes::FtSeg SegT; SegT const & segBegin = routingResult.m_sourceEdge.m_seg; @@ -1597,8 +1591,11 @@ void OsrmRouter::FixupTurns(vector const & points, Route::TurnsT & t } } -IRouter::ResultCode OsrmRouter::FindPhantomNodes(string const & fName, m2::PointD const & point, m2::PointD const & direction, - FeatureGraphNodeVecT & res, size_t maxCount, RoutingMappingPtrT const & mapping, CancelFlagT const & requestCancel) +IRouter::ResultCode OsrmRouter::FindPhantomNodes(string const & fName, m2::PointD const & point, + m2::PointD const & direction, + FeatureGraphNodeVecT & res, size_t maxCount, + RoutingMappingPtrT const & mapping, + CancelFlagT const & requestCancel) { Point2PhantomNode getter(mapping->m_segMapping, m_pIndex, direction); getter.SetPoint(point); diff --git a/routing/osrm_router.hpp b/routing/osrm_router.hpp index c251fa7d4f..ebd06220a6 100644 --- a/routing/osrm_router.hpp +++ b/routing/osrm_router.hpp @@ -144,11 +144,11 @@ public: void ActivateAdditionalFeatures() {m_additionalFeatures = true;} protected: - IRouter::ResultCode FindPhantomNodes(string const & fName, m2::PointD const & point, m2::PointD const & direction, - FeatureGraphNodeVecT & res, size_t maxCount, RoutingMappingPtrT const & mapping, + IRouter::ResultCode FindPhantomNodes(string const & fName, m2::PointD const & point, + m2::PointD const & direction, FeatureGraphNodeVecT & res, + size_t maxCount, RoutingMappingPtrT const & mapping, CancelFlagT const & requestCancel); - size_t FindNextMwmNode(OutgoingCrossNode const & startNode, RoutingMappingPtrT const & targetMapping); /*! @@ -162,11 +162,15 @@ protected: * \param turnsGeom output turns geometry * \return OSRM routing errors if any */ - ResultCode MakeTurnAnnotation(RawRoutingResultT const & routingResult, RoutingMappingPtrT const & mapping, vector & points, - CancelFlagT const & requestCancel, Route::TurnsT & turnsDir,Route::TimesT & times, turns::TurnsGeomT & turnsGeom); + ResultCode MakeTurnAnnotation(RawRoutingResultT const & routingResult, + RoutingMappingPtrT const & mapping, vector & points, + CancelFlagT const & requestCancel, Route::TurnsT & turnsDir, + Route::TimesT & times, turns::TurnsGeomT & turnsGeom); void CalculateRouteAsync(ReadyCallback const & callback); - ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt,CancelFlagT const & requestCancel, Route & route) override; + ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, + m2::PointD const & finalPt, CancelFlagT const & requestCancel, + Route & route) override; private: typedef pair MwmOutT; @@ -204,7 +208,8 @@ private: * \param route class to render final route * \return NoError or error code */ - ResultCode MakeRouteFromCrossesPath(CheckedPathT const & path, CancelFlagT const & requestCancel, Route & route); + ResultCode MakeRouteFromCrossesPath(CheckedPathT const & path, CancelFlagT const & requestCancel, + Route & route); NodeID GetTurnTargetNode(NodeID src, NodeID trg, QueryEdge::EdgeData const & edgeData, RoutingMappingPtrT const & routingMapping); void GetPossibleTurns(NodeID node, m2::PointD const & p1, diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index 209b211dff..d1cf5ae9d5 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -108,10 +108,10 @@ bool RoadGraphRouter::IsMyMWM(size_t mwmID) const } AsyncRouter::ResultCode RoadGraphRouter::CalculateRouteImpl(m2::PointD const & startPt, - m2::PointD const & startDr, - m2::PointD const & finalPt, - CancelFlagT const & requestCancel, - Route & route) + m2::PointD const & startDr, + m2::PointD const & finalPt, + CancelFlagT const & requestCancel, + Route & route) { // We can make easy turnaround when walking. So we will not use direction for route calculation UNUSED_VALUE(startDr); diff --git a/routing/road_graph_router.hpp b/routing/road_graph_router.hpp index ed7400e000..d2bfbfe259 100644 --- a/routing/road_graph_router.hpp +++ b/routing/road_graph_router.hpp @@ -22,14 +22,13 @@ public: RoadGraphRouter(Index const * pIndex); ~RoadGraphRouter(); - virtual void CalculateRouteOnMwm(vector const & startPos, vector const & finalPos, vector & route) = 0; + virtual void CalculateRouteOnMwm(vector const & startPos, + vector const & finalPos, vector & route) = 0; virtual void SetRoadGraph(IRoadGraph * pRoadGraph) { m_pRoadGraph.reset(pRoadGraph); } - virtual ResultCode CalculateRouteImpl(m2::PointD const & startPt, - m2::PointD const & startDr, + virtual ResultCode CalculateRouteImpl(m2::PointD const & startPt, m2::PointD const & startDr, m2::PointD const & finalPt, - CancelFlagT const & requestCancel, - Route & route); + CancelFlagT const & requestCancel, Route & route); protected: size_t GetRoadPos(m2::PointD const & pt, vector & pos); diff --git a/routing/router.hpp b/routing/router.hpp index efa8853f2e..7fb0e3c803 100644 --- a/routing/router.hpp +++ b/routing/router.hpp @@ -38,11 +38,8 @@ public: virtual void ClearState() {} virtual void ActivateAdditionalFeatures() {} - virtual void CalculateRoute( - m2::PointD const & startingPt, - m2::PointD const & direction, - m2::PointD const & finalPt, - ReadyCallback const & callback) = 0; + virtual void CalculateRoute(m2::PointD const & startingPt, m2::PointD const & direction, + m2::PointD const & finalPt, ReadyCallback const & callback) = 0; }; }