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
include/customizer/cell_customizer.hpp
+7 -7
View File
@@ -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 <tbb/enumerable_thread_specific.h>
@@ -29,12 +29,12 @@ class CellCustomizer
util::QueryHeap<NodeID, NodeID, EdgeWeight, HeapData, util::ArrayStorage<NodeID, int>>;
using HeapPtr = tbb::enumerable_thread_specific<Heap>;
CellCustomizer(const partition::MultiLevelPartition &partition) : partition(partition) {}
CellCustomizer(const partitioner::MultiLevelPartition &partition) : partition(partition) {}
template <typename GraphT>
void Customize(const GraphT &graph,
Heap &heap,
const partition::CellStorage &cells,
const partitioner::CellStorage &cells,
const std::vector<bool> &allowed_nodes,
CellMetric &metric,
LevelID level,
@@ -97,7 +97,7 @@ class CellCustomizer
template <typename GraphT>
void Customize(const GraphT &graph,
const partition::CellStorage &cells,
const partitioner::CellStorage &cells,
const std::vector<bool> &allowed_nodes,
CellMetric &metric) const
{
@@ -121,7 +121,7 @@ class CellCustomizer
private:
template <typename GraphT>
void RelaxNode(const GraphT &graph,
const partition::CellStorage &cells,
const partitioner::CellStorage &cells,
const std::vector<bool> &allowed_nodes,
const CellMetric &metric,
Heap &heap,
@@ -209,7 +209,7 @@ class CellCustomizer
}
}
const partition::MultiLevelPartition &partition;
const partitioner::MultiLevelPartition &partition;
};
}
}
include/customizer/edge_based_graph.hpp
+8 -7
View File
@@ -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<EdgeBasedGraphEdgeData, storage::Ownership::Container>
: public partitioner::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>
{
using Base = partition::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>;
using Base =
partitioner::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>;
using Base::Base;
};
struct MultiLevelEdgeBasedGraphView
: public partition::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>
: public partitioner::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>
{
using Base = partition::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>;
using Base = partitioner::MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>;
using Base::Base;
};
include/customizer/serialization.hpp
+1 -1
View File
@@ -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"
include/engine/datafacade/algorithm_datafacade.hpp
+4 -4
View File
@@ -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<MLD>
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;
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+15 -15
View File
@@ -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<CH>
template <> class ContiguousInternalMemoryAlgorithmDataFacade<MLD> : public AlgorithmDataFacade<MLD>
{
// 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<MLD> : public Algo
BOOST_ASSERT(data_layout.GetBlockSize(storage::DataLayout::MLD_CELL_TO_CHILDREN) > 0);
auto level_data =
data_layout.GetBlockPtr<partition::MultiLevelPartitionView::LevelData>(
data_layout.GetBlockPtr<partitioner::MultiLevelPartitionView::LevelData>(
memory_block, storage::DataLayout::MLD_LEVEL_DATA);
auto mld_partition_ptr = data_layout.GetBlockPtr<PartitionID>(
@@ -955,7 +955,7 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade<MLD> : public Algo
util::vector_view<CellID> 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<storage::DataLayout::BlockID>(
@@ -988,7 +988,7 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade<MLD> : public Algo
memory_block, storage::DataLayout::MLD_CELL_SOURCE_BOUNDARY);
auto mld_destination_boundary_ptr = data_layout.GetBlockPtr<NodeID>(
memory_block, storage::DataLayout::MLD_CELL_DESTINATION_BOUNDARY);
auto mld_cells_ptr = data_layout.GetBlockPtr<partition::CellStorageView::CellData>(
auto mld_cells_ptr = data_layout.GetBlockPtr<partitioner::CellStorageView::CellData>(
memory_block, storage::DataLayout::MLD_CELLS);
auto mld_cell_level_offsets_ptr = data_layout.GetBlockPtr<std::uint64_t>(
memory_block, storage::DataLayout::MLD_CELL_LEVEL_OFFSETS);
@@ -1005,15 +1005,15 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade<MLD> : public Algo
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);
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<MLD> : 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; }
include/partition/partitioner.hpp
-21
View File
@@ -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_
include/partition/annotated_partition.hpp → include/partitioner/annotated_partition.hpp
+6 -6
View File
@@ -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 <cstdint>
#include <utility>
@@ -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<BisectionID> &bisection_ids) const;
};
} // namespace partition
} // namespace partitioner
} // namespace osrm
#endif // OSRM_PARTITION_ANNOTATE_HPP_
#endif // OSRM_PARTITIONER_ANNOTATE_HPP_
include/partition/bisection_graph.hpp → include/partitioner/bisection_graph.hpp
+6 -6
View File
@@ -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<BisectionInputEdge> adaptToBisectionEdge(std::vector<InputEdge> edge
return result;
}
} // namespace partition
} // namespace partitioner
} // namespace osrm
#endif // OSRM_BISECTION_GRAPH_HPP_
#endif // OSRM_PARTITIONER_BISECTION_GRAPH_HPP_
include/partition/bisection_graph_view.hpp → include/partitioner/bisection_graph_view.hpp
+6 -6
View File
@@ -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 <boost/iterator/filter_iterator.hpp>
#include <boost/iterator/iterator_facade.hpp>
@@ -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_
include/partition/bisection_to_partition.hpp → include/partitioner/bisection_to_partition.hpp
+5 -5
View File
@@ -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 <vector>
namespace osrm
{
namespace partition
namespace partitioner
{
using Partition = std::vector<CellID>;
include/partition/cell_storage.hpp → include/partitioner/cell_storage.hpp
+6 -6
View File
@@ -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 <storage::Ownership Ownership> class CellStorageImpl
template <typename GraphT,
typename = std::enable_if<Ownership == storage::Ownership::Container>>
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 <storage::Ownership Ownership> class CellStorageImpl
}
}
#endif // OSRM_CUSTOMIZE_CELL_STORAGE_HPP
#endif // OSRM_PARTITIONER_CUSTOMIZE_CELL_STORAGE_HPP
include/partition/compressed_node_based_graph_reader.hpp → include/partitioner/compressed_node_based_graph_reader.hpp
+3 -3
View File
@@ -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
include/partition/dinic_max_flow.hpp → include/partitioner/dinic_max_flow.hpp
+6 -6
View File
@@ -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 <cstdint>
#include <functional>
@@ -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_
include/partition/edge_based_graph.hpp → include/partitioner/edge_based_graph.hpp
+3 -3
View File
@@ -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
include/partition/edge_based_graph_reader.hpp → include/partitioner/edge_based_graph_reader.hpp
+4 -4
View File
@@ -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)
include/partition/files.hpp → include/partitioner/files.hpp
+4 -4
View File
@@ -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
{
include/partition/inertial_flow.hpp → include/partitioner/inertial_flow.hpp
+7 -7
View File
@@ -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_
include/partition/multi_level_graph.hpp → include/partitioner/multi_level_graph.hpp
+4 -4
View File
@@ -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 <typename EdgeDataT, storage::Ownership Ownership> class MultiLevelGraph;
include/partition/multi_level_partition.hpp → include/partitioner/multi_level_partition.hpp
+3 -3
View File
@@ -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
{
include/partition/partition_graph.hpp → include/partitioner/partition_graph.hpp
+5 -5
View File
@@ -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 <algorithm>
#include <cstddef>
@@ -12,7 +12,7 @@
namespace osrm
{
namespace partition
namespace partitioner
{
// forward declaration to allow finding friends
@@ -156,7 +156,7 @@ template <typename NodeEntryT, typename EdgeEntryT> class RemappableGraph
std::vector<EdgeT> edges;
};
} // namespace partition
} // namespace partitioner
} // namespace osrm
#endif // OSRM_PARTITION_GRAPH_HPP_
#endif // OSRM_PARTITIONER_GRAPH_HPP_
include/partitioner/partitioner.hpp
+21
View File
@@ -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_
include/partition/partition_config.hpp → include/partitioner/partitioner_config.hpp
+6 -6
View File
@@ -1,5 +1,5 @@
#ifndef PARTITIONER_CONFIG_HPP
#define PARTITIONER_CONFIG_HPP
#ifndef OSRM_PARTITIONER_CONFIG_HPP
#define OSRM_PARTITIONER_CONFIG_HPP
#include <boost/filesystem/path.hpp>
@@ -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
include/partition/recursive_bisection.hpp → include/partitioner/recursive_bisection.hpp
+7 -7
View File
@@ -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 <cstddef>
@@ -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_
include/partition/recursive_bisection_state.hpp → include/partitioner/recursive_bisection_state.hpp
+7 -7
View File
@@ -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 <cstddef>
#include <cstdint>
#include <vector>
#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<BisectionID> bisection_ids;
};
} // namespace partition
} // namespace partitioner
} // namespace osrm
#endif // OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_
#endif // OSRM_PARTITIONER_RECURSIVE_BISECTION_STATE_HPP_
include/partition/remove_unconnected.hpp → include/partitioner/remove_unconnected.hpp
+3 -3
View File
@@ -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<CellID>;
include/partition/renumber.hpp → include/partitioner/renumber.hpp
+6 -6
View File
@@ -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<std::uint32_t> makePermutation(const DynamicEdgeBasedGraph &graph,
const std::vector<Partition> &partitions);
@@ -73,7 +73,7 @@ inline void renumber(std::vector<extractor::NBGToEBG> &mapping,
}
}
} // namespace partition
} // namespace partitioner
} // namespace osrm
#endif
include/partition/reorder_first_last.hpp → include/partitioner/reorder_first_last.hpp
+3 -3
View File
@@ -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 <boost/assert.hpp>
@@ -9,7 +9,7 @@
namespace osrm
{
namespace partition
namespace partitioner
{
// Reorders the first n elements in the range to satisfy the comparator,
include/partition/serialization.hpp → include/partitioner/serialization.hpp
+7 -7
View File
@@ -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
{
include/partition/tarjan_graph_wrapper.hpp → include/partitioner/tarjan_graph_wrapper.hpp
+6 -6
View File
@@ -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_