diff options
author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-07-29 10:01:49 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:58:40 +0300 |
commit | 8accabb3a272ee484dcca5eaa061e8f5ff705f11 (patch) | |
tree | 7d1d5a3e6986f3259e24e7a95c8aee380cb26722 /routing | |
parent | 1f36eb605532726e00ee75f582bb20df40b8b9b3 (diff) |
PR fixes
Diffstat (limited to 'routing')
-rw-r--r-- | routing/async_router.cpp | 4 | ||||
-rw-r--r-- | routing/async_router.hpp | 2 | ||||
-rw-r--r-- | routing/cross_mwm_router.cpp | 4 | ||||
-rw-r--r-- | routing/online_absent_fetcher.hpp | 1 | ||||
-rw-r--r-- | routing/routing_algorithm.cpp | 11 | ||||
-rw-r--r-- | routing/routing_algorithm.hpp | 4 | ||||
-rw-r--r-- | routing/routing_session.cpp | 4 | ||||
-rw-r--r-- | routing/routing_session.hpp | 2 | ||||
-rw-r--r-- | routing/routing_tests/async_router_test.cpp | 11 | ||||
-rw-r--r-- | routing/timeout_observer.hpp | 2 |
10 files changed, 16 insertions, 29 deletions
diff --git a/routing/async_router.cpp b/routing/async_router.cpp index 731b984177..166d63e75f 100644 --- a/routing/async_router.cpp +++ b/routing/async_router.cpp @@ -86,10 +86,10 @@ void AsyncRouter::CalculateRoute(m2::PointD const & startPoint, m2::PointD const void AsyncRouter::ClearState() { - // Send cancel flag to the algorythms. + // Send cancel flag to the algorithms. m_observer.Cancel(); - // And wait while they finish. + // And wait while it is finishing. lock_guard<mutex> routingGuard(m_routingMutex); m_router->ClearState(); diff --git a/routing/async_router.hpp b/routing/async_router.hpp index 5e266b8ac7..da1e7853aa 100644 --- a/routing/async_router.hpp +++ b/routing/async_router.hpp @@ -48,7 +48,7 @@ public: /// Interrupt routing and clear buffers virtual void ClearState(); - /// Whait routing process. For testing use. + /// Wait routing process. For testing use. void WaitRouting() { lock_guard<mutex> routingGuard(m_routingMutex); } private: diff --git a/routing/cross_mwm_router.cpp b/routing/cross_mwm_router.cpp index f45e497412..7bd077cfb1 100644 --- a/routing/cross_mwm_router.cpp +++ b/routing/cross_mwm_router.cpp @@ -82,8 +82,8 @@ IRouter::ResultCode CalculateCrossMwmPath(TRoutingNodes const & startGraphNodes, // Finding path through maps. vector<BorderCross> tempRoad; - code = - CalculateRoute({startNode, startNode}, {finalNode, finalNode}, roadGraph, tempRoad, observer); + code = CalculateRoute({startNode, startNode}, {finalNode, finalNode}, roadGraph, tempRoad, + observer); if (code != IRouter::NoError) return code; diff --git a/routing/online_absent_fetcher.hpp b/routing/online_absent_fetcher.hpp index ae2aa49658..8396ee2306 100644 --- a/routing/online_absent_fetcher.hpp +++ b/routing/online_absent_fetcher.hpp @@ -20,6 +20,7 @@ class IOnlineFetcher public: virtual void GenerateRequest(m2::PointD const & startPoint, m2::PointD const & finalPoint) = 0; virtual void GetAbsentCountries(vector<string> & countries) = 0; + virtual ~IOnlineFetcher() {} }; /*! diff --git a/routing/routing_algorithm.cpp b/routing/routing_algorithm.cpp index 3825fa5a62..e46831d965 100644 --- a/routing/routing_algorithm.cpp +++ b/routing/routing_algorithm.cpp @@ -130,15 +130,13 @@ AStarRoutingAlgorithmBase::AStarRoutingAlgorithmBase() // *************************** AStar routing algorithm implementation ************************************* -AStarRoutingAlgorithm::AStarRoutingAlgorithm() : AStarRoutingAlgorithmBase() {} - IRoutingAlgorithm::Result AStarRoutingAlgorithm::CalculateRoute(IRoadGraph const & graph, Junction const & startPos, Junction const & finalPos, IRouterObserver const & observer, vector<Junction> & path) { - std::function<void(Junction const &, Junction const &)> onVisitJunctionFn = + function<void(Junction const &, Junction const &)> onVisitJunctionFn = [&observer, this](Junction const & junction, Junction const & /* target */) { observer.OnPointCheck(junction.GetPoint()); @@ -157,16 +155,11 @@ IRoutingAlgorithm::Result AStarRoutingAlgorithm::CalculateRoute(IRoadGraph const // *************************** AStar-bidirectional routing algorithm implementation *********************** -AStarBidirectionalRoutingAlgorithm::AStarBidirectionalRoutingAlgorithm() - : AStarRoutingAlgorithmBase() -{ -} - IRoutingAlgorithm::Result AStarBidirectionalRoutingAlgorithm::CalculateRoute( IRoadGraph const & graph, Junction const & startPos, Junction const & finalPos, IRouterObserver const & observer, vector<Junction> & path) { - std::function<void(Junction const &, Junction const &)> onVisitJunctionFn = + function<void(Junction const &, Junction const &)> onVisitJunctionFn = [&observer, this](Junction const & junction, Junction const & target) { observer.OnPointCheck(junction.GetPoint()); diff --git a/routing/routing_algorithm.hpp b/routing/routing_algorithm.hpp index 9e7f924cf2..336bfcea54 100644 --- a/routing/routing_algorithm.hpp +++ b/routing/routing_algorithm.hpp @@ -46,8 +46,6 @@ protected: class AStarRoutingAlgorithm : public AStarRoutingAlgorithmBase { public: - explicit AStarRoutingAlgorithm(); - // IRoutingAlgorithm overrides: Result CalculateRoute(IRoadGraph const & graph, Junction const & startPos, Junction const & finalPos, IRouterObserver const & observer, @@ -58,8 +56,6 @@ public: class AStarBidirectionalRoutingAlgorithm : public AStarRoutingAlgorithmBase { public: - explicit AStarBidirectionalRoutingAlgorithm(); - // IRoutingAlgorithm overrides: Result CalculateRoute(IRoadGraph const & graph, Junction const & startPos, Junction const & finalPos, IRouterObserver const & observer, diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index ab517087a8..730822b732 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -246,8 +246,8 @@ void RoutingSession::SetRouter(unique_ptr<IRouter> && router, if (m_router) Reset(); - m_router.reset( - new AsyncRouter(move(router), move(fetcher), routingStatisticsFn, pointCheckCallback)); + m_router.reset(new AsyncRouter(move(router), move(fetcher), routingStatisticsFn, + pointCheckCallback)); } void RoutingSession::MatchLocationToRoute(location::GpsInfo & location, diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp index 537f6ef638..59e70ce5b4 100644 --- a/routing/routing_session.hpp +++ b/routing/routing_session.hpp @@ -66,7 +66,7 @@ public: TReadyCallbackFn const & readyCallback, TProgressCallbackFn const & progressCallback, uint32_t timeoutSec); void RebuildRoute(m2::PointD const & startPoint, TReadyCallbackFn const & readyCallback, - TProgressCallbackFn const & progressCallback, uint32_t timeoutSec); + TProgressCallbackFn const & progressCallback, uint32_t timeoutSec); m2::PointD GetEndPoint() const { return m_endPoint; } bool IsActive() const { return (m_state != RoutingNotActive); } diff --git a/routing/routing_tests/async_router_test.cpp b/routing/routing_tests/async_router_test.cpp index d11608343f..cf0a9f1561 100644 --- a/routing/routing_tests/async_router_test.cpp +++ b/routing/routing_tests/async_router_test.cpp @@ -55,8 +55,8 @@ void DummyStatisticsCallback(map<string, string> const &) {} struct DummyResultCallback { - static vector<ResultCode> m_codes; - static vector<vector<string>> m_absent; + vector<ResultCode> m_codes; + vector<vector<string>> m_absent; void operator()(Route & route, ResultCode code) { m_codes.push_back(code); @@ -65,9 +65,6 @@ struct DummyResultCallback } }; -vector<ResultCode> DummyResultCallback::m_codes; -vector<vector<string>> DummyResultCallback::m_absent; - UNIT_TEST(NeedMoreMapsSignalTest) { unique_ptr<IOnlineFetcher> fetcher(new DummyFetcher({"test1", "test2"})); @@ -76,7 +73,7 @@ UNIT_TEST(NeedMoreMapsSignalTest) AsyncRouter async(move(router), move(fetcher), DummyStatisticsCallback, nullptr); resultCallback.m_codes.clear(); resultCallback.m_absent.clear(); - async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, resultCallback, nullptr, 0); + async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, bind(ref(resultCallback), _1, _2), nullptr, 0); // Wait async process start. while (resultCallback.m_codes.empty()) @@ -101,7 +98,7 @@ UNIT_TEST(StandartAsyncFogTest) AsyncRouter async(move(router), move(fetcher), DummyStatisticsCallback, nullptr); resultCallback.m_codes.clear(); resultCallback.m_absent.clear(); - async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, resultCallback, nullptr, 0); + async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, bind(ref(resultCallback), _1, _2), nullptr, 0); // Wait async process start. while (resultCallback.m_codes.empty()) diff --git a/routing/timeout_observer.hpp b/routing/timeout_observer.hpp index d34f5989e8..cfd9926b46 100644 --- a/routing/timeout_observer.hpp +++ b/routing/timeout_observer.hpp @@ -7,7 +7,7 @@ namespace routing { using TProgressCallback = function<void(float)>; -using TPointCheckCallback = function<void(m2::PointD)>; +using TPointCheckCallback = function<void(m2::PointD const &)>; class TimeoutObserver : public IRouterObserver { |