diff --git a/include/extractor/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp index 874d3f677..71186ec21 100644 --- a/include/extractor/tarjan_scc.hpp +++ b/include/extractor/tarjan_scc.hpp @@ -57,7 +57,7 @@ template class TarjanSCC BOOST_ASSERT(m_graph->GetNumberOfNodes() > 0); } - void run() + void Run() { TIMER_START(SCC_RUN); const NodeID max_node_id = m_graph->GetNumberOfNodes(); @@ -167,16 +167,16 @@ template class TarjanSCC }); } - std::size_t get_number_of_components() const { return component_size_vector.size(); } + std::size_t GetNumberOfComponents() const { return component_size_vector.size(); } - std::size_t get_size_one_count() const { return size_one_counter; } + std::size_t GetSizeOneCount() const { return size_one_counter; } - unsigned get_component_size(const unsigned component_id) const + unsigned GetComponentSize(const unsigned component_id) const { return component_size_vector[component_id]; } - unsigned get_component_id(const NodeID node) const { return components_index[node]; } + unsigned GetComponentID(const NodeID node) const { return components_index[node]; } }; } } diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp index 35c651440..796e03938 100644 --- a/src/engine/plugins/trip.cpp +++ b/src/engine/plugins/trip.cpp @@ -84,9 +84,9 @@ SCC_Component SplitUnaccessibleLocations(const std::size_t number_of_locations, auto wrapper = std::make_shared>(result_table.GetTable(), number_of_locations); auto scc = extractor::TarjanSCC>(wrapper); - scc.run(); + scc.Run(); - const auto number_of_components = scc.get_number_of_components(); + const auto number_of_components = scc.GetNumberOfComponents(); std::vector range_insertion; std::vector range; @@ -100,15 +100,15 @@ SCC_Component SplitUnaccessibleLocations(const std::size_t number_of_locations, { range_insertion.push_back(prefix); range.push_back(prefix); - prefix += scc.get_component_size(j); + prefix += scc.GetComponentSize(j); } // senitel range.push_back(components.size()); for (std::size_t i = 0; i < number_of_locations; ++i) { - components[range_insertion[scc.get_component_id(i)]] = i; - ++range_insertion[scc.get_component_id(i)]; + components[range_insertion[scc.GetComponentID(i)]] = i; + ++range_insertion[scc.GetComponentID(i)]; } return SCC_Component(std::move(components), std::move(range)); diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index 977a59ce7..de2415079 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -392,16 +392,16 @@ void Extractor::FindComponents(unsigned max_edge_id, TarjanSCC component_search( std::const_pointer_cast(uncontractor_graph)); - component_search.run(); + component_search.Run(); for (auto &node : input_nodes) { - auto forward_component = component_search.get_component_id(node.forward_segment_id.id); + auto forward_component = component_search.GetComponentID(node.forward_segment_id.id); BOOST_ASSERT(!node.reverse_segment_id.enabled || forward_component == - component_search.get_component_id(node.reverse_segment_id.id)); + component_search.GetComponentID(node.reverse_segment_id.id)); - const unsigned component_size = component_search.get_component_size(forward_component); + const unsigned component_size = component_search.GetComponentSize(forward_component); node.component.is_tiny = component_size < config.small_component_size; node.component.id = 1 + forward_component; } diff --git a/src/tools/components.cpp b/src/tools/components.cpp index 45131a85c..34417da7d 100644 --- a/src/tools/components.cpp +++ b/src/tools/components.cpp @@ -122,10 +122,10 @@ int main(int argc, char *argv[]) try auto tarjan = osrm::util::make_unique>(graph); - tarjan->run(); - osrm::util::SimpleLogger().Write() << "identified: " << tarjan->get_number_of_components() + tarjan->Run(); + osrm::util::SimpleLogger().Write() << "identified: " << tarjan->GetNumberOfComponents() << " many components"; - osrm::util::SimpleLogger().Write() << "identified " << tarjan->get_size_one_count() + osrm::util::SimpleLogger().Write() << "identified " << tarjan->GetSizeOneCount() << " size 1 SCCs"; // output @@ -187,8 +187,8 @@ int main(int argc, char *argv[]) try BOOST_ASSERT(target != SPECIAL_NODEID); const unsigned size_of_containing_component = - std::min(tarjan->get_component_size(tarjan->get_component_id(source)), - tarjan->get_component_size(tarjan->get_component_id(target))); + std::min(tarjan->GetComponentSize(tarjan->GetComponentID(source)), + tarjan->GetComponentSize(tarjan->GetComponentID(target))); // edges that end on bollard nodes may actually be in two distinct components if (size_of_containing_component < 1000)