From a98cc51ac22d3f56a34d55cc0255539601492fdd Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Fri, 4 Mar 2016 16:13:30 +0100 Subject: [PATCH] Fix up some PR comments --- .../extractor/edge_based_graph_factory.hpp | 4 +-- src/extractor/edge_based_graph_factory.cpp | 25 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp index 6b89169a0..6dfbca3ff 100644 --- a/include/extractor/edge_based_graph_factory.hpp +++ b/include/extractor/edge_based_graph_factory.hpp @@ -43,7 +43,7 @@ class EdgeBasedGraphFactory EdgeBasedGraphFactory &operator=(const EdgeBasedGraphFactory &) = delete; explicit EdgeBasedGraphFactory(std::shared_ptr node_based_graph, - CompressedEdgeContainer &compressed_edge_container, + const CompressedEdgeContainer &compressed_edge_container, const std::unordered_set &barrier_nodes, const std::unordered_set &traffic_lights, std::shared_ptr restriction_map, @@ -99,7 +99,7 @@ class EdgeBasedGraphFactory const std::unordered_set &m_barrier_nodes; const std::unordered_set &m_traffic_lights; - CompressedEdgeContainer &m_compressed_edge_container; + const CompressedEdgeContainer &m_compressed_edge_container; SpeedProfileProperties speed_profile; diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp index c92fd247e..d69c91479 100644 --- a/src/extractor/edge_based_graph_factory.cpp +++ b/src/extractor/edge_based_graph_factory.cpp @@ -45,7 +45,7 @@ const double constexpr DESIRED_SEGMENT_LENGTH = 10.; EdgeBasedGraphFactory::EdgeBasedGraphFactory( std::shared_ptr node_based_graph, - CompressedEdgeContainer &compressed_edge_container, + const CompressedEdgeContainer &compressed_edge_container, const std::unordered_set &barrier_nodes, const std::unordered_set &traffic_lights, std::shared_ptr restriction_map, @@ -127,7 +127,8 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeI BOOST_ASSERT(m_compressed_edge_container.HasEntryForID(edge_id_1)); BOOST_ASSERT(m_compressed_edge_container.HasEntryForID(edge_id_2)); const auto &forward_geometry = m_compressed_edge_container.GetBucketReference(edge_id_1); - BOOST_ASSERT(forward_geometry.size() == m_compressed_edge_container.GetBucketReference(edge_id_2).size()); + BOOST_ASSERT(forward_geometry.size() == + m_compressed_edge_container.GetBucketReference(edge_id_2).size()); const unsigned geometry_size = static_cast(forward_geometry.size()); // There should always be some geometry @@ -149,10 +150,10 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeI // build edges m_edge_based_node_list.emplace_back( forward_data.edge_id, reverse_data.edge_id, current_edge_source_coordinate_id, - current_edge_target_coordinate_id, forward_data.name_id, + current_edge_target_coordinate_id, forward_data.name_id, m_compressed_edge_container.GetPositionForID(edge_id_1), - m_compressed_edge_container.GetPositionForID(edge_id_2), - false, INVALID_COMPONENTID, i, forward_data.travel_mode, reverse_data.travel_mode); + m_compressed_edge_container.GetPositionForID(edge_id_2), false, INVALID_COMPONENTID, + i, forward_data.travel_mode, reverse_data.travel_mode); m_edge_based_node_is_startpoint.push_back(forward_data.startpoint || reverse_data.startpoint); @@ -194,8 +195,8 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeI m_edge_based_node_list.emplace_back( forward_data.edge_id, reverse_data.edge_id, node_u, node_v, forward_data.name_id, m_compressed_edge_container.GetPositionForID(edge_id_1), - m_compressed_edge_container.GetPositionForID(edge_id_2), - false, INVALID_COMPONENTID, 0, forward_data.travel_mode, reverse_data.travel_mode); + m_compressed_edge_container.GetPositionForID(edge_id_2), false, INVALID_COMPONENTID, 0, + forward_data.travel_mode, reverse_data.travel_mode); m_edge_based_node_is_startpoint.push_back(forward_data.startpoint || reverse_data.startpoint); } @@ -745,8 +746,8 @@ bool EdgeBasedGraphFactory::isObviousChoice(EdgeID via_eid, const auto &candidate_to_the_right = turn_candidates[getRight(turn_index)]; - const auto hasValidRatio = - [](const TurnCandidate &left, const TurnCandidate ¢er, const TurnCandidate &right) + const auto hasValidRatio = [](const TurnCandidate &left, const TurnCandidate ¢er, + const TurnCandidate &right) { auto angle_left = (left.angle > 180) ? angularDeviation(left.angle, STRAIGHT_ANGLE) : 180; auto angle_right = @@ -1080,9 +1081,9 @@ QueryNode EdgeBasedGraphFactory::getRepresentativeCoordinate(const NodeID src, double this_dist = 0; NodeID prev_id = INVERTED ? tgt : src; - const auto selectBestCandidate = - [this](const NodeID current, const double current_distance, const NodeID previous, - const double previous_distance) + const auto selectBestCandidate = [this](const NodeID current, const double current_distance, + const NodeID previous, + const double previous_distance) { if (current_distance < DESIRED_SEGMENT_LENGTH || current_distance - DESIRED_SEGMENT_LENGTH <