From 0361e0204a2bba5b425f8eeb5ea840576a0fb42b Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 19 Nov 2014 10:53:28 +0100 Subject: [PATCH] rename Clear() method to clear() --- Extractor/ExtractionNode.h | 2 +- Extractor/ExtractionWay.h | 4 ++-- Extractor/Extractor.cpp | 37 ++++++++++++------------------------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/Extractor/ExtractionNode.h b/Extractor/ExtractionNode.h index b53321ed5..799455102 100644 --- a/Extractor/ExtractionNode.h +++ b/Extractor/ExtractionNode.h @@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct ExtractionNode { ExtractionNode() : traffic_lights(false), barrier(false) { } - void Clear() + void clear() { traffic_lights = barrier = false; } diff --git a/Extractor/ExtractionWay.h b/Extractor/ExtractionWay.h index 740c4beaf..2e64ba6e2 100644 --- a/Extractor/ExtractionWay.h +++ b/Extractor/ExtractionWay.h @@ -36,9 +36,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct ExtractionWay { - ExtractionWay() { Clear(); } + ExtractionWay() { clear(); } - void Clear() + void clear() { forward_speed = -1; backward_speed = -1; diff --git a/Extractor/Extractor.cpp b/Extractor/Extractor.cpp index 8abd59313..2c23edfdc 100644 --- a/Extractor/Extractor.cpp +++ b/Extractor/Extractor.cpp @@ -105,13 +105,6 @@ int Extractor::Run(int argc, char *argv[]) SimpleLogger().Write() << "Input file: " << extractor_config.input_path.filename().string(); SimpleLogger().Write() << "Profile: " << extractor_config.profile_path.filename().string(); SimpleLogger().Write() << "Threads: " << extractor_config.requested_num_threads; - // if (recommended_num_threads != extractor_config.requested_num_threads) - // { - // SimpleLogger().Write(logWARNING) << "The recommended number of threads is " - // << recommended_num_threads - // << "! This setting may have performance - // side-effects."; - // } auto number_of_threads = std::max(1, @@ -120,22 +113,18 @@ int Extractor::Run(int argc, char *argv[]) tbb::task_scheduler_init init(number_of_threads); - SimpleLogger().Write() << "requested_num_threads: " - << extractor_config.requested_num_threads; - SimpleLogger().Write() << "number_of_threads: " << number_of_threads; - // setup scripting environment ScriptingEnvironment scripting_environment(extractor_config.profile_path.string().c_str()); std::unordered_map string_map; - ExtractionContainers extraction_containers; - string_map[""] = 0; + + ExtractionContainers extraction_containers; auto extractor_callbacks = osrm::make_unique(extraction_containers, string_map); - osmium::io::File infile(extractor_config.input_path.string()); - osmium::io::Reader reader(infile); + osmium::io::File input_file(extractor_config.input_path.string()); + osmium::io::Reader reader(input_file); osmium::io::Header header = reader.header(); unsigned number_of_nodes = 0; @@ -177,11 +166,11 @@ int Extractor::Run(int argc, char *argv[]) while (osmium::memory::Buffer buffer = reader.read()) { // create a vector of iterators into the buffer - std::vector elements; + std::vector osm_elements; osmium::memory::Buffer::iterator iter = std::begin(buffer); while (iter != std::end(buffer)) { - elements.push_back(iter); + osm_elements.push_back(iter); iter = std::next(iter); } @@ -190,15 +179,13 @@ int Extractor::Run(int argc, char *argv[]) resulting_ways.clear(); resulting_restrictions.clear(); - // SimpleLogger().Write(logDEBUG) << "elements count: " << elements.size(); - // parse OSM entities in parallel, store in resulting vectors - tbb::parallel_for(tbb::blocked_range(0, elements.size()), + tbb::parallel_for(tbb::blocked_range(0, osm_elements.size()), [&](const tbb::blocked_range &range) { for (auto x = range.begin(); x != range.end(); ++x) { - auto entity = elements[x]; + auto entity = osm_elements[x]; ExtractionNode result_node; ExtractionWay result_way; @@ -207,7 +194,7 @@ int Extractor::Run(int argc, char *argv[]) { case osmium::item_type::node: ++number_of_nodes; - result_node.Clear(); + result_node.clear(); luabind::call_function( scripting_environment.getLuaState(), "node_function", @@ -217,7 +204,7 @@ int Extractor::Run(int argc, char *argv[]) break; case osmium::item_type::way: ++number_of_ways; - result_way.Clear(); + result_way.clear(); luabind::call_function( scripting_environment.getLuaState(), "way_function", @@ -242,12 +229,12 @@ int Extractor::Run(int argc, char *argv[]) for (const auto &result : resulting_nodes) { extractor_callbacks->ProcessNode( - static_cast(*(elements[result.first])), result.second); + static_cast(*(osm_elements[result.first])), result.second); } for (const auto &result : resulting_ways) { extractor_callbacks->ProcessWay( - static_cast(*(elements[result.first])), result.second); + static_cast(*(osm_elements[result.first])), result.second); } for (const auto &result : resulting_restrictions) {