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).
This commit is contained in:
Mateusz Loskot
2018-02-01 16:47:43 +01:00
committed by Patrick Niklaus
parent 03f598b93d
commit 8114104a43
61 changed files with 308 additions and 305 deletions
+6 -6
View File
@@ -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}
$<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
add_executable(partition-tests
add_executable(partitioner-tests
EXCLUDE_FROM_ALL
${PartitionTestsSources}
$<TARGET_OBJECTS:PARTITIONER> $<TARGET_OBJECTS:UTIL>)
@@ -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)
+4 -4
View File
@@ -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 <boost/test/unit_test.hpp>
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<MockEdge> &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<EdgeData, osrm::storage::Ownership::Container>(
return partitioner::MultiLevelGraph<EdgeData, osrm::storage::Ownership::Container>(
mlp, max_id + 1, edges);
}
}
@@ -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 <algorithm>
#include <vector>
@@ -7,7 +7,7 @@
#include <boost/test/test_case_template.hpp>
#include <boost/test/unit_test.hpp>
using namespace osrm::partition;
using namespace osrm::partitioner;
using namespace osrm::util;
BOOST_AUTO_TEST_SUITE(bisection_graph)
@@ -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 <algorithm>
#include <climits>
@@ -9,7 +9,7 @@
#include <boost/test/test_case_template.hpp>
#include <boost/test/unit_test.hpp>
using namespace osrm::partition;
using namespace osrm::partitioner;
using namespace osrm::util;
BOOST_AUTO_TEST_SUITE(graph_view)
@@ -1,7 +1,7 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/test/unit_test.hpp>
#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)
@@ -1,11 +1,11 @@
#include "common/range_tools.hpp"
#include <boost/test/unit_test.hpp>
#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
{
@@ -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 <algorithm>
#include <vector>
@@ -9,7 +9,7 @@
#include <boost/test/test_case_template.hpp>
#include <boost/test/unit_test.hpp>
using namespace osrm::partition;
using namespace osrm::partitioner;
using namespace osrm::util;
BOOST_AUTO_TEST_SUITE(dinic_algorithm)
@@ -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 <vector>
using namespace osrm;
using namespace osrm::partition;
using namespace osrm::partitioner;
namespace
{
@@ -1,7 +1,7 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/test/unit_test.hpp>
#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)
@@ -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 <algorithm>
#include <vector>
@@ -12,7 +12,7 @@
#include <tbb/task_scheduler_init.h>
tbb::task_scheduler_init init(2);
using namespace osrm::partition;
using namespace osrm::partitioner;
using namespace osrm::util;
BOOST_AUTO_TEST_SUITE(recursive_bisection)
@@ -1,7 +1,7 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/test/unit_test.hpp>
#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
{
@@ -1,12 +1,12 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/test/unit_test.hpp>
#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
{
@@ -1,4 +1,4 @@
#include "partition/reorder_first_last.hpp"
#include "partitioner/reorder_first_last.hpp"
#include <boost/test/test_case_template.hpp>
#include <boost/test/unit_test.hpp>
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
using namespace osrm::partition;
using namespace osrm::partitioner;
BOOST_AUTO_TEST_SUITE(reorder_first_last)
@@ -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 <algorithm>
#include <vector>
@@ -8,7 +8,7 @@
#include <boost/test/test_case_template.hpp>
#include <boost/test/unit_test.hpp>
using namespace osrm::partition;
using namespace osrm::partitioner;
using namespace osrm::util;
BOOST_AUTO_TEST_SUITE(scc_integration)