diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-05-26 14:28:46 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-05-27 14:17:14 +0300 |
commit | 5656ce5c232b5ab2064469c077eb7e1c80d50266 (patch) | |
tree | f8b29df5f5b7bcdb3da89a150aaa1c3594e27e0e /routing | |
parent | 9d393d2b51224681a090c76399db3e1f6b8bd10b (diff) |
Review fixes.
Diffstat (limited to 'routing')
-rw-r--r-- | routing/road_graph.cpp | 14 | ||||
-rw-r--r-- | routing/road_graph.hpp | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp index 9ba1d9a99a..26aa42cfef 100644 --- a/routing/road_graph.cpp +++ b/routing/road_graph.cpp @@ -64,11 +64,7 @@ vector<Edge>::const_iterator FindEdgeContainingPoint(vector<Edge> const & edges, /// \brief Reverses |edges| starting from index |beginIdx| and upto the end of |v|. void ReverseEdges(size_t beginIdx, IRoadGraph::TEdgeVector & edges) { - if (beginIdx > edges.size()) - { - ASSERT(false, ()); - return; - } + ASSERT_LESS_OR_EQUAL(beginIdx, edges.size(), ("Index too large.")); for (size_t i = beginIdx; i < edges.size(); ++i) edges[i] = edges[i].GetReverseEdge(); @@ -167,8 +163,8 @@ IRoadGraph::RoadInfo::RoadInfo(bool bidirectional, double speedKMPH, initializer {} // IRoadGraph::CrossOutgoingLoader --------------------------------------------- -void IRoadGraph::CrossOutgoingLoader::LoadEdge(FeatureID const & featureId, - RoadInfo const & roadInfo) +void IRoadGraph::CrossOutgoingLoader::LoadEdges(FeatureID const & featureId, + RoadInfo const & roadInfo) { size_t const numPoints = roadInfo.m_points.size(); @@ -198,8 +194,8 @@ void IRoadGraph::CrossOutgoingLoader::LoadEdge(FeatureID const & featureId, } // IRoadGraph::CrossIngoingLoader ---------------------------------------------- -void IRoadGraph::CrossIngoingLoader::LoadEdge(FeatureID const & featureId, - RoadInfo const & roadInfo) +void IRoadGraph::CrossIngoingLoader::LoadEdges(FeatureID const & featureId, + RoadInfo const & roadInfo) { size_t const numPoints = roadInfo.m_points.size(); diff --git a/routing/road_graph.hpp b/routing/road_graph.hpp index 143c7a75e3..192841a295 100644 --- a/routing/road_graph.hpp +++ b/routing/road_graph.hpp @@ -116,11 +116,11 @@ public: void operator()(FeatureID const & featureId, RoadInfo const & roadInfo) { - LoadEdge(featureId, roadInfo); + LoadEdges(featureId, roadInfo); } private: - virtual void LoadEdge(FeatureID const & featureId, RoadInfo const & roadInfo) = 0; + virtual void LoadEdges(FeatureID const & featureId, RoadInfo const & roadInfo) = 0; protected: m2::PointD const m_cross; @@ -137,7 +137,7 @@ public: } // ICrossEdgesLoader overrides: - virtual void LoadEdge(FeatureID const & featureId, RoadInfo const & roadInfo) override; + virtual void LoadEdges(FeatureID const & featureId, RoadInfo const & roadInfo) override; }; class CrossIngoingLoader : public ICrossEdgesLoader @@ -148,7 +148,7 @@ public: { } // ICrossEdgesLoader overrides: - virtual void LoadEdge(FeatureID const & featureId, RoadInfo const & roadInfo) override; + virtual void LoadEdges(FeatureID const & featureId, RoadInfo const & roadInfo) override; }; virtual ~IRoadGraph() = default; |