From 44bca6142f95084e0f6c1831269c7fe1a30625a8 Mon Sep 17 00:00:00 2001 From: tatiana-kondakova Date: Tue, 7 Nov 2017 15:56:39 +0300 Subject: [PATCH] TransitGraph refactoring: review fixes --- routing/transit_graph.cpp | 25 +++++++++++-------------- routing/transit_graph.hpp | 22 ++++++++++++---------- routing/transit_graph_loader.cpp | 8 ++++---- routing_common/transit_types.hpp | 1 - 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/routing/transit_graph.cpp b/routing/transit_graph.cpp index e704933ef5..f5e9a6e0a2 100644 --- a/routing/transit_graph.cpp +++ b/routing/transit_graph.cpp @@ -99,7 +99,7 @@ bool TransitGraph::FindReal(Segment const & fake, Segment & real) const void TransitGraph::Fill(vector const & stops, vector const & edges, vector const & lines, vector const & gates, - map const & gateEndings) + map const & gateEndings) { // Line has information about transit interval. Average time to wait transport for particular line // is half of this line interval. @@ -110,14 +110,14 @@ void TransitGraph::Fill(vector const & stops, vector> stopToBack; - map> stopToFront; + StopToSegmentsMap stopToBack; + StopToSegmentsMap stopToFront; for (auto const & gate : gates) { CHECK_NOT_EQUAL(gate.GetWeight(), transit::kInvalidWeight, ("Gate should have valid weight.")); // Gate ending may have empty projections vector. It means gate is not connected to roads - auto const it = gateEndings.find(gate.GetFeatureIdentifiers()); + auto const it = gateEndings.find(gate.GetOsmId()); if (it != gateEndings.cend()) { if (gate.GetEntrance()) @@ -127,8 +127,8 @@ void TransitGraph::Fill(vector const & stops, vector> outgoing; - map> ingoing; + StopToSegmentsMap outgoing; + StopToSegmentsMap ingoing; for (auto const & edge : edges) { CHECK_NOT_EQUAL(edge.GetWeight(), transit::kInvalidWeight, ("Edge should have valid weight.")); @@ -178,8 +178,7 @@ Segment TransitGraph::GetNewTransitSegment() const void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending, map const & stopCoords, bool isEnter, - map> & stopToBack, - map> & stopToFront) + StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront) { Segment const dummy = Segment(); for (auto const & projection : ending.m_projections) @@ -232,8 +231,7 @@ void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending Segment TransitGraph::AddEdge(transit::Edge const & edge, map const & stopCoords, - map> & stopToBack, - map> & stopToFront) + StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront) { auto const edgeSegment = GetNewTransitSegment(); auto const stopFromId = edge.GetStop1Id(); @@ -247,10 +245,9 @@ Segment TransitGraph::AddEdge(transit::Edge const & edge, return edgeSegment; } -void TransitGraph::AddConnections(map> const & connections, - map> const & stopToBack, - map> const & stopToFront, - bool isOutgoing) +void TransitGraph::AddConnections(StopToSegmentsMap const & connections, + StopToSegmentsMap const & stopToBack, + StopToSegmentsMap const & stopToFront, bool isOutgoing) { for (auto const & connection : connections) { diff --git a/routing/transit_graph.hpp b/routing/transit_graph.hpp index 34a2b9a36d..34748ef0e3 100644 --- a/routing/transit_graph.hpp +++ b/routing/transit_graph.hpp @@ -36,7 +36,7 @@ public: void Fill(std::vector const & stops, std::vector const & edges, std::vector const & lines, std::vector const & gates, - std::map const & gateEndings); + std::map const & gateEndings); bool IsGate(Segment const & segment) const; bool IsEdge(Segment const & segment) const; @@ -44,22 +44,24 @@ public: transit::Edge const & GetEdge(Segment const & segment) const; private: + using StopToSegmentsMap = std::map>; + Segment GetTransitSegment(uint32_t segmentIdx) const; Segment GetNewTransitSegment() const; + // Adds gate to fake graph. Also adds gate to temporary stopToBack, stopToFront maps used while + // TransitGraph::Fill. void AddGate(transit::Gate const & gate, FakeEnding const & ending, std::map const & stopCoords, bool isEnter, - std::map> & stopToBack, - std::map> & stopToFront); - // Adds transit edge to fake graph, returns corresponding transit segment. + StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront); + // Adds transit edge to fake graph, returns corresponding transit segment. Also adds gate to + // temporary stopToBack, stopToFront maps used while TransitGraph::Fill. Segment AddEdge(transit::Edge const & edge, std::map const & stopCoords, - std::map> & stopToBack, - std::map> & stopToFront); - void AddConnections(std::map> const & connections, - std::map> const & stopToBack, - std::map> const & stopToFront, - bool isOutgoing); + StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront); + // Adds connections to fake graph. + void AddConnections(StopToSegmentsMap const & connections, StopToSegmentsMap const & stopToBack, + StopToSegmentsMap const & stopToFront, bool isOutgoing); static uint32_t constexpr kTransitFeatureId = FakeFeatureIds::kTransitGraphId; NumMwmId const m_mwmId = kFakeNumMwmId; diff --git a/routing/transit_graph_loader.cpp b/routing/transit_graph_loader.cpp index 76e0ab5cbe..70abd1eaf4 100644 --- a/routing/transit_graph_loader.cpp +++ b/routing/transit_graph_loader.cpp @@ -82,15 +82,15 @@ unique_ptr TransitGraphLoader::CreateTransitGraph(NumMwmId numMwmI vector lines; deserializer(lines); - map gateEndings; + map gateEndings; for (auto const & gate : gates) { auto const & gateSegment = gate.GetBestPedestrianSegment(); if (gateSegment.IsValid()) { - Segment real(numMwmId, gateSegment.GetFeatureId(), gateSegment.GetSegmentIdx(), - gateSegment.GetForward()); - gateEndings.emplace(gate.GetFeatureIdentifiers(), + Segment const real(numMwmId, gateSegment.GetFeatureId(), gateSegment.GetSegmentIdx(), + gateSegment.GetForward()); + gateEndings.emplace(gate.GetOsmId(), MakeFakeEnding(real, gate.GetPoint(), *m_estimator, indexGraph)); } } diff --git a/routing_common/transit_types.hpp b/routing_common/transit_types.hpp index eca7b01f99..00506c893a 100644 --- a/routing_common/transit_types.hpp +++ b/routing_common/transit_types.hpp @@ -202,7 +202,6 @@ public: void SetBestPedestrianSegment(SingleMwmSegment const & s) { m_bestPedestrianSegment = s; }; FeatureId GetFeatureId() const { return m_featureIdentifiers.GetFeatureId(); } - FeatureIdentifiers const & GetFeatureIdentifiers() const { return m_featureIdentifiers; } OsmId GetOsmId() const { return m_featureIdentifiers.GetOsmId(); } SingleMwmSegment const & GetBestPedestrianSegment() const { return m_bestPedestrianSegment; } bool GetEntrance() const { return m_entrance; }