Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Rename namespace partition to partitioner

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/customize/customizer.cpp
+13 -13
View File
@@ -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<extractor::EdgeBasedEdge> 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<StaticEdgeBasedGraphEdge>(std::move(directed));
partitioner::prepareEdgesForUsageInGraph<StaticEdgeBasedGraphEdge>(std::move(directed));
auto edge_based_graph = customizer::MultiLevelEdgeBasedGraph(mlp, num_nodes, std::move(tidied));
return edge_based_graph;
}
std::vector<CellMetric> customizeFilteredMetrics(const MultiLevelEdgeBasedGraph &graph,
const partition::CellStorage &storage,
const partitioner::CellStorage &storage,
const CellCustomizer &customizer,
const std::vector<std::vector<bool>> &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";
src/engine/routing_algorithms/alternative_path_mld.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ namespace routing_algorithms
using namespace mld;
using Heap = SearchEngineData<Algorithm>::QueryHeap;
using Partition = partition::MultiLevelPartitionView;
using Partition = partitioner::MultiLevelPartitionView;
using Facade = DataFacade<Algorithm>;
// Implementation details
src/partition/annotated_partition.cpp → src/partitioner/annotated_partition.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
#include "partition/annotated_partition.hpp"
#include "partitioner/annotated_partition.hpp"
#include <algorithm>
#include <climits> // for CHAR_BIT
@@ -16,7 +16,7 @@
namespace osrm
{
namespace partition
namespace partitioner
{
namespace
@@ -383,5 +383,5 @@ AnnotatedPartition::ComputeCellIDs(std::vector<std::pair<BisectionID, std::int32
return cell_ids;
}
} // namespace partition
} // namespace partitioner
} // namespace osrm
src/partition/bisection_graph_view.cpp → src/partitioner/bisection_graph_view.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
#include "partition/bisection_graph_view.hpp"
#include "partitioner/bisection_graph_view.hpp"
#include <iostream>
#include <iterator>
@@ -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
src/partition/bisection_to_partition.cpp → src/partitioner/bisection_to_partition.cpp
+2 -2
View File
@@ -1,8 +1,8 @@
#include "partition/bisection_to_partition.hpp"
#include "partitioner/bisection_to_partition.hpp"
namespace osrm
{
namespace partition
namespace partitioner
{
namespace
src/partition/dinic_max_flow.cpp → src/partitioner/dinic_max_flow.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
#include "partition/dinic_max_flow.hpp"
#include "partitioner/dinic_max_flow.hpp"
#include "util/integer_range.hpp"
#include <algorithm>
@@ -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
src/partition/inertial_flow.cpp → src/partitioner/inertial_flow.cpp
+6 -6
View File
@@ -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 <algorithm>
#include <cmath>
@@ -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
src/partition/partitioner.cpp → src/partitioner/partitioner.cpp
+15 -15
View File
@@ -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<std::uint32_t> &bisection_ids)
@@ -95,7 +95,7 @@ void LogGeojson(const std::string &filename, const std::vector<std::uint32_t> &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<BisectionID> &node_based_partition_ids = getGraphBisection(config);
@@ -230,5 +230,5 @@ int Partitioner::Run(const PartitionConfig &config)
return 0;
}
} // namespace partition
} // namespace partitioner
} // namespace osrm
src/partition/recursive_bisection.cpp → src/partitioner/recursive_bisection.cpp
+6 -6
View File
@@ -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<BisectionID> &RecursiveBisection::BisectionIDs() const
std::uint32_t RecursiveBisection::SCCDepth() const { return internal_state.SCCDepth(); }
} // namespace partition
} // namespace partitioner
} // namespace osrm
src/partition/recursive_bisection_state.cpp → src/partitioner/recursive_bisection_state.cpp
+4 -4
View File
@@ -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 <algorithm>
#include <climits> // 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<BisectionID> &RecursiveBisectionState::BisectionIDs() const
std::uint32_t RecursiveBisectionState::SCCDepth() const { return scc_levels; }
} // namespace partition
} // namespace partitioner
} // namespace osrm
src/partition/renumber.cpp → src/partitioner/renumber.cpp
+2 -2
View File
@@ -1,10 +1,10 @@
#include "partition/renumber.hpp"
#include "partitioner/renumber.hpp"
#include "util/permutation.hpp"
namespace osrm
{
namespace partition
namespace partitioner
{
namespace
{
src/partition/tarjan_graph_wrapper.cpp → src/partitioner/tarjan_graph_wrapper.cpp
+3 -3
View File
@@ -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
src/storage/storage.cpp
+22 -22
View File
@@ -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<partition::MultiLevelPartition::LevelData>(1);
layout.SetBlockSize<partition::MultiLevelPartition::LevelData>(
reader.Skip<partitioner::MultiLevelPartition::LevelData>(1);
layout.SetBlockSize<partitioner::MultiLevelPartition::LevelData>(
DataLayout::MLD_LEVEL_DATA, 1);
const auto partition_entries_count = reader.ReadVectorSize<PartitionID>();
layout.SetBlockSize<PartitionID>(DataLayout::MLD_PARTITION, partition_entries_count);
@@ -456,7 +456,7 @@ void Storage::PopulateLayout(DataLayout &layout)
}
else
{
layout.SetBlockSize<partition::MultiLevelPartition::LevelData>(
layout.SetBlockSize<partitioner::MultiLevelPartition::LevelData>(
DataLayout::MLD_LEVEL_DATA, 0);
layout.SetBlockSize<PartitionID>(DataLayout::MLD_PARTITION, 0);
layout.SetBlockSize<CellID>(DataLayout::MLD_CELL_TO_CHILDREN, 0);
@@ -471,9 +471,9 @@ void Storage::PopulateLayout(DataLayout &layout)
const auto destination_node_count = reader.ReadVectorSize<NodeID>();
layout.SetBlockSize<NodeID>(DataLayout::MLD_CELL_DESTINATION_BOUNDARY,
destination_node_count);
const auto cell_count = reader.ReadVectorSize<partition::CellStorage::CellData>();
layout.SetBlockSize<partition::CellStorage::CellData>(DataLayout::MLD_CELLS,
cell_count);
const auto cell_count = reader.ReadVectorSize<partitioner::CellStorage::CellData>();
layout.SetBlockSize<partitioner::CellStorage::CellData>(DataLayout::MLD_CELLS,
cell_count);
const auto level_offsets_count = reader.ReadVectorSize<std::uint64_t>();
layout.SetBlockSize<std::uint64_t>(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<partition::MultiLevelPartitionView::LevelData, true>(
layout.GetBlockPtr<partitioner::MultiLevelPartitionView::LevelData, true>(
memory_ptr, storage::DataLayout::MLD_LEVEL_DATA);
auto mld_partition_ptr = layout.GetBlockPtr<PartitionID, true>(
@@ -945,9 +945,9 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
layout.GetBlockEntries(storage::DataLayout::MLD_CELL_TO_CHILDREN);
util::vector_view<CellID> 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<NodeID, true>(
memory_ptr, storage::DataLayout::MLD_CELL_DESTINATION_BOUNDARY);
auto mld_cells_ptr = layout.GetBlockPtr<partition::CellStorageView::CellData, true>(
auto mld_cells_ptr = layout.GetBlockPtr<partitioner::CellStorageView::CellData, true>(
memory_ptr, storage::DataLayout::MLD_CELLS);
auto mld_cell_level_offsets_ptr = layout.GetBlockPtr<std::uint64_t, true>(
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<NodeID> destination_boundary(mld_destination_boundary_ptr,
destination_boundary_entries_count);
util::vector_view<partition::CellStorageView::CellData> cells(mld_cells_ptr,
cells_entries_counts);
util::vector_view<partitioner::CellStorageView::CellData> cells(mld_cells_ptr,
cells_entries_counts);
util::vector_view<std::uint64_t> 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);
}
}
}
src/tools/partition.cpp
+8 -6
View File
@@ -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<std::string> &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.";