From 8114104a4334dec189aad1b9ac73cb5524a8deeb Mon Sep 17 00:00:00 2001 From: Mateusz Loskot Date: Thu, 1 Feb 2018 16:47:43 +0100 Subject: [PATCH] Rename namespace partition to partitioner Rename module partition to partitioner. This cultivates naming used in existing modules like extractor, customizer, etc. - noun vs verb (word partition is both though). --- .travis.yml | 2 +- CMakeLists.txt | 6 +-- include/customizer/cell_customizer.hpp | 14 +++--- include/customizer/edge_based_graph.hpp | 15 ++++--- include/customizer/serialization.hpp | 2 +- .../datafacade/algorithm_datafacade.hpp | 8 ++-- .../contiguous_internalmem_datafacade.hpp | 30 ++++++------- include/partition/partitioner.hpp | 21 --------- .../annotated_partition.hpp | 12 ++--- .../bisection_graph.hpp | 12 ++--- .../bisection_graph_view.hpp | 12 ++--- .../bisection_to_partition.hpp | 10 ++--- .../cell_storage.hpp | 12 ++--- .../compressed_node_based_graph_reader.hpp | 6 +-- .../dinic_max_flow.hpp | 12 ++--- .../edge_based_graph.hpp | 6 +-- .../edge_based_graph_reader.hpp | 8 ++-- include/{partition => partitioner}/files.hpp | 8 ++-- .../inertial_flow.hpp | 14 +++--- .../multi_level_graph.hpp | 8 ++-- .../multi_level_partition.hpp | 6 +-- .../partition_graph.hpp | 10 ++--- include/partitioner/partitioner.hpp | 21 +++++++++ .../partitioner_config.hpp} | 12 ++--- .../recursive_bisection.hpp | 14 +++--- .../recursive_bisection_state.hpp | 14 +++--- .../remove_unconnected.hpp | 6 +-- .../{partition => partitioner}/renumber.hpp | 12 ++--- .../reorder_first_last.hpp | 6 +-- .../serialization.hpp | 14 +++--- .../tarjan_graph_wrapper.hpp | 12 ++--- src/customize/customizer.cpp | 26 +++++------ .../alternative_path_mld.cpp | 2 +- .../annotated_partition.cpp | 6 +-- .../bisection_graph_view.cpp | 6 +-- .../bisection_to_partition.cpp | 4 +- .../dinic_max_flow.cpp | 6 +-- .../inertial_flow.cpp | 12 ++--- .../partitioner.cpp | 30 ++++++------- .../recursive_bisection.cpp | 12 ++--- .../recursive_bisection_state.cpp | 8 ++-- src/{partition => partitioner}/renumber.cpp | 4 +- .../tarjan_graph_wrapper.cpp | 6 +-- src/storage/storage.cpp | 44 +++++++++---------- src/tools/partition.cpp | 14 +++--- unit_tests/CMakeLists.txt | 12 ++--- unit_tests/customizer/cell_customization.cpp | 8 ++-- .../bisection_graph.cpp | 6 +-- .../bisection_graph_view.cpp | 8 ++-- .../bisection_to_partition.cpp | 4 +- .../cell_storage.cpp | 4 +- .../{partition => partitioner}/dinic.cpp | 10 ++--- .../graph_generator.hpp | 0 .../multi_level_graph.cpp | 4 +- .../multi_level_partition.cpp | 4 +- .../recursive_bisection.cpp | 8 ++-- .../remove_unconnected.cpp | 4 +- .../{partition => partitioner}/renumber.cpp | 4 +- .../reorder_first_last.cpp | 4 +- .../scc_integration.cpp | 8 ++-- ...tition_tests.cpp => partitioner_tests.cpp} | 0 61 files changed, 308 insertions(+), 305 deletions(-) delete mode 100644 include/partition/partitioner.hpp rename include/{partition => partitioner}/annotated_partition.hpp (95%) rename include/{partition => partitioner}/bisection_graph.hpp (94%) rename include/{partition => partitioner}/bisection_graph_view.hpp (90%) rename include/{partition => partitioner}/bisection_to_partition.hpp (63%) rename include/{partition => partitioner}/cell_storage.hpp (98%) rename include/{partition => partitioner}/compressed_node_based_graph_reader.hpp (90%) rename include/{partition => partitioner}/dinic_max_flow.hpp (93%) rename include/{partition => partitioner}/edge_based_graph.hpp (90%) rename include/{partition => partitioner}/edge_based_graph_reader.hpp (97%) rename include/{partition => partitioner}/files.hpp (95%) rename include/{partition => partitioner}/inertial_flow.hpp (55%) rename include/{partition => partitioner}/multi_level_graph.hpp (98%) rename include/{partition => partitioner}/multi_level_partition.hpp (98%) rename include/{partition => partitioner}/partition_graph.hpp (97%) create mode 100644 include/partitioner/partitioner.hpp rename include/{partition/partition_config.hpp => partitioner/partitioner_config.hpp} (81%) rename include/{partition => partitioner}/recursive_bisection.hpp (69%) rename include/{partition => partitioner}/recursive_bisection_state.hpp (83%) rename include/{partition => partitioner}/remove_unconnected.hpp (97%) rename include/{partition => partitioner}/renumber.hpp (91%) rename include/{partition => partitioner}/reorder_first_last.hpp (93%) rename include/{partition => partitioner}/serialization.hpp (89%) rename include/{partition => partitioner}/tarjan_graph_wrapper.hpp (63%) rename src/{partition => partitioner}/annotated_partition.cpp (99%) rename src/{partition => partitioner}/bisection_graph_view.cpp (94%) rename src/{partition => partitioner}/bisection_to_partition.cpp (98%) rename src/{partition => partitioner}/dinic_max_flow.cpp (99%) rename src/{partition => partitioner}/inertial_flow.cpp (95%) rename src/{partition => partitioner}/partitioner.cpp (93%) rename src/{partition => partitioner}/recursive_bisection.cpp (94%) rename src/{partition => partitioner}/recursive_bisection_state.cpp (97%) rename src/{partition => partitioner}/renumber.cpp (97%) rename src/{partition => partitioner}/tarjan_graph_wrapper.cpp (85%) rename unit_tests/{partition => partitioner}/bisection_graph.cpp (97%) rename unit_tests/{partition => partitioner}/bisection_graph_view.cpp (97%) rename unit_tests/{partition => partitioner}/bisection_to_partition.cpp (99%) rename unit_tests/{partition => partitioner}/cell_storage.cpp (99%) rename unit_tests/{partition => partitioner}/dinic.cpp (91%) rename unit_tests/{partition => partitioner}/graph_generator.hpp (100%) rename unit_tests/{partition => partitioner}/multi_level_graph.cpp (99%) rename unit_tests/{partition => partitioner}/multi_level_partition.cpp (98%) rename unit_tests/{partition => partitioner}/recursive_bisection.cpp (94%) rename unit_tests/{partition => partitioner}/remove_unconnected.cpp (97%) rename unit_tests/{partition => partitioner}/renumber.cpp (97%) rename unit_tests/{partition => partitioner}/reorder_first_last.cpp (94%) rename unit_tests/{partition => partitioner}/scc_integration.cpp (93%) rename unit_tests/{partition_tests.cpp => partitioner_tests.cpp} (100%) diff --git a/.travis.yml b/.travis.yml index 8a089f7d7..8079c08cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -431,7 +431,7 @@ script: - ./unit_tests/engine-tests - ./unit_tests/util-tests - ./unit_tests/server-tests - - ./unit_tests/partition-tests + - ./unit_tests/partitioner-tests - | if [ -z "${ENABLE_SANITIZER}" ] && [ "$TARGET_ARCH" != "i686" ]; then npm run nodejs-tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ce9c2b98..9b35091e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ configure_file( ) file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp) file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp) -file(GLOB PartitionerGlob src/partition/*.cpp) +file(GLOB PartitionerGlob src/partitioner/*.cpp) file(GLOB CustomizerGlob src/customize/*.cpp) file(GLOB ContractorGlob src/contractor/*.cpp) file(GLOB UpdaterGlob src/updater/*.cpp) @@ -723,14 +723,14 @@ file(GLOB ParametersGlob include/engine/api/*_parameters.hpp) set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/approach.hpp include/engine/phantom_node.hpp) set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/alias.hpp include/util/exception.hpp include/util/bearing.hpp) set(ExtractorHeader include/extractor/extractor.hpp include/storage/io_config.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp) -set(PartitionerHeader include/partition/partitioner.hpp include/partition/partition_config.hpp) +set(PartitionerHeader include/partitioner/partitioner.hpp include/partitioner/partitioner_config.hpp) set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp) set(StorageHeader include/storage/storage.hpp include/storage/io_config.hpp include/storage/storage_config.hpp) install(FILES ${EngineHeader} DESTINATION include/osrm/engine) install(FILES ${UtilHeader} DESTINATION include/osrm/util) install(FILES ${StorageHeader} DESTINATION include/osrm/storage) install(FILES ${ExtractorHeader} DESTINATION include/osrm/extractor) -install(FILES ${PartitionerHeader} DESTINATION include/osrm/partition) +install(FILES ${PartitionerHeader} DESTINATION include/osrm/partitioner) install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor) install(FILES ${LibraryGlob} DESTINATION include/osrm) install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api) diff --git a/include/customizer/cell_customizer.hpp b/include/customizer/cell_customizer.hpp index f10d90743..01e65e582 100644 --- a/include/customizer/cell_customizer.hpp +++ b/include/customizer/cell_customizer.hpp @@ -1,8 +1,8 @@ #ifndef OSRM_CELLS_CUSTOMIZER_HPP #define OSRM_CELLS_CUSTOMIZER_HPP -#include "partition/cell_storage.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/multi_level_partition.hpp" #include "util/query_heap.hpp" #include @@ -29,12 +29,12 @@ class CellCustomizer util::QueryHeap>; using HeapPtr = tbb::enumerable_thread_specific; - CellCustomizer(const partition::MultiLevelPartition &partition) : partition(partition) {} + CellCustomizer(const partitioner::MultiLevelPartition &partition) : partition(partition) {} template void Customize(const GraphT &graph, Heap &heap, - const partition::CellStorage &cells, + const partitioner::CellStorage &cells, const std::vector &allowed_nodes, CellMetric &metric, LevelID level, @@ -97,7 +97,7 @@ class CellCustomizer template void Customize(const GraphT &graph, - const partition::CellStorage &cells, + const partitioner::CellStorage &cells, const std::vector &allowed_nodes, CellMetric &metric) const { @@ -121,7 +121,7 @@ class CellCustomizer private: template void RelaxNode(const GraphT &graph, - const partition::CellStorage &cells, + const partitioner::CellStorage &cells, const std::vector &allowed_nodes, const CellMetric &metric, Heap &heap, @@ -209,7 +209,7 @@ class CellCustomizer } } - const partition::MultiLevelPartition &partition; + const partitioner::MultiLevelPartition &partition; }; } } diff --git a/include/customizer/edge_based_graph.hpp b/include/customizer/edge_based_graph.hpp index 6dfa28aff..10a088dbd 100644 --- a/include/customizer/edge_based_graph.hpp +++ b/include/customizer/edge_based_graph.hpp @@ -2,8 +2,8 @@ #define OSRM_CUSTOMIZE_EDGE_BASED_GRAPH_HPP #include "extractor/edge_based_edge.hpp" -#include "partition/edge_based_graph.hpp" -#include "partition/multi_level_graph.hpp" +#include "partitioner/edge_based_graph.hpp" +#include "partitioner/multi_level_graph.hpp" #include "util/static_graph.hpp" #include "util/typedefs.hpp" @@ -16,19 +16,20 @@ namespace osrm namespace customizer { -using EdgeBasedGraphEdgeData = partition::EdgeBasedGraphEdgeData; +using EdgeBasedGraphEdgeData = partitioner::EdgeBasedGraphEdgeData; struct MultiLevelEdgeBasedGraph - : public partition::MultiLevelGraph + : public partitioner::MultiLevelGraph { - using Base = partition::MultiLevelGraph; + using Base = + partitioner::MultiLevelGraph; using Base::Base; }; struct MultiLevelEdgeBasedGraphView - : public partition::MultiLevelGraph + : public partitioner::MultiLevelGraph { - using Base = partition::MultiLevelGraph; + using Base = partitioner::MultiLevelGraph; using Base::Base; }; diff --git a/include/customizer/serialization.hpp b/include/customizer/serialization.hpp index f463b59d4..3d069f8cb 100644 --- a/include/customizer/serialization.hpp +++ b/include/customizer/serialization.hpp @@ -1,7 +1,7 @@ #ifndef OSRM_CUSTOMIZER_SERIALIZATION_HPP #define OSRM_CUSTOMIZER_SERIALIZATION_HPP -#include "partition/cell_storage.hpp" +#include "partitioner/cell_storage.hpp" #include "storage/io.hpp" #include "storage/serialization.hpp" diff --git a/include/engine/datafacade/algorithm_datafacade.hpp b/include/engine/datafacade/algorithm_datafacade.hpp index 496d33b9d..00e02e0a5 100644 --- a/include/engine/datafacade/algorithm_datafacade.hpp +++ b/include/engine/datafacade/algorithm_datafacade.hpp @@ -5,8 +5,8 @@ #include "extractor/edge_based_edge.hpp" #include "engine/algorithm.hpp" -#include "partition/cell_storage.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/multi_level_partition.hpp" #include "util/filtered_graph.hpp" #include "util/integer_range.hpp" @@ -75,9 +75,9 @@ template <> class AlgorithmDataFacade virtual EdgeRange GetAdjacentEdgeRange(const NodeID node) const = 0; - virtual const partition::MultiLevelPartitionView &GetMultiLevelPartition() const = 0; + virtual const partitioner::MultiLevelPartitionView &GetMultiLevelPartition() const = 0; - virtual const partition::CellStorageView &GetCellStorage() const = 0; + virtual const partitioner::CellStorageView &GetCellStorage() const = 0; virtual const customizer::CellMetricView &GetCellMetric() const = 0; diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp index a0f189a20..0090aabe3 100644 --- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp +++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp @@ -24,8 +24,8 @@ #include "contractor/query_graph.hpp" -#include "partition/cell_storage.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/multi_level_partition.hpp" #include "storage/shared_datatype.hpp" #include "storage/shared_memory_ownership.hpp" @@ -912,8 +912,8 @@ class ContiguousInternalMemoryDataFacade template <> class ContiguousInternalMemoryAlgorithmDataFacade : public AlgorithmDataFacade { // MLD data - partition::MultiLevelPartitionView mld_partition; - partition::CellStorageView mld_cell_storage; + partitioner::MultiLevelPartitionView mld_partition; + partitioner::CellStorageView mld_cell_storage; customizer::CellMetricView mld_cell_metric; using QueryGraph = customizer::MultiLevelEdgeBasedGraphView; using GraphNode = QueryGraph::NodeArrayEntry; @@ -939,7 +939,7 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo BOOST_ASSERT(data_layout.GetBlockSize(storage::DataLayout::MLD_CELL_TO_CHILDREN) > 0); auto level_data = - data_layout.GetBlockPtr( + data_layout.GetBlockPtr( memory_block, storage::DataLayout::MLD_LEVEL_DATA); auto mld_partition_ptr = data_layout.GetBlockPtr( @@ -955,7 +955,7 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo util::vector_view cell_to_children(mld_chilren_ptr, children_entries_count); mld_partition = - partition::MultiLevelPartitionView{level_data, partition, cell_to_children}; + partitioner::MultiLevelPartitionView{level_data, partition, cell_to_children}; } const auto weights_block_id = static_cast( @@ -988,7 +988,7 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo memory_block, storage::DataLayout::MLD_CELL_SOURCE_BOUNDARY); auto mld_destination_boundary_ptr = data_layout.GetBlockPtr( memory_block, storage::DataLayout::MLD_CELL_DESTINATION_BOUNDARY); - auto mld_cells_ptr = data_layout.GetBlockPtr( + auto mld_cells_ptr = data_layout.GetBlockPtr( memory_block, storage::DataLayout::MLD_CELLS); auto mld_cell_level_offsets_ptr = data_layout.GetBlockPtr( memory_block, storage::DataLayout::MLD_CELL_LEVEL_OFFSETS); @@ -1005,15 +1005,15 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo source_boundary_entries_count); util::vector_view destination_boundary(mld_destination_boundary_ptr, destination_boundary_entries_count); - util::vector_view cells(mld_cells_ptr, - cells_entries_counts); + util::vector_view cells(mld_cells_ptr, + cells_entries_counts); util::vector_view level_offsets(mld_cell_level_offsets_ptr, cell_level_offsets_entries_count); - mld_cell_storage = partition::CellStorageView{std::move(source_boundary), - std::move(destination_boundary), - std::move(cells), - std::move(level_offsets)}; + mld_cell_storage = partitioner::CellStorageView{std::move(source_boundary), + std::move(destination_boundary), + std::move(cells), + std::move(level_offsets)}; } } void InitializeGraphPointer(storage::DataLayout &data_layout, char *memory_block) @@ -1050,12 +1050,12 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo InitializeInternalPointers(allocator->GetLayout(), allocator->GetMemory(), exclude_index); } - const partition::MultiLevelPartitionView &GetMultiLevelPartition() const override + const partitioner::MultiLevelPartitionView &GetMultiLevelPartition() const override { return mld_partition; } - const partition::CellStorageView &GetCellStorage() const override { return mld_cell_storage; } + const partitioner::CellStorageView &GetCellStorage() const override { return mld_cell_storage; } const customizer::CellMetricView &GetCellMetric() const override { return mld_cell_metric; } diff --git a/include/partition/partitioner.hpp b/include/partition/partitioner.hpp deleted file mode 100644 index ed7d91ffd..000000000 --- a/include/partition/partitioner.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef OSRM_PARTITION_PARTITIONER_HPP_ -#define OSRM_PARTITION_PARTITIONER_HPP_ - -#include "partition/partition_config.hpp" - -namespace osrm -{ -namespace partition -{ - -// tool access to the recursive partitioner -class Partitioner -{ - public: - int Run(const PartitionConfig &config); -}; - -} // namespace partition -} // namespace osrm - -#endif // OSRM_PARTITION_PARTITIONER_HPP_ diff --git a/include/partition/annotated_partition.hpp b/include/partitioner/annotated_partition.hpp similarity index 95% rename from include/partition/annotated_partition.hpp rename to include/partitioner/annotated_partition.hpp index 30293a6ff..c67541480 100644 --- a/include/partition/annotated_partition.hpp +++ b/include/partitioner/annotated_partition.hpp @@ -1,7 +1,7 @@ -#ifndef OSRM_PARTITION_ANNOTATE_HPP_ -#define OSRM_PARTITION_ANNOTATE_HPP_ +#ifndef OSRM_PARTITIONER_ANNOTATE_HPP_ +#define OSRM_PARTITIONER_ANNOTATE_HPP_ -#include "partition/bisection_graph.hpp" +#include "partitioner/bisection_graph.hpp" #include "util/typedefs.hpp" #include #include @@ -9,7 +9,7 @@ namespace osrm { -namespace partition +namespace partitioner { // takes the result of a recursive bisection and turns it into an annotated partition for MLD. These @@ -130,7 +130,7 @@ class AnnotatedPartition const std::vector &bisection_ids) const; }; -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_ANNOTATE_HPP_ +#endif // OSRM_PARTITIONER_ANNOTATE_HPP_ diff --git a/include/partition/bisection_graph.hpp b/include/partitioner/bisection_graph.hpp similarity index 94% rename from include/partition/bisection_graph.hpp rename to include/partitioner/bisection_graph.hpp index 09a16a4ac..bc2bd44ca 100644 --- a/include/partition/bisection_graph.hpp +++ b/include/partitioner/bisection_graph.hpp @@ -1,10 +1,10 @@ -#ifndef OSRM_BISECTION_GRAPH_HPP_ -#define OSRM_BISECTION_GRAPH_HPP_ +#ifndef OSRM_PARTITIONER_BISECTION_GRAPH_HPP_ +#define OSRM_PARTITIONER_BISECTION_GRAPH_HPP_ #include "util/coordinate.hpp" #include "util/typedefs.hpp" -#include "partition/partition_graph.hpp" +#include "partitioner/partition_graph.hpp" #include "extractor/edge_based_edge.hpp" @@ -16,7 +16,7 @@ namespace osrm { -namespace partition +namespace partitioner { // Node in the bisection graph. We require the original node id (since we remap the nodes all the @@ -109,7 +109,7 @@ std::vector adaptToBisectionEdge(std::vector edge return result; } -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_BISECTION_GRAPH_HPP_ +#endif // OSRM_PARTITIONER_BISECTION_GRAPH_HPP_ diff --git a/include/partition/bisection_graph_view.hpp b/include/partitioner/bisection_graph_view.hpp similarity index 90% rename from include/partition/bisection_graph_view.hpp rename to include/partitioner/bisection_graph_view.hpp index ae4a430c9..04336a08f 100644 --- a/include/partition/bisection_graph_view.hpp +++ b/include/partitioner/bisection_graph_view.hpp @@ -1,7 +1,7 @@ -#ifndef OSRM_PARTITION_BISECTION_GRAPHVIEW_HPP_ -#define OSRM_PARTITION_BISECTION_GRAPHVIEW_HPP_ +#ifndef OSRM_PARTITIONER_BISECTION_GRAPHVIEW_HPP_ +#define OSRM_PARTITIONER_BISECTION_GRAPHVIEW_HPP_ -#include "partition/bisection_graph.hpp" +#include "partitioner/bisection_graph.hpp" #include #include @@ -12,7 +12,7 @@ namespace osrm { -namespace partition +namespace partitioner { // Non-owning immutable sub-graph view into a base graph. @@ -64,7 +64,7 @@ class BisectionGraphView const BisectionGraph::ConstNodeIterator end; }; -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_GRAPHVIEW_HPP_ +#endif // OSRM_PARTITIONER_GRAPHVIEW_HPP_ diff --git a/include/partition/bisection_to_partition.hpp b/include/partitioner/bisection_to_partition.hpp similarity index 63% rename from include/partition/bisection_to_partition.hpp rename to include/partitioner/bisection_to_partition.hpp index 982be54de..14186f3c4 100644 --- a/include/partition/bisection_to_partition.hpp +++ b/include/partitioner/bisection_to_partition.hpp @@ -1,14 +1,14 @@ -#ifndef BISECTION_TO_PARTITION_HPP -#define BISECTION_TO_PARTITION_HPP +#ifndef OSRM_PARTITIONER_BISECTION_TO_PARTITION_HPP +#define OSRM_PARTITIONER_BISECTION_TO_PARTITION_HPP -#include "partition/multi_level_partition.hpp" -#include "partition/recursive_bisection.hpp" +#include "partitioner/multi_level_partition.hpp" +#include "partitioner/recursive_bisection.hpp" #include namespace osrm { -namespace partition +namespace partitioner { using Partition = std::vector; diff --git a/include/partition/cell_storage.hpp b/include/partitioner/cell_storage.hpp similarity index 98% rename from include/partition/cell_storage.hpp rename to include/partitioner/cell_storage.hpp index c9ffc5bf9..03db913ca 100644 --- a/include/partition/cell_storage.hpp +++ b/include/partitioner/cell_storage.hpp @@ -1,7 +1,7 @@ -#ifndef OSRM_CUSTOMIZE_CELL_STORAGE_HPP -#define OSRM_CUSTOMIZE_CELL_STORAGE_HPP +#ifndef OSRM_PARTITIONER_CUSTOMIZE_CELL_STORAGE_HPP +#define OSRM_PARTITIONER_CUSTOMIZE_CELL_STORAGE_HPP -#include "partition/multi_level_partition.hpp" +#include "partitioner/multi_level_partition.hpp" #include "util/assert.hpp" #include "util/for_each_range.hpp" @@ -26,7 +26,7 @@ namespace osrm { -namespace partition +namespace partitioner { namespace detail { @@ -202,7 +202,7 @@ template class CellStorageImpl template > - CellStorageImpl(const partition::MultiLevelPartition &partition, const GraphT &base_graph) + CellStorageImpl(const partitioner::MultiLevelPartition &partition, const GraphT &base_graph) { // pre-allocate storge for CellData so we can have random access to it by cell id unsigned number_of_cells = 0; @@ -405,4 +405,4 @@ template class CellStorageImpl } } -#endif // OSRM_CUSTOMIZE_CELL_STORAGE_HPP +#endif // OSRM_PARTITIONER_CUSTOMIZE_CELL_STORAGE_HPP diff --git a/include/partition/compressed_node_based_graph_reader.hpp b/include/partitioner/compressed_node_based_graph_reader.hpp similarity index 90% rename from include/partition/compressed_node_based_graph_reader.hpp rename to include/partitioner/compressed_node_based_graph_reader.hpp index 8ceda92a1..d477f21b8 100644 --- a/include/partition/compressed_node_based_graph_reader.hpp +++ b/include/partitioner/compressed_node_based_graph_reader.hpp @@ -1,5 +1,5 @@ -#ifndef OSRM_COMPRESSED_NODE_BASED_GRAPH_READER_HPP -#define OSRM_COMPRESSED_NODE_BASED_GRAPH_READER_HPP +#ifndef OSRM_PARTITIONER_COMPRESSED_NODE_BASED_GRAPH_READER_HPP +#define OSRM_PARTITIONER_COMPRESSED_NODE_BASED_GRAPH_READER_HPP #include "storage/io.hpp" #include "util/coordinate.hpp" @@ -10,7 +10,7 @@ namespace osrm { -namespace partition +namespace partitioner { struct CompressedNodeBasedGraphEdge diff --git a/include/partition/dinic_max_flow.hpp b/include/partitioner/dinic_max_flow.hpp similarity index 93% rename from include/partition/dinic_max_flow.hpp rename to include/partitioner/dinic_max_flow.hpp index 5d99f0e1a..5efffe93c 100644 --- a/include/partition/dinic_max_flow.hpp +++ b/include/partitioner/dinic_max_flow.hpp @@ -1,7 +1,7 @@ -#ifndef OSRM_PARTITION_DINIC_MAX_FLOW_HPP_ -#define OSRM_PARTITION_DINIC_MAX_FLOW_HPP_ +#ifndef OSRM_PARTITIONER_DINIC_MAX_FLOW_HPP_ +#define OSRM_PARTITIONER_DINIC_MAX_FLOW_HPP_ -#include "partition/bisection_graph_view.hpp" +#include "partitioner/bisection_graph_view.hpp" #include #include @@ -12,7 +12,7 @@ namespace osrm { -namespace partition +namespace partitioner { class DinicMaxFlow @@ -88,10 +88,10 @@ class DinicMaxFlow const std::size_t flow_value) const; }; -} // namespace partition +} // namespace partitioner } // namespace osrm // Implementation of Dinics [1] algorithm for max-flow/min-cut. // [1] https://www.cs.bgu.ac.il/~dinitz/D70.pdf -#endif // OSRM_PARTITION_DINIC_MAX_FLOW_HPP_ +#endif // OSRM_PARTITIONER_DINIC_MAX_FLOW_HPP_ diff --git a/include/partition/edge_based_graph.hpp b/include/partitioner/edge_based_graph.hpp similarity index 90% rename from include/partition/edge_based_graph.hpp rename to include/partitioner/edge_based_graph.hpp index 5c8d656c6..d2ddf80a0 100644 --- a/include/partition/edge_based_graph.hpp +++ b/include/partitioner/edge_based_graph.hpp @@ -1,5 +1,5 @@ -#ifndef OSRM_EDGE_BASED_GRAPH_HPP -#define OSRM_EDGE_BASED_GRAPH_HPP +#ifndef OSRM_PARTITIONER_EDGE_BASED_GRAPH_HPP +#define OSRM_PARTITIONER_EDGE_BASED_GRAPH_HPP #include "extractor/edge_based_edge.hpp" #include "storage/io.hpp" @@ -16,7 +16,7 @@ namespace osrm { -namespace partition +namespace partitioner { struct EdgeBasedGraphEdgeData : extractor::EdgeBasedEdge::EdgeData diff --git a/include/partition/edge_based_graph_reader.hpp b/include/partitioner/edge_based_graph_reader.hpp similarity index 97% rename from include/partition/edge_based_graph_reader.hpp rename to include/partitioner/edge_based_graph_reader.hpp index 7456bce61..d4394f1f3 100644 --- a/include/partition/edge_based_graph_reader.hpp +++ b/include/partitioner/edge_based_graph_reader.hpp @@ -1,7 +1,7 @@ -#ifndef OSRM_EDGE_BASED_GRAPH_READER_HPP -#define OSRM_EDGE_BASED_GRAPH_READER_HPP +#ifndef OSRM_PARTITIONER_EDGE_BASED_GRAPH_READER_HPP +#define OSRM_PARTITIONER_EDGE_BASED_GRAPH_READER_HPP -#include "partition/edge_based_graph.hpp" +#include "partitioner/edge_based_graph.hpp" #include "extractor/edge_based_edge.hpp" #include "extractor/files.hpp" @@ -23,7 +23,7 @@ namespace osrm { -namespace partition +namespace partitioner { // Bidirectional (s,t) to (s,t) and (t,s) diff --git a/include/partition/files.hpp b/include/partitioner/files.hpp similarity index 95% rename from include/partition/files.hpp rename to include/partitioner/files.hpp index f1b69b164..0f41cb93f 100644 --- a/include/partition/files.hpp +++ b/include/partitioner/files.hpp @@ -1,15 +1,15 @@ -#ifndef OSRM_PARTITION_SERILIZATION_HPP -#define OSRM_PARTITION_SERILIZATION_HPP +#ifndef OSRM_PARTITIONER_SERILIZATION_HPP +#define OSRM_PARTITIONER_SERILIZATION_HPP #include "customizer/edge_based_graph.hpp" -#include "partition/serialization.hpp" +#include "partitioner/serialization.hpp" #include "storage/io.hpp" namespace osrm { -namespace partition +namespace partitioner { namespace files { diff --git a/include/partition/inertial_flow.hpp b/include/partitioner/inertial_flow.hpp similarity index 55% rename from include/partition/inertial_flow.hpp rename to include/partitioner/inertial_flow.hpp index b1fae6ef2..25e57d6a6 100644 --- a/include/partition/inertial_flow.hpp +++ b/include/partitioner/inertial_flow.hpp @@ -1,12 +1,12 @@ -#ifndef OSRM_PARTITION_INERTIAL_FLOW_HPP_ -#define OSRM_PARTITION_INERTIAL_FLOW_HPP_ +#ifndef OSRM_PARTITIONER_INERTIAL_FLOW_HPP_ +#define OSRM_PARTITIONER_INERTIAL_FLOW_HPP_ -#include "partition/bisection_graph_view.hpp" -#include "partition/dinic_max_flow.hpp" +#include "partitioner/bisection_graph_view.hpp" +#include "partitioner/dinic_max_flow.hpp" namespace osrm { -namespace partition +namespace partitioner { DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view, @@ -14,7 +14,7 @@ DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view, const double balance, const double source_sink_rate); -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_INERTIAL_FLOW_HPP_ +#endif // OSRM_PARTITIONER_INERTIAL_FLOW_HPP_ diff --git a/include/partition/multi_level_graph.hpp b/include/partitioner/multi_level_graph.hpp similarity index 98% rename from include/partition/multi_level_graph.hpp rename to include/partitioner/multi_level_graph.hpp index c0aa2393b..e7c921719 100644 --- a/include/partition/multi_level_graph.hpp +++ b/include/partitioner/multi_level_graph.hpp @@ -1,7 +1,7 @@ -#ifndef OSRM_PARTITION_MULTI_LEVEL_GRAPH_HPP -#define OSRM_PARTITION_MULTI_LEVEL_GRAPH_HPP +#ifndef OSRM_PARTITIONER_MULTI_LEVEL_GRAPH_HPP +#define OSRM_PARTITIONER_MULTI_LEVEL_GRAPH_HPP -#include "partition/multi_level_partition.hpp" +#include "partitioner/multi_level_partition.hpp" #include "storage/io_fwd.hpp" #include "storage/shared_memory_ownership.hpp" @@ -17,7 +17,7 @@ namespace osrm { -namespace partition +namespace partitioner { template class MultiLevelGraph; diff --git a/include/partition/multi_level_partition.hpp b/include/partitioner/multi_level_partition.hpp similarity index 98% rename from include/partition/multi_level_partition.hpp rename to include/partitioner/multi_level_partition.hpp index 9847409aa..58fdd3465 100644 --- a/include/partition/multi_level_partition.hpp +++ b/include/partitioner/multi_level_partition.hpp @@ -1,5 +1,5 @@ -#ifndef OSRM_UTIL_MULTI_LEVEL_PARTITION_HPP -#define OSRM_UTIL_MULTI_LEVEL_PARTITION_HPP +#ifndef OSRM_PARTITIONER_MULTI_LEVEL_PARTITION_HPP +#define OSRM_PARTITIONER_MULTI_LEVEL_PARTITION_HPP #include "util/exception.hpp" #include "util/for_each_pair.hpp" @@ -22,7 +22,7 @@ namespace osrm { -namespace partition +namespace partitioner { namespace detail { diff --git a/include/partition/partition_graph.hpp b/include/partitioner/partition_graph.hpp similarity index 97% rename from include/partition/partition_graph.hpp rename to include/partitioner/partition_graph.hpp index ab9ddb896..3b2d60e96 100644 --- a/include/partition/partition_graph.hpp +++ b/include/partitioner/partition_graph.hpp @@ -1,5 +1,5 @@ -#ifndef OSRM_PARTITION_GRAPH_HPP_ -#define OSRM_PARTITION_GRAPH_HPP_ +#ifndef OSRM_PARTITIONER_GRAPH_HPP_ +#define OSRM_PARTITIONER_GRAPH_HPP_ #include #include @@ -12,7 +12,7 @@ namespace osrm { -namespace partition +namespace partitioner { // forward declaration to allow finding friends @@ -156,7 +156,7 @@ template class RemappableGraph std::vector edges; }; -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_GRAPH_HPP_ +#endif // OSRM_PARTITIONER_GRAPH_HPP_ diff --git a/include/partitioner/partitioner.hpp b/include/partitioner/partitioner.hpp new file mode 100644 index 000000000..30c518524 --- /dev/null +++ b/include/partitioner/partitioner.hpp @@ -0,0 +1,21 @@ +#ifndef OSRM_PARTITIONER_PARTITIONER_HPP_ +#define OSRM_PARTITIONER_PARTITIONER_HPP_ + +#include "partitioner/partitioner_config.hpp" + +namespace osrm +{ +namespace partitioner +{ + +// tool access to the recursive partitioner +class Partitioner +{ + public: + int Run(const PartitionerConfig &config); +}; + +} // namespace partitioner +} // namespace osrm + +#endif // OSRM_PARTITIONER_PARTITIONER_HPP_ diff --git a/include/partition/partition_config.hpp b/include/partitioner/partitioner_config.hpp similarity index 81% rename from include/partition/partition_config.hpp rename to include/partitioner/partitioner_config.hpp index 7b747588a..4090bc3ae 100644 --- a/include/partition/partition_config.hpp +++ b/include/partitioner/partitioner_config.hpp @@ -1,5 +1,5 @@ -#ifndef PARTITIONER_CONFIG_HPP -#define PARTITIONER_CONFIG_HPP +#ifndef OSRM_PARTITIONER_CONFIG_HPP +#define OSRM_PARTITIONER_CONFIG_HPP #include @@ -10,12 +10,12 @@ namespace osrm { -namespace partition +namespace partitioner { -struct PartitionConfig final : storage::IOConfig +struct PartitionerConfig final : storage::IOConfig { - PartitionConfig() + PartitionerConfig() : IOConfig( {".osrm", ".osrm.fileIndex", ".osrm.ebg_nodes"}, {".osrm.hsgr", ".osrm.cnbg"}, @@ -42,4 +42,4 @@ struct PartitionConfig final : storage::IOConfig } } -#endif // PARTITIONER_CONFIG_HPP +#endif // OSRM_PARTITIONER_CONFIG_HPP diff --git a/include/partition/recursive_bisection.hpp b/include/partitioner/recursive_bisection.hpp similarity index 69% rename from include/partition/recursive_bisection.hpp rename to include/partitioner/recursive_bisection.hpp index a4c1c5e61..ddbd2bb65 100644 --- a/include/partition/recursive_bisection.hpp +++ b/include/partitioner/recursive_bisection.hpp @@ -1,8 +1,8 @@ -#ifndef OSRM_PARTITION_RECURSIVE_BISECTION_HPP_ -#define OSRM_PARTITION_RECURSIVE_BISECTION_HPP_ +#ifndef OSRM_PARTITIONER_RECURSIVE_BISECTION_HPP_ +#define OSRM_PARTITIONER_RECURSIVE_BISECTION_HPP_ -#include "partition/bisection_graph.hpp" -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/bisection_graph.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include "util/typedefs.hpp" #include @@ -10,7 +10,7 @@ namespace osrm { -namespace partition +namespace partitioner { class RecursiveBisection @@ -32,7 +32,7 @@ class RecursiveBisection RecursiveBisectionState internal_state; }; -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_RECURSIVE_BISECTION_HPP_ +#endif // OSRM_PARTITIONER_RECURSIVE_BISECTION_HPP_ diff --git a/include/partition/recursive_bisection_state.hpp b/include/partitioner/recursive_bisection_state.hpp similarity index 83% rename from include/partition/recursive_bisection_state.hpp rename to include/partitioner/recursive_bisection_state.hpp index 1f8fec448..8621fd765 100644 --- a/include/partition/recursive_bisection_state.hpp +++ b/include/partitioner/recursive_bisection_state.hpp @@ -1,17 +1,17 @@ -#ifndef OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_ -#define OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_ +#ifndef OSRM_PARTITIONER_RECURSIVE_BISECTION_STATE_HPP_ +#define OSRM_PARTITIONER_RECURSIVE_BISECTION_STATE_HPP_ #include #include #include -#include "partition/bisection_graph.hpp" -#include "partition/bisection_graph_view.hpp" +#include "partitioner/bisection_graph.hpp" +#include "partitioner/bisection_graph_view.hpp" #include "util/typedefs.hpp" namespace osrm { -namespace partition +namespace partitioner { // Keeps track of the bisection ids, modifies the graph accordingly, splitting it into a left/right @@ -50,7 +50,7 @@ class RecursiveBisectionState std::vector bisection_ids; }; -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_ +#endif // OSRM_PARTITIONER_RECURSIVE_BISECTION_STATE_HPP_ diff --git a/include/partition/remove_unconnected.hpp b/include/partitioner/remove_unconnected.hpp similarity index 97% rename from include/partition/remove_unconnected.hpp rename to include/partitioner/remove_unconnected.hpp index 9e9fbfd4b..7e6ac9679 100644 --- a/include/partition/remove_unconnected.hpp +++ b/include/partitioner/remove_unconnected.hpp @@ -1,5 +1,5 @@ -#ifndef OSRM_PARTITION_REMOVE_UNCONNECTED_HPP -#define OSRM_PARTITION_REMOVE_UNCONNECTED_HPP +#ifndef OSRM_PARTITIONER_REMOVE_UNCONNECTED_HPP +#define OSRM_PARTITIONER_REMOVE_UNCONNECTED_HPP #include "util/log.hpp" #include "util/typedefs.hpp" @@ -11,7 +11,7 @@ namespace osrm { -namespace partition +namespace partitioner { using Partition = std::vector; diff --git a/include/partition/renumber.hpp b/include/partitioner/renumber.hpp similarity index 91% rename from include/partition/renumber.hpp rename to include/partitioner/renumber.hpp index b1879a289..c5d5bdddd 100644 --- a/include/partition/renumber.hpp +++ b/include/partitioner/renumber.hpp @@ -1,19 +1,19 @@ -#ifndef OSRM_PARTITION_RENUMBER_HPP -#define OSRM_PARTITION_RENUMBER_HPP +#ifndef OSRM_PARTITIONER_RENUMBER_HPP +#define OSRM_PARTITIONER_RENUMBER_HPP #include "extractor/edge_based_node_segment.hpp" #include "extractor/nbg_to_ebg.hpp" #include "extractor/node_data_container.hpp" -#include "partition/bisection_to_partition.hpp" -#include "partition/edge_based_graph.hpp" +#include "partitioner/bisection_to_partition.hpp" +#include "partitioner/edge_based_graph.hpp" #include "util/dynamic_graph.hpp" #include "util/static_graph.hpp" namespace osrm { -namespace partition +namespace partitioner { std::vector makePermutation(const DynamicEdgeBasedGraph &graph, const std::vector &partitions); @@ -73,7 +73,7 @@ inline void renumber(std::vector &mapping, } } -} // namespace partition +} // namespace partitioner } // namespace osrm #endif diff --git a/include/partition/reorder_first_last.hpp b/include/partitioner/reorder_first_last.hpp similarity index 93% rename from include/partition/reorder_first_last.hpp rename to include/partitioner/reorder_first_last.hpp index 090efb53d..231509db0 100644 --- a/include/partition/reorder_first_last.hpp +++ b/include/partitioner/reorder_first_last.hpp @@ -1,5 +1,5 @@ -#ifndef OSRM_REORDER_FIRST_LAST_HPP -#define OSRM_REORDER_FIRST_LAST_HPP +#ifndef OSRM_PARTITIONER_REORDER_FIRST_LAST_HPP +#define OSRM_PARTITIONER_REORDER_FIRST_LAST_HPP #include @@ -9,7 +9,7 @@ namespace osrm { -namespace partition +namespace partitioner { // Reorders the first n elements in the range to satisfy the comparator, diff --git a/include/partition/serialization.hpp b/include/partitioner/serialization.hpp similarity index 89% rename from include/partition/serialization.hpp rename to include/partitioner/serialization.hpp index 1c84557d9..d181d5449 100644 --- a/include/partition/serialization.hpp +++ b/include/partitioner/serialization.hpp @@ -1,10 +1,10 @@ -#ifndef OSRM_PARTITION_SERIALIZATION_HPP -#define OSRM_PARTITION_SERIALIZATION_HPP +#ifndef OSRM_PARTITIONER_SERIALIZATION_HPP +#define OSRM_PARTITIONER_SERIALIZATION_HPP -#include "partition/cell_storage.hpp" -#include "partition/edge_based_graph.hpp" -#include "partition/multi_level_graph.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/edge_based_graph.hpp" +#include "partitioner/multi_level_graph.hpp" +#include "partitioner/multi_level_partition.hpp" #include "storage/io.hpp" #include "storage/serialization.hpp" @@ -12,7 +12,7 @@ namespace osrm { -namespace partition +namespace partitioner { namespace serialization { diff --git a/include/partition/tarjan_graph_wrapper.hpp b/include/partitioner/tarjan_graph_wrapper.hpp similarity index 63% rename from include/partition/tarjan_graph_wrapper.hpp rename to include/partitioner/tarjan_graph_wrapper.hpp index 5a2166c53..515ca2041 100644 --- a/include/partition/tarjan_graph_wrapper.hpp +++ b/include/partitioner/tarjan_graph_wrapper.hpp @@ -1,13 +1,13 @@ -#ifndef OSRM_PARTITION_TARJAN_GRAPH_WRAPPER_HPP_ -#define OSRM_PARTITION_TARJAN_GRAPH_WRAPPER_HPP_ +#ifndef OSRM_PARTITIONER_TARJAN_GRAPH_WRAPPER_HPP_ +#define OSRM_PARTITIONER_TARJAN_GRAPH_WRAPPER_HPP_ -#include "partition/bisection_graph.hpp" +#include "partitioner/bisection_graph.hpp" #include "util/integer_range.hpp" #include "util/typedefs.hpp" namespace osrm { -namespace partition +namespace partitioner { class TarjanGraphWrapper @@ -23,7 +23,7 @@ class TarjanGraphWrapper const BisectionGraph &bisection_graph; }; -} // namespace partition +} // namespace partitioner } // namespace osrm -#endif // OSRM_PARTITION_TARJAN_GRAPH_WRAPPER_HPP_ +#endif // OSRM_PARTITIONER_TARJAN_GRAPH_WRAPPER_HPP_ diff --git a/src/customize/customizer.cpp b/src/customize/customizer.cpp index 2b926c244..78adaef58 100644 --- a/src/customize/customizer.cpp +++ b/src/customize/customizer.cpp @@ -5,10 +5,10 @@ #include "customizer/edge_based_graph.hpp" #include "customizer/files.hpp" -#include "partition/cell_storage.hpp" -#include "partition/edge_based_graph_reader.hpp" -#include "partition/files.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/edge_based_graph_reader.hpp" +#include "partitioner/files.hpp" +#include "partitioner/multi_level_partition.hpp" #include "storage/shared_memory_ownership.hpp" @@ -79,7 +79,7 @@ void CellStorageStatistics(const Graph &graph, } auto LoadAndUpdateEdgeExpandedGraph(const CustomizationConfig &config, - const partition::MultiLevelPartition &mlp) + const partitioner::MultiLevelPartition &mlp) { updater::Updater updater(config.updater_config); @@ -87,16 +87,16 @@ auto LoadAndUpdateEdgeExpandedGraph(const CustomizationConfig &config, std::vector edge_based_edge_list; std::tie(num_nodes, edge_based_edge_list) = updater.LoadAndUpdateEdgeExpandedGraph(); - auto directed = partition::splitBidirectionalEdges(edge_based_edge_list); + auto directed = partitioner::splitBidirectionalEdges(edge_based_edge_list); auto tidied = - partition::prepareEdgesForUsageInGraph(std::move(directed)); + partitioner::prepareEdgesForUsageInGraph(std::move(directed)); auto edge_based_graph = customizer::MultiLevelEdgeBasedGraph(mlp, num_nodes, std::move(tidied)); return edge_based_graph; } std::vector customizeFilteredMetrics(const MultiLevelEdgeBasedGraph &graph, - const partition::CellStorage &storage, + const partitioner::CellStorage &storage, const CellCustomizer &customizer, const std::vector> &node_filters) { @@ -117,15 +117,15 @@ int Customizer::Run(const CustomizationConfig &config) { TIMER_START(loading_data); - partition::MultiLevelPartition mlp; - partition::files::readPartition(config.GetPath(".osrm.partition"), mlp); + partitioner::MultiLevelPartition mlp; + partitioner::files::readPartition(config.GetPath(".osrm.partition"), mlp); auto graph = LoadAndUpdateEdgeExpandedGraph(config, mlp); util::Log() << "Loaded edge based graph: " << graph.GetNumberOfEdges() << " edges, " << graph.GetNumberOfNodes() << " nodes"; - partition::CellStorage storage; - partition::files::readCells(config.GetPath(".osrm.cells"), storage); + partitioner::CellStorage storage; + partitioner::files::readCells(config.GetPath(".osrm.cells"), storage); TIMER_STOP(loading_data); extractor::EdgeBasedNodeDataContainer node_data; @@ -148,7 +148,7 @@ int Customizer::Run(const CustomizationConfig &config) util::Log() << "MLD customization writing took " << TIMER_SEC(writing_mld_data) << " seconds"; TIMER_START(writing_graph); - partition::files::writeGraph(config.GetPath(".osrm.mldgr"), graph); + partitioner::files::writeGraph(config.GetPath(".osrm.mldgr"), graph); TIMER_STOP(writing_graph); util::Log() << "Graph writing took " << TIMER_SEC(writing_graph) << " seconds"; diff --git a/src/engine/routing_algorithms/alternative_path_mld.cpp b/src/engine/routing_algorithms/alternative_path_mld.cpp index 1197c9f23..37b39e264 100644 --- a/src/engine/routing_algorithms/alternative_path_mld.cpp +++ b/src/engine/routing_algorithms/alternative_path_mld.cpp @@ -27,7 +27,7 @@ namespace routing_algorithms using namespace mld; using Heap = SearchEngineData::QueryHeap; -using Partition = partition::MultiLevelPartitionView; +using Partition = partitioner::MultiLevelPartitionView; using Facade = DataFacade; // Implementation details diff --git a/src/partition/annotated_partition.cpp b/src/partitioner/annotated_partition.cpp similarity index 99% rename from src/partition/annotated_partition.cpp rename to src/partitioner/annotated_partition.cpp index 2db062abb..468f7305f 100644 --- a/src/partition/annotated_partition.cpp +++ b/src/partitioner/annotated_partition.cpp @@ -1,4 +1,4 @@ -#include "partition/annotated_partition.hpp" +#include "partitioner/annotated_partition.hpp" #include #include // for CHAR_BIT @@ -16,7 +16,7 @@ namespace osrm { -namespace partition +namespace partitioner { namespace @@ -383,5 +383,5 @@ AnnotatedPartition::ComputeCellIDs(std::vector #include @@ -7,7 +7,7 @@ namespace osrm { -namespace partition +namespace partitioner { BisectionGraphView::BisectionGraphView(const BisectionGraph &bisection_graph_) @@ -52,5 +52,5 @@ const BisectionGraphView::EdgeT &BisectionGraphView::Edge(const EdgeID eid) cons return bisection_graph.Edge(eid); } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/partition/bisection_to_partition.cpp b/src/partitioner/bisection_to_partition.cpp similarity index 98% rename from src/partition/bisection_to_partition.cpp rename to src/partitioner/bisection_to_partition.cpp index 5aadd3b0c..650c0ab87 100644 --- a/src/partition/bisection_to_partition.cpp +++ b/src/partitioner/bisection_to_partition.cpp @@ -1,8 +1,8 @@ -#include "partition/bisection_to_partition.hpp" +#include "partitioner/bisection_to_partition.hpp" namespace osrm { -namespace partition +namespace partitioner { namespace diff --git a/src/partition/dinic_max_flow.cpp b/src/partitioner/dinic_max_flow.cpp similarity index 99% rename from src/partition/dinic_max_flow.cpp rename to src/partitioner/dinic_max_flow.cpp index 754843bac..8f7e40204 100644 --- a/src/partition/dinic_max_flow.cpp +++ b/src/partitioner/dinic_max_flow.cpp @@ -1,4 +1,4 @@ -#include "partition/dinic_max_flow.hpp" +#include "partitioner/dinic_max_flow.hpp" #include "util/integer_range.hpp" #include @@ -10,7 +10,7 @@ namespace osrm { -namespace partition +namespace partitioner { namespace @@ -310,5 +310,5 @@ bool DinicMaxFlow::Validate(const BisectionGraphView &view, return separated && in_range_source && in_range_sink; } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/partition/inertial_flow.cpp b/src/partitioner/inertial_flow.cpp similarity index 95% rename from src/partition/inertial_flow.cpp rename to src/partitioner/inertial_flow.cpp index c0f02bc46..833a1d98a 100644 --- a/src/partition/inertial_flow.cpp +++ b/src/partitioner/inertial_flow.cpp @@ -1,7 +1,7 @@ -#include "partition/inertial_flow.hpp" -#include "partition/bisection_graph.hpp" -#include "partition/bisection_graph_view.hpp" -#include "partition/reorder_first_last.hpp" +#include "partitioner/inertial_flow.hpp" +#include "partitioner/bisection_graph.hpp" +#include "partitioner/bisection_graph_view.hpp" +#include "partitioner/reorder_first_last.hpp" #include #include @@ -19,7 +19,7 @@ namespace osrm { -namespace partition +namespace partitioner { namespace { @@ -159,5 +159,5 @@ DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view, return bestMinCut(view, num_slopes, source_sink_rate, balance); } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/partition/partitioner.cpp b/src/partitioner/partitioner.cpp similarity index 93% rename from src/partition/partitioner.cpp rename to src/partitioner/partitioner.cpp index de337f4e3..1bb478605 100644 --- a/src/partition/partitioner.cpp +++ b/src/partitioner/partitioner.cpp @@ -1,14 +1,14 @@ -#include "partition/partitioner.hpp" -#include "partition/bisection_graph.hpp" -#include "partition/bisection_to_partition.hpp" -#include "partition/cell_storage.hpp" -#include "partition/compressed_node_based_graph_reader.hpp" -#include "partition/edge_based_graph_reader.hpp" -#include "partition/files.hpp" -#include "partition/multi_level_partition.hpp" -#include "partition/recursive_bisection.hpp" -#include "partition/remove_unconnected.hpp" -#include "partition/renumber.hpp" +#include "partitioner/partitioner.hpp" +#include "partitioner/bisection_graph.hpp" +#include "partitioner/bisection_to_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/compressed_node_based_graph_reader.hpp" +#include "partitioner/edge_based_graph_reader.hpp" +#include "partitioner/files.hpp" +#include "partitioner/multi_level_partition.hpp" +#include "partitioner/recursive_bisection.hpp" +#include "partitioner/remove_unconnected.hpp" +#include "partitioner/renumber.hpp" #include "extractor/files.hpp" @@ -34,7 +34,7 @@ namespace osrm { -namespace partition +namespace partitioner { void LogGeojson(const std::string &filename, const std::vector &bisection_ids) @@ -95,7 +95,7 @@ void LogGeojson(const std::string &filename, const std::vector &b } } -auto getGraphBisection(const PartitionConfig &config) +auto getGraphBisection(const PartitionerConfig &config) { auto compressed_node_based_graph = LoadCompressedNodeBasedGraph(config.GetPath(".osrm.cnbg").string()); @@ -126,7 +126,7 @@ auto getGraphBisection(const PartitionConfig &config) return recursive_bisection.BisectionIDs(); } -int Partitioner::Run(const PartitionConfig &config) +int Partitioner::Run(const PartitionerConfig &config) { const std::vector &node_based_partition_ids = getGraphBisection(config); @@ -230,5 +230,5 @@ int Partitioner::Run(const PartitionConfig &config) return 0; } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/partition/recursive_bisection.cpp b/src/partitioner/recursive_bisection.cpp similarity index 94% rename from src/partition/recursive_bisection.cpp rename to src/partitioner/recursive_bisection.cpp index 795a2b23e..7c3ef98e3 100644 --- a/src/partition/recursive_bisection.cpp +++ b/src/partitioner/recursive_bisection.cpp @@ -1,8 +1,8 @@ -#include "partition/recursive_bisection.hpp" -#include "partition/inertial_flow.hpp" +#include "partitioner/recursive_bisection.hpp" +#include "partitioner/inertial_flow.hpp" -#include "partition/bisection_graph_view.hpp" -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/bisection_graph_view.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include "util/log.hpp" #include "util/timing_util.hpp" @@ -19,7 +19,7 @@ namespace osrm { -namespace partition +namespace partitioner { RecursiveBisection::RecursiveBisection(BisectionGraph &bisection_graph_, @@ -107,5 +107,5 @@ const std::vector &RecursiveBisection::BisectionIDs() const std::uint32_t RecursiveBisection::SCCDepth() const { return internal_state.SCCDepth(); } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/partition/recursive_bisection_state.cpp b/src/partitioner/recursive_bisection_state.cpp similarity index 97% rename from src/partition/recursive_bisection_state.cpp rename to src/partitioner/recursive_bisection_state.cpp index 42c6961c5..3ed488285 100644 --- a/src/partition/recursive_bisection_state.cpp +++ b/src/partitioner/recursive_bisection_state.cpp @@ -1,6 +1,6 @@ -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include "extractor/tarjan_scc.hpp" -#include "partition/tarjan_graph_wrapper.hpp" +#include "partitioner/tarjan_graph_wrapper.hpp" #include #include // for CHAR_BIT @@ -10,7 +10,7 @@ namespace osrm { -namespace partition +namespace partitioner { RecursiveBisectionState::RecursiveBisectionState(BisectionGraph &bisection_graph_) @@ -181,5 +181,5 @@ const std::vector &RecursiveBisectionState::BisectionIDs() const std::uint32_t RecursiveBisectionState::SCCDepth() const { return scc_levels; } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/partition/renumber.cpp b/src/partitioner/renumber.cpp similarity index 97% rename from src/partition/renumber.cpp rename to src/partitioner/renumber.cpp index 8c5683035..619bf2c59 100644 --- a/src/partition/renumber.cpp +++ b/src/partitioner/renumber.cpp @@ -1,10 +1,10 @@ -#include "partition/renumber.hpp" +#include "partitioner/renumber.hpp" #include "util/permutation.hpp" namespace osrm { -namespace partition +namespace partitioner { namespace { diff --git a/src/partition/tarjan_graph_wrapper.cpp b/src/partitioner/tarjan_graph_wrapper.cpp similarity index 85% rename from src/partition/tarjan_graph_wrapper.cpp rename to src/partitioner/tarjan_graph_wrapper.cpp index 3eb774fe9..98c0b9584 100644 --- a/src/partition/tarjan_graph_wrapper.cpp +++ b/src/partitioner/tarjan_graph_wrapper.cpp @@ -1,8 +1,8 @@ -#include "partition/tarjan_graph_wrapper.hpp" +#include "partitioner/tarjan_graph_wrapper.hpp" namespace osrm { -namespace partition +namespace partitioner { TarjanGraphWrapper::TarjanGraphWrapper(const BisectionGraph &bisection_graph_) @@ -22,5 +22,5 @@ NodeID TarjanGraphWrapper::GetTarget(const EdgeID eid) const return bisection_graph.Edge(eid).target; } -} // namespace partition +} // namespace partitioner } // namespace osrm diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp index eabd83c05..70d93551b 100644 --- a/src/storage/storage.cpp +++ b/src/storage/storage.cpp @@ -24,10 +24,10 @@ #include "extractor/query_node.hpp" #include "extractor/travel_mode.hpp" -#include "partition/cell_storage.hpp" -#include "partition/edge_based_graph_reader.hpp" -#include "partition/files.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/cell_storage.hpp" +#include "partitioner/edge_based_graph_reader.hpp" +#include "partitioner/files.hpp" +#include "partitioner/multi_level_partition.hpp" #include "engine/datafacade/datafacade_base.hpp" @@ -446,8 +446,8 @@ void Storage::PopulateLayout(DataLayout &layout) io::FileReader reader(config.GetPath(".osrm.partition"), io::FileReader::VerifyFingerprint); - reader.Skip(1); - layout.SetBlockSize( + reader.Skip(1); + layout.SetBlockSize( DataLayout::MLD_LEVEL_DATA, 1); const auto partition_entries_count = reader.ReadVectorSize(); layout.SetBlockSize(DataLayout::MLD_PARTITION, partition_entries_count); @@ -456,7 +456,7 @@ void Storage::PopulateLayout(DataLayout &layout) } else { - layout.SetBlockSize( + layout.SetBlockSize( DataLayout::MLD_LEVEL_DATA, 0); layout.SetBlockSize(DataLayout::MLD_PARTITION, 0); layout.SetBlockSize(DataLayout::MLD_CELL_TO_CHILDREN, 0); @@ -471,9 +471,9 @@ void Storage::PopulateLayout(DataLayout &layout) const auto destination_node_count = reader.ReadVectorSize(); layout.SetBlockSize(DataLayout::MLD_CELL_DESTINATION_BOUNDARY, destination_node_count); - const auto cell_count = reader.ReadVectorSize(); - layout.SetBlockSize(DataLayout::MLD_CELLS, - cell_count); + const auto cell_count = reader.ReadVectorSize(); + layout.SetBlockSize(DataLayout::MLD_CELLS, + cell_count); const auto level_offsets_count = reader.ReadVectorSize(); layout.SetBlockSize(DataLayout::MLD_CELL_LEVEL_OFFSETS, level_offsets_count); @@ -930,7 +930,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr) BOOST_ASSERT(layout.GetBlockSize(storage::DataLayout::MLD_PARTITION) > 0); auto level_data = - layout.GetBlockPtr( + layout.GetBlockPtr( memory_ptr, storage::DataLayout::MLD_LEVEL_DATA); auto mld_partition_ptr = layout.GetBlockPtr( @@ -945,9 +945,9 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr) layout.GetBlockEntries(storage::DataLayout::MLD_CELL_TO_CHILDREN); util::vector_view cell_to_children(mld_chilren_ptr, children_entries_count); - partition::MultiLevelPartitionView mlp{ + partitioner::MultiLevelPartitionView mlp{ std::move(level_data), std::move(partition), std::move(cell_to_children)}; - partition::files::readPartition(config.GetPath(".osrm.partition"), mlp); + partitioner::files::readPartition(config.GetPath(".osrm.partition"), mlp); } if (boost::filesystem::exists(config.GetPath(".osrm.cells"))) @@ -959,7 +959,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr) memory_ptr, storage::DataLayout::MLD_CELL_SOURCE_BOUNDARY); auto mld_destination_boundary_ptr = layout.GetBlockPtr( memory_ptr, storage::DataLayout::MLD_CELL_DESTINATION_BOUNDARY); - auto mld_cells_ptr = layout.GetBlockPtr( + auto mld_cells_ptr = layout.GetBlockPtr( memory_ptr, storage::DataLayout::MLD_CELLS); auto mld_cell_level_offsets_ptr = layout.GetBlockPtr( memory_ptr, storage::DataLayout::MLD_CELL_LEVEL_OFFSETS); @@ -976,16 +976,16 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr) source_boundary_entries_count); util::vector_view destination_boundary(mld_destination_boundary_ptr, destination_boundary_entries_count); - util::vector_view cells(mld_cells_ptr, - cells_entries_counts); + util::vector_view cells(mld_cells_ptr, + cells_entries_counts); util::vector_view level_offsets(mld_cell_level_offsets_ptr, cell_level_offsets_entries_count); - partition::CellStorageView storage{std::move(source_boundary), - std::move(destination_boundary), - std::move(cells), - std::move(level_offsets)}; - partition::files::readCells(config.GetPath(".osrm.cells"), storage); + partitioner::CellStorageView storage{std::move(source_boundary), + std::move(destination_boundary), + std::move(cells), + std::move(level_offsets)}; + partitioner::files::readCells(config.GetPath(".osrm.cells"), storage); } if (boost::filesystem::exists(config.GetPath(".osrm.cell_metrics"))) @@ -1042,7 +1042,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr) customizer::MultiLevelEdgeBasedGraphView graph_view( std::move(node_list), std::move(edge_list), std::move(node_to_offset)); - partition::files::readGraph(config.GetPath(".osrm.mldgr"), graph_view); + partitioner::files::readGraph(config.GetPath(".osrm.mldgr"), graph_view); } } } diff --git a/src/tools/partition.cpp b/src/tools/partition.cpp index 155f3a1e0..22c202b9d 100644 --- a/src/tools/partition.cpp +++ b/src/tools/partition.cpp @@ -1,5 +1,5 @@ -#include "partition/partition_config.hpp" -#include "partition/partitioner.hpp" +#include "partitioner/partitioner.hpp" +#include "partitioner/partitioner_config.hpp" #include "osrm/exception.hpp" #include "util/log.hpp" @@ -69,8 +69,10 @@ void validate(boost::any &v, const std::vector &values, MaxCellSize v = boost::any(MaxCellSizesArgument{output}); } -return_code -parseArguments(int argc, char *argv[], std::string &verbosity, partition::PartitionConfig &config) +return_code parseArguments(int argc, + char *argv[], + std::string &verbosity, + partitioner::PartitionerConfig &config) { // declare a group of options that will be allowed only on command line boost::program_options::options_description generic_options("Options"); @@ -189,7 +191,7 @@ int main(int argc, char *argv[]) try { util::LogPolicy::GetInstance().Unmute(); std::string verbosity; - partition::PartitionConfig partition_config; + partitioner::PartitionerConfig partition_config; const auto result = parseArguments(argc, argv, verbosity, partition_config); @@ -238,7 +240,7 @@ int main(int argc, char *argv[]) try util::Log() << "Computing recursive bisection"; TIMER_START(bisect); - auto exitcode = partition::Partitioner().Run(partition_config); + auto exitcode = partitioner::Partitioner().Run(partition_config); TIMER_STOP(bisect); util::Log() << "Bisection took " << TIMER_SEC(bisect) << " seconds."; diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index ded629142..bb0f2f223 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -11,8 +11,8 @@ file(GLOB ExtractorTestsSources extractor/*.cpp) file(GLOB PartitionTestsSources - partition_tests.cpp - partition/*.cpp) + partitioner_tests.cpp + partitioner/*.cpp) file(GLOB CustomizerTestsSources customizer_tests.cpp @@ -58,7 +58,7 @@ add_executable(extractor-tests ${ExtractorTestsSources} $ $) -add_executable(partition-tests +add_executable(partitioner-tests EXCLUDE_FROM_ALL ${PartitionTestsSources} $ $) @@ -120,14 +120,14 @@ target_include_directories(library-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(library-extract-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(library-contract-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(util-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_include_directories(partition-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(partitioner-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(customizer-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(updater-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(contractor-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(engine-tests ${ENGINE_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) target_link_libraries(extractor-tests ${EXTRACTOR_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -target_link_libraries(partition-tests ${PARTITIONER_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +target_link_libraries(partitioner-tests ${PARTITIONER_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) target_link_libraries(customizer-tests ${CUSTOMIZER_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) target_link_libraries(updater-tests ${UPDATER_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) target_link_libraries(library-tests osrm ${ENGINE_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) @@ -138,4 +138,4 @@ target_link_libraries(util-tests ${UTIL_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_L target_link_libraries(contractor-tests ${CONTRACTOR_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) add_custom_target(tests - DEPENDS engine-tests extractor-tests contractor-tests partition-tests updater-tests customizer-tests library-tests library-extract-tests server-tests util-tests) + DEPENDS engine-tests extractor-tests contractor-tests partitioner-tests updater-tests customizer-tests library-tests library-extract-tests server-tests util-tests) diff --git a/unit_tests/customizer/cell_customization.cpp b/unit_tests/customizer/cell_customization.cpp index 219436173..b51e36797 100644 --- a/unit_tests/customizer/cell_customization.cpp +++ b/unit_tests/customizer/cell_customization.cpp @@ -1,15 +1,15 @@ #include "common/range_tools.hpp" #include "customizer/cell_customizer.hpp" -#include "partition/multi_level_graph.hpp" -#include "partition/multi_level_partition.hpp" +#include "partitioner/multi_level_graph.hpp" +#include "partitioner/multi_level_partition.hpp" #include "util/static_graph.hpp" #include using namespace osrm; using namespace osrm::customizer; -using namespace osrm::partition; +using namespace osrm::partitioner; using namespace osrm::util; namespace @@ -40,7 +40,7 @@ auto makeGraph(const MultiLevelPartition &mlp, const std::vector &mock edges.push_back(Edge{m.target, m.start, m.weight, 2 * m.weight, false, true}); } std::sort(edges.begin(), edges.end()); - return partition::MultiLevelGraph( + return partitioner::MultiLevelGraph( mlp, max_id + 1, edges); } } diff --git a/unit_tests/partition/bisection_graph.cpp b/unit_tests/partitioner/bisection_graph.cpp similarity index 97% rename from unit_tests/partition/bisection_graph.cpp rename to unit_tests/partitioner/bisection_graph.cpp index cec721779..92d7c13f4 100644 --- a/unit_tests/partition/bisection_graph.cpp +++ b/unit_tests/partitioner/bisection_graph.cpp @@ -1,5 +1,5 @@ -#include "partition/bisection_graph.hpp" -#include "partition/graph_generator.hpp" +#include "partitioner/bisection_graph.hpp" +#include "partitioner/graph_generator.hpp" #include #include @@ -7,7 +7,7 @@ #include #include -using namespace osrm::partition; +using namespace osrm::partitioner; using namespace osrm::util; BOOST_AUTO_TEST_SUITE(bisection_graph) diff --git a/unit_tests/partition/bisection_graph_view.cpp b/unit_tests/partitioner/bisection_graph_view.cpp similarity index 97% rename from unit_tests/partition/bisection_graph_view.cpp rename to unit_tests/partitioner/bisection_graph_view.cpp index 6cfe4f20a..a78cd7508 100644 --- a/unit_tests/partition/bisection_graph_view.cpp +++ b/unit_tests/partitioner/bisection_graph_view.cpp @@ -1,6 +1,6 @@ -#include "partition/bisection_graph_view.hpp" -#include "partition/graph_generator.hpp" -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/bisection_graph_view.hpp" +#include "partitioner/graph_generator.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include #include @@ -9,7 +9,7 @@ #include #include -using namespace osrm::partition; +using namespace osrm::partitioner; using namespace osrm::util; BOOST_AUTO_TEST_SUITE(graph_view) diff --git a/unit_tests/partition/bisection_to_partition.cpp b/unit_tests/partitioner/bisection_to_partition.cpp similarity index 99% rename from unit_tests/partition/bisection_to_partition.cpp rename to unit_tests/partitioner/bisection_to_partition.cpp index 487942433..2fadb1f92 100644 --- a/unit_tests/partition/bisection_to_partition.cpp +++ b/unit_tests/partitioner/bisection_to_partition.cpp @@ -1,7 +1,7 @@ #include #include -#include "partition/bisection_to_partition.hpp" +#include "partitioner/bisection_to_partition.hpp" #define CHECK_SIZE_RANGE(range, ref) BOOST_CHECK_EQUAL(range.end() - range.begin(), ref) #define CHECK_EQUAL_RANGE(range, ref) \ @@ -13,7 +13,7 @@ } while (0) using namespace osrm; -using namespace osrm::partition; +using namespace osrm::partitioner; BOOST_AUTO_TEST_SUITE(bisection_to_partition_tests) diff --git a/unit_tests/partition/cell_storage.cpp b/unit_tests/partitioner/cell_storage.cpp similarity index 99% rename from unit_tests/partition/cell_storage.cpp rename to unit_tests/partitioner/cell_storage.cpp index b4a1074e5..705371ab3 100644 --- a/unit_tests/partition/cell_storage.cpp +++ b/unit_tests/partitioner/cell_storage.cpp @@ -1,11 +1,11 @@ #include "common/range_tools.hpp" #include -#include "partition/cell_storage.hpp" +#include "partitioner/cell_storage.hpp" #include "util/static_graph.hpp" using namespace osrm; -using namespace osrm::partition; +using namespace osrm::partitioner; namespace { diff --git a/unit_tests/partition/dinic.cpp b/unit_tests/partitioner/dinic.cpp similarity index 91% rename from unit_tests/partition/dinic.cpp rename to unit_tests/partitioner/dinic.cpp index ca77ce1f7..ef9ebe158 100644 --- a/unit_tests/partition/dinic.cpp +++ b/unit_tests/partitioner/dinic.cpp @@ -1,7 +1,7 @@ -#include "partition/bisection_graph_view.hpp" -#include "partition/dinic_max_flow.hpp" -#include "partition/graph_generator.hpp" -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/bisection_graph_view.hpp" +#include "partitioner/dinic_max_flow.hpp" +#include "partitioner/graph_generator.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include #include @@ -9,7 +9,7 @@ #include #include -using namespace osrm::partition; +using namespace osrm::partitioner; using namespace osrm::util; BOOST_AUTO_TEST_SUITE(dinic_algorithm) diff --git a/unit_tests/partition/graph_generator.hpp b/unit_tests/partitioner/graph_generator.hpp similarity index 100% rename from unit_tests/partition/graph_generator.hpp rename to unit_tests/partitioner/graph_generator.hpp diff --git a/unit_tests/partition/multi_level_graph.cpp b/unit_tests/partitioner/multi_level_graph.cpp similarity index 99% rename from unit_tests/partition/multi_level_graph.cpp rename to unit_tests/partitioner/multi_level_graph.cpp index 432c61751..7a9fb543d 100644 --- a/unit_tests/partition/multi_level_graph.cpp +++ b/unit_tests/partitioner/multi_level_graph.cpp @@ -1,4 +1,4 @@ -#include "partition/multi_level_graph.hpp" +#include "partitioner/multi_level_graph.hpp" #include "util/typedefs.hpp" #include "../common/range_tools.hpp" @@ -11,7 +11,7 @@ #include using namespace osrm; -using namespace osrm::partition; +using namespace osrm::partitioner; namespace { diff --git a/unit_tests/partition/multi_level_partition.cpp b/unit_tests/partitioner/multi_level_partition.cpp similarity index 98% rename from unit_tests/partition/multi_level_partition.cpp rename to unit_tests/partitioner/multi_level_partition.cpp index d86814d8d..e2807a37f 100644 --- a/unit_tests/partition/multi_level_partition.cpp +++ b/unit_tests/partitioner/multi_level_partition.cpp @@ -1,7 +1,7 @@ #include #include -#include "partition/multi_level_partition.hpp" +#include "partitioner/multi_level_partition.hpp" #define CHECK_SIZE_RANGE(range, ref) BOOST_CHECK_EQUAL(range.second - range.first, ref) #define CHECK_EQUAL_RANGE(range, ref) \ @@ -13,7 +13,7 @@ } while (0) using namespace osrm; -using namespace osrm::partition; +using namespace osrm::partitioner; BOOST_AUTO_TEST_SUITE(multi_level_partition_tests) diff --git a/unit_tests/partition/recursive_bisection.cpp b/unit_tests/partitioner/recursive_bisection.cpp similarity index 94% rename from unit_tests/partition/recursive_bisection.cpp rename to unit_tests/partitioner/recursive_bisection.cpp index 6a4aa2286..1c911efaf 100644 --- a/unit_tests/partition/recursive_bisection.cpp +++ b/unit_tests/partitioner/recursive_bisection.cpp @@ -1,6 +1,6 @@ -#include "partition/recursive_bisection.hpp" -#include "partition/graph_generator.hpp" -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/recursive_bisection.hpp" +#include "partitioner/graph_generator.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include #include @@ -12,7 +12,7 @@ #include tbb::task_scheduler_init init(2); -using namespace osrm::partition; +using namespace osrm::partitioner; using namespace osrm::util; BOOST_AUTO_TEST_SUITE(recursive_bisection) diff --git a/unit_tests/partition/remove_unconnected.cpp b/unit_tests/partitioner/remove_unconnected.cpp similarity index 97% rename from unit_tests/partition/remove_unconnected.cpp rename to unit_tests/partitioner/remove_unconnected.cpp index 3e5114e24..62687c199 100644 --- a/unit_tests/partition/remove_unconnected.cpp +++ b/unit_tests/partitioner/remove_unconnected.cpp @@ -1,7 +1,7 @@ #include #include -#include "partition/remove_unconnected.hpp" +#include "partitioner/remove_unconnected.hpp" #include "util/static_graph.hpp" @@ -15,7 +15,7 @@ } while (0) using namespace osrm; -using namespace osrm::partition; +using namespace osrm::partitioner; namespace { diff --git a/unit_tests/partition/renumber.cpp b/unit_tests/partitioner/renumber.cpp similarity index 97% rename from unit_tests/partition/renumber.cpp rename to unit_tests/partitioner/renumber.cpp index 187a61f14..b070e5371 100644 --- a/unit_tests/partition/renumber.cpp +++ b/unit_tests/partitioner/renumber.cpp @@ -1,12 +1,12 @@ #include #include -#include "partition/renumber.hpp" +#include "partitioner/renumber.hpp" #include "../common/range_tools.hpp" using namespace osrm; -using namespace osrm::partition; +using namespace osrm::partitioner; namespace { diff --git a/unit_tests/partition/reorder_first_last.cpp b/unit_tests/partitioner/reorder_first_last.cpp similarity index 94% rename from unit_tests/partition/reorder_first_last.cpp rename to unit_tests/partitioner/reorder_first_last.cpp index c8d998070..32ce5edfb 100644 --- a/unit_tests/partition/reorder_first_last.cpp +++ b/unit_tests/partitioner/reorder_first_last.cpp @@ -1,4 +1,4 @@ -#include "partition/reorder_first_last.hpp" +#include "partitioner/reorder_first_last.hpp" #include #include @@ -9,7 +9,7 @@ #include #include -using namespace osrm::partition; +using namespace osrm::partitioner; BOOST_AUTO_TEST_SUITE(reorder_first_last) diff --git a/unit_tests/partition/scc_integration.cpp b/unit_tests/partitioner/scc_integration.cpp similarity index 93% rename from unit_tests/partition/scc_integration.cpp rename to unit_tests/partitioner/scc_integration.cpp index f0aeb025b..bbdebb965 100644 --- a/unit_tests/partition/scc_integration.cpp +++ b/unit_tests/partitioner/scc_integration.cpp @@ -1,6 +1,6 @@ -#include "partition/bisection_graph_view.hpp" -#include "partition/graph_generator.hpp" -#include "partition/recursive_bisection_state.hpp" +#include "partitioner/bisection_graph_view.hpp" +#include "partitioner/graph_generator.hpp" +#include "partitioner/recursive_bisection_state.hpp" #include #include @@ -8,7 +8,7 @@ #include #include -using namespace osrm::partition; +using namespace osrm::partitioner; using namespace osrm::util; BOOST_AUTO_TEST_SUITE(scc_integration) diff --git a/unit_tests/partition_tests.cpp b/unit_tests/partitioner_tests.cpp similarity index 100% rename from unit_tests/partition_tests.cpp rename to unit_tests/partitioner_tests.cpp