From 04c2167c2d8f64f40739ad9b03cfe4f90624b7e0 Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Fri, 22 Oct 2021 12:00:07 +0100 Subject: [PATCH] Fix for_each_indexed util function - Fix typo in util function name for_each_indexed. - Use the overloaded functions for_each_indexed and for_each_pair with a container argument where possible to improve readability. --- include/util/for_each_indexed.hpp | 2 +- src/extractor/extraction_containers.cpp | 4 ++-- src/extractor/extractor_callbacks.cpp | 8 ++------ src/extractor/restriction_graph.cpp | 3 +-- src/updater/updater.cpp | 10 ---------- unit_tests/partitioner/multi_level_partition.cpp | 4 ++-- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/include/util/for_each_indexed.hpp b/include/util/for_each_indexed.hpp index bae2fdd80..86655416b 100644 --- a/include/util/for_each_indexed.hpp +++ b/include/util/for_each_indexed.hpp @@ -20,7 +20,7 @@ void for_each_indexed(ForwardIterator first, ForwardIterator last, Function func } template -void for_each_pair(ContainerT &container, Function function) +void for_each_indexed(ContainerT &container, Function function) { for_each_indexed(std::begin(container), std::end(container), function); } diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index ca967cc5c..a587c15c4 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -747,7 +747,7 @@ ExtractionContainers::ReferencedWays ExtractionContainers::IdentifyManeuverOverr // Then, populate the values in that hashtable for only the ways // referenced - util::for_each_indexed(ways_list.cbegin(), ways_list.cend(), set_ids); + util::for_each_indexed(ways_list, set_ids); TIMER_STOP(identify_maneuver_override_ways); log << "ok, after " << TIMER_SEC(identify_maneuver_override_ways) << "s"; @@ -972,7 +972,7 @@ ExtractionContainers::ReferencedWays ExtractionContainers::IdentifyRestrictionWa } }; - util::for_each_indexed(ways_list.cbegin(), ways_list.cend(), set_ids); + util::for_each_indexed(ways_list, set_ids); TIMER_STOP(identify_restriction_ways); log << "ok, after " << TIMER_SEC(identify_restriction_ways) << "s"; diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp index e401d858e..9ac6db0c6 100644 --- a/src/extractor/extractor_callbacks.cpp +++ b/src/extractor/extractor_callbacks.cpp @@ -421,9 +421,7 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti parsed_way.forward_travel_mode, parsed_way.is_left_hand_driving}); util::for_each_pair( - nodes.cbegin(), - nodes.cend(), - [&](const osmium::NodeRef &first_node, const osmium::NodeRef &last_node) { + nodes, [&](const osmium::NodeRef &first_node, const osmium::NodeRef &last_node) { NodeBasedEdgeWithOSM edge = { OSMNodeID{static_cast(first_node.ref())}, OSMNodeID{static_cast(last_node.ref())}, @@ -457,9 +455,7 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti parsed_way.backward_travel_mode, parsed_way.is_left_hand_driving}); util::for_each_pair( - nodes.cbegin(), - nodes.cend(), - [&](const osmium::NodeRef &first_node, const osmium::NodeRef &last_node) { + nodes, [&](const osmium::NodeRef &first_node, const osmium::NodeRef &last_node) { NodeBasedEdgeWithOSM edge = { OSMNodeID{static_cast(first_node.ref())}, OSMNodeID{static_cast(last_node.ref())}, diff --git a/src/extractor/restriction_graph.cpp b/src/extractor/restriction_graph.cpp index a5c2a9a03..376b56b0e 100644 --- a/src/extractor/restriction_graph.cpp +++ b/src/extractor/restriction_graph.cpp @@ -215,8 +215,7 @@ void buildGraph(RestrictionGraph &rg, const std::vector &restri if (restriction.Type() == RestrictionType::WAY_RESTRICTION) { const auto &way_restriction = restriction.AsWayRestriction(); - util::for_each_pair(way_restriction.via.begin(), - way_restriction.via.end(), + util::for_each_pair(way_restriction.via, [&](NodeID from, NodeID to) { builder.next(from, to); }); } builder.end(restriction); diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp index 13f10aa29..8371b3696 100644 --- a/src/updater/updater.cpp +++ b/src/updater/updater.cpp @@ -4,15 +4,12 @@ #include "extractor/compressed_edge_container.hpp" #include "extractor/edge_based_graph_factory.hpp" #include "extractor/files.hpp" -#include "extractor/node_based_edge.hpp" #include "extractor/packed_osm_ids.hpp" #include "extractor/restriction.hpp" #include "extractor/serialization.hpp" #include "guidance/files.hpp" -#include "storage/io.hpp" - #include "util/exception.hpp" #include "util/exception_utils.hpp" #include "util/for_each_pair.hpp" @@ -20,7 +17,6 @@ #include "util/log.hpp" #include "util/mmap_tar.hpp" #include "util/opening_hours.hpp" -#include "util/static_graph.hpp" #include "util/static_rtree.hpp" #include "util/string_util.hpp" #include "util/timezones.hpp" @@ -29,10 +25,6 @@ #include #include -#include -#include -#include -#include #include #include @@ -45,10 +37,8 @@ #include #include #include -#include #include #include -#include #include #include diff --git a/unit_tests/partitioner/multi_level_partition.cpp b/unit_tests/partitioner/multi_level_partition.cpp index 7fc7acd14..32569d957 100644 --- a/unit_tests/partitioner/multi_level_partition.cpp +++ b/unit_tests/partitioner/multi_level_partition.cpp @@ -251,7 +251,7 @@ BOOST_AUTO_TEST_CASE(cell_64_bits) } levels_to_num_cells[level] = num_cells; }; - util::for_each_indexed(level_cells.cbegin(), level_cells.cend(), set_level_cells); + util::for_each_indexed(level_cells, set_level_cells); MultiLevelPartition mlp{levels, levels_to_num_cells}; @@ -280,7 +280,7 @@ BOOST_AUTO_TEST_CASE(cell_overflow_bits) } levels_to_num_cells[level] = num_cells; }; - util::for_each_indexed(level_cells.cbegin(), level_cells.cend(), set_level_cells); + util::for_each_indexed(level_cells, set_level_cells); BOOST_REQUIRE_EXCEPTION(MultiLevelPartition(levels, levels_to_num_cells), util::exception,