Initial Skeleton for Recursive Bisection via Inertial Flow
This commit is contained in:
parent
07221f5a48
commit
d56db500d3
@ -115,6 +115,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 ContractorGlob src/contractor/*.cpp)
|
||||
file(GLOB StorageGlob src/storage/*.cpp)
|
||||
file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp)
|
||||
@ -122,6 +123,7 @@ file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp)
|
||||
|
||||
add_library(UTIL OBJECT ${UtilGlob})
|
||||
add_library(EXTRACTOR OBJECT ${ExtractorGlob})
|
||||
add_library(PARTITIONER OBJECT ${PartitionerGlob})
|
||||
add_library(CONTRACTOR OBJECT ${ContractorGlob})
|
||||
add_library(STORAGE OBJECT ${StorageGlob})
|
||||
add_library(ENGINE OBJECT ${EngineGlob})
|
||||
@ -130,11 +132,13 @@ add_library(SERVER OBJECT ${ServerGlob})
|
||||
set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX)
|
||||
|
||||
add_executable(osrm-extract src/tools/extract.cpp)
|
||||
add_executable(osrm-partition src/tools/partition.cpp)
|
||||
add_executable(osrm-contract src/tools/contract.cpp)
|
||||
add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
|
||||
add_executable(osrm-datastore src/tools/store.cpp $<TARGET_OBJECTS:UTIL>)
|
||||
add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:STORAGE>)
|
||||
add_library(osrm_extract $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
|
||||
add_library(osrm_partition $<TARGET_OBJECTS:PARTITIONER> $<TARGET_OBJECTS:UTIL>)
|
||||
add_library(osrm_contract $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
|
||||
add_library(osrm_store $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:UTIL>)
|
||||
|
||||
@ -563,6 +567,7 @@ set(BOOST_ENGINE_LIBRARIES
|
||||
# Binaries
|
||||
target_link_libraries(osrm-datastore osrm_store ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||||
target_link_libraries(osrm-extract osrm_extract ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||||
target_link_libraries(osrm-partition osrm_partition ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||||
target_link_libraries(osrm-contract osrm_contract ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||||
target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})
|
||||
|
||||
@ -578,6 +583,13 @@ set(EXTRACTOR_LIBRARIES
|
||||
${TBB_LIBRARIES}
|
||||
${ZLIB_LIBRARY}
|
||||
${MAYBE_COVERAGE_LIBRARIES})
|
||||
set(PARTITIONER_LIBRARIES
|
||||
${BOOST_ENGINE_LIBRARIES}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${TBB_LIBRARIES}
|
||||
${MAYBE_RT_LIBRARY}
|
||||
${MAYBE_COVERAGE_LIBRARIES}
|
||||
${ZLIB_LIBRARY})
|
||||
set(CONTRACTOR_LIBRARIES
|
||||
${BOOST_BASE_LIBRARIES}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
@ -609,6 +621,7 @@ set(UTIL_LIBRARIES
|
||||
target_link_libraries(osrm ${ENGINE_LIBRARIES})
|
||||
target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES})
|
||||
target_link_libraries(osrm_extract ${EXTRACTOR_LIBRARIES})
|
||||
target_link_libraries(osrm_partition ${PARTITIONER_LIBRARIES})
|
||||
target_link_libraries(osrm_store ${STORAGE_LIBRARIES})
|
||||
|
||||
# BUILD_COMPONENTS
|
||||
@ -641,6 +654,7 @@ endif()
|
||||
# (i.e., from /usr/local/bin/) the linker can find library dependencies. For
|
||||
# more info see http://www.cmake.org/Wiki/CMake_RPATH_handling
|
||||
set_property(TARGET osrm-extract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
set_property(TARGET osrm-partition PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
set_property(TARGET osrm-contract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
|
@ -59,7 +59,6 @@ class ContiguousInternalMemoryDataFacade : public BaseDataFacade
|
||||
using GraphNode = QueryGraph::NodeArrayEntry;
|
||||
using GraphEdge = QueryGraph::EdgeArrayEntry;
|
||||
using IndexBlock = util::RangeTable<16, true>::BlockT;
|
||||
using InputEdge = QueryGraph::InputEdge;
|
||||
using RTreeLeaf = super::RTreeLeaf;
|
||||
using SharedRTree =
|
||||
util::StaticRTree<RTreeLeaf, util::ShM<util::Coordinate, true>::vector, true>;
|
||||
|
99
include/partition/bisection_graph.hpp
Normal file
99
include/partition/bisection_graph.hpp
Normal file
@ -0,0 +1,99 @@
|
||||
#ifndef OSRM_BISECTION_GRAPH_HPP_
|
||||
#define OSRM_BISECTION_GRAPH_HPP_
|
||||
|
||||
#include "util/coordinate.hpp"
|
||||
#include "util/static_graph.hpp"
|
||||
#include "util/typedefs.hpp"
|
||||
|
||||
#include "extractor/edge_based_edge.hpp"
|
||||
|
||||
#include <cstddef>
|
||||
#include <tuple>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
// Required for usage in static graph
|
||||
struct BisectionNode
|
||||
{
|
||||
std::size_t first_edge;
|
||||
util::Coordinate cordinate;
|
||||
};
|
||||
|
||||
// The edge is used within a partition
|
||||
struct BisectionEdge
|
||||
{
|
||||
NodeID target;
|
||||
std::int32_t data; // will be one, but we have the space...
|
||||
};
|
||||
|
||||
// workaround of how static graph assumes edges to be formatted :(
|
||||
using BisectionGraph = util::FlexibleStaticGraph<BisectionNode, BisectionEdge>;
|
||||
|
||||
template <typename InputEdge> std::vector<InputEdge> groupBySource(std::vector<InputEdge> edges)
|
||||
{
|
||||
std::sort(edges.begin(), edges.end(), [](const auto &lhs, const auto &rhs) {
|
||||
return std::tie(lhs.source, lhs.target) < std::tie(rhs.source, rhs.target);
|
||||
});
|
||||
|
||||
return edges;
|
||||
}
|
||||
|
||||
template <typename InputEdge>
|
||||
std::vector<BisectionNode> computeNodes(const std::vector<util::Coordinate> coordinates,
|
||||
const std::vector<InputEdge> &edges)
|
||||
{
|
||||
std::vector<BisectionNode> result;
|
||||
result.reserve(coordinates.size() + 1);
|
||||
|
||||
// stateful transform, counting node ids and moving the edge itr forward
|
||||
const auto coordinate_to_bisection_node =
|
||||
[ edge_itr = edges.begin(), node_id = 0u, &edges ](
|
||||
const util::Coordinate coordinate) mutable->BisectionNode
|
||||
{
|
||||
const auto edges_of_node = edge_itr;
|
||||
|
||||
// count all edges with this source
|
||||
while (edge_itr != edges.end() && edge_itr->source == node_id)
|
||||
++edge_itr;
|
||||
|
||||
// go to the next node
|
||||
++node_id;
|
||||
|
||||
return {static_cast<std::size_t>(std::distance(edges.begin(), edges_of_node)), coordinate};
|
||||
};
|
||||
|
||||
std::transform(coordinates.begin(),
|
||||
coordinates.end(),
|
||||
std::back_inserter(result),
|
||||
coordinate_to_bisection_node);
|
||||
|
||||
// sentinel element
|
||||
result.push_back(
|
||||
{edges.size(), util::Coordinate(util::FloatLongitude{0.0}, util::FloatLatitude{0.0})});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename InputEdge>
|
||||
std::vector<BisectionEdge> adaptToBisectionEdge(std::vector<InputEdge> edges)
|
||||
{
|
||||
std::vector<BisectionEdge> result;
|
||||
|
||||
result.reserve(edges.size());
|
||||
std::transform(edges.begin(),
|
||||
edges.end(),
|
||||
std::back_inserter(result),
|
||||
[](const auto &edge) -> BisectionEdge {
|
||||
return {edge.target, 1};
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
||||
|
||||
#endif // OSRM_BISECTION_GRAPH_HPP_
|
76
include/partition/graph_view.hpp
Normal file
76
include/partition/graph_view.hpp
Normal file
@ -0,0 +1,76 @@
|
||||
#ifndef OSRM_PARTITION_GRAPHVIEW_HPP_
|
||||
#define OSRM_PARTITION_GRAPHVIEW_HPP_
|
||||
|
||||
#include "partition/bisection_graph.hpp"
|
||||
#include "partition/recursive_bisection_state.hpp"
|
||||
|
||||
#include <boost/iterator/filter_iterator.hpp>
|
||||
#include <boost/iterator/iterator_facade.hpp>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
struct HasSamePartitionID
|
||||
{
|
||||
HasSamePartitionID(const RecursiveBisectionState::BisectionID bisection_id,
|
||||
const BisectionGraph &bisection_graph,
|
||||
const RecursiveBisectionState &recursive_bisection_state);
|
||||
|
||||
bool operator()(const EdgeID eid) const;
|
||||
|
||||
private:
|
||||
const RecursiveBisectionState::BisectionID bisection_id;
|
||||
const BisectionGraph &bisection_graph;
|
||||
const RecursiveBisectionState &recursive_bisection_state;
|
||||
};
|
||||
|
||||
// a wrapper around the EdgeIDs returned by the static graph to make them iterable
|
||||
class EdgeIDIterator
|
||||
: public boost::iterator_facade<EdgeIDIterator, EdgeID const, boost::random_access_traversal_tag>
|
||||
{
|
||||
public:
|
||||
EdgeIDIterator() : position(SPECIAL_EDGEID) {}
|
||||
explicit EdgeIDIterator(EdgeID position_) : position(position_) {}
|
||||
|
||||
private:
|
||||
friend class boost::iterator_core_access;
|
||||
|
||||
void increment() { position++; }
|
||||
bool equal(const EdgeIDIterator &other) const { return position == other.position; }
|
||||
const EdgeID &dereference() const { return position; }
|
||||
|
||||
EdgeID position;
|
||||
};
|
||||
|
||||
class GraphView
|
||||
{
|
||||
public:
|
||||
using EdgeIterator = boost::filter_iterator<HasSamePartitionID, EdgeIDIterator>;
|
||||
|
||||
GraphView(const BisectionGraph &graph,
|
||||
const RecursiveBisectionState &bisection_state,
|
||||
const RecursiveBisectionState::IDIterator begin,
|
||||
const RecursiveBisectionState::IDIterator end);
|
||||
|
||||
std::size_t NumberOfNodes() const;
|
||||
|
||||
RecursiveBisectionState::IDIterator Begin() const;
|
||||
RecursiveBisectionState::IDIterator End() const;
|
||||
|
||||
EdgeIterator EdgeBegin(const NodeID nid) const;
|
||||
EdgeIterator EdgeEnd(const NodeID nid) const;
|
||||
|
||||
private:
|
||||
const BisectionGraph &bisection_graph;
|
||||
const RecursiveBisectionState &bisection_state;
|
||||
|
||||
const RecursiveBisectionState::IDIterator begin;
|
||||
const RecursiveBisectionState::IDIterator end;
|
||||
};
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
||||
|
||||
#endif // OSRM_PARTITION_GRAPHVIEW_HPP_
|
25
include/partition/inertial_flow.hpp
Normal file
25
include/partition/inertial_flow.hpp
Normal file
@ -0,0 +1,25 @@
|
||||
#ifndef OSRM_PARTITION_INERTIAL_FLOW_HPP_
|
||||
#define OSRM_PARTITION_INERTIAL_FLOW_HPP_
|
||||
|
||||
#include "partition/graph_view.hpp"
|
||||
#include <vector>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
class InertialFlow
|
||||
{
|
||||
public:
|
||||
InertialFlow(const GraphView &view);
|
||||
|
||||
std::vector<bool> ComputePartition(const double balance, const double source_sink_rate);
|
||||
private:
|
||||
const GraphView &view;
|
||||
};
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
||||
|
||||
#endif // OSRM_PARTITION_INERTIAL_FLOW_HPP_
|
47
include/partition/partition_config.hpp
Normal file
47
include/partition/partition_config.hpp
Normal file
@ -0,0 +1,47 @@
|
||||
#ifndef PARTITIONER_CONFIG_HPP
|
||||
#define PARTITIONER_CONFIG_HPP
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
|
||||
#include <array>
|
||||
#include <string>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
struct PartitionConfig
|
||||
{
|
||||
PartitionConfig() noexcept : requested_num_threads(0) {}
|
||||
|
||||
void UseDefaults()
|
||||
{
|
||||
std::string basepath = base_path.string();
|
||||
|
||||
const std::string ext = ".osrm";
|
||||
const auto pos = basepath.find(ext);
|
||||
if (pos != std::string::npos)
|
||||
{
|
||||
basepath.replace(pos, ext.size(), "");
|
||||
}
|
||||
else
|
||||
{
|
||||
// unknown extension
|
||||
}
|
||||
|
||||
edge_based_graph_path = basepath + ".osrm.ebg";
|
||||
partition_path = basepath + ".osrm.partition";
|
||||
}
|
||||
|
||||
// might be changed to the node based graph at some point
|
||||
boost::filesystem::path base_path;
|
||||
boost::filesystem::path edge_based_graph_path;
|
||||
boost::filesystem::path partition_path;
|
||||
|
||||
unsigned requested_num_threads;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#endif // PARTITIONER_CONFIG_HPP
|
21
include/partition/partitioner.hpp
Normal file
21
include/partition/partitioner.hpp
Normal file
@ -0,0 +1,21 @@
|
||||
#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_
|
30
include/partition/recursive_bisection.hpp
Normal file
30
include/partition/recursive_bisection.hpp
Normal file
@ -0,0 +1,30 @@
|
||||
#ifndef OSRM_PARTITION_RECURSIVE_BISECTION_HPP_
|
||||
#define OSRM_PARTITION_RECURSIVE_BISECTION_HPP_
|
||||
|
||||
#include "partition/bisection_graph.hpp"
|
||||
#include "partition/recursive_bisection_state.hpp"
|
||||
|
||||
#include <cstddef>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
class RecursiveBisection
|
||||
{
|
||||
public:
|
||||
RecursiveBisection(std::size_t maximum_cell_size,
|
||||
double balance,
|
||||
double boundary_factor,
|
||||
const BisectionGraph &bisection_graph);
|
||||
|
||||
private:
|
||||
const BisectionGraph &bisection_graph;
|
||||
RecursiveBisectionState internal_state;
|
||||
};
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
||||
|
||||
#endif // OSRM_PARTITION_RECURSIVE_BISECTION_HPP_
|
74
include/partition/recursive_bisection_state.hpp
Normal file
74
include/partition/recursive_bisection_state.hpp
Normal file
@ -0,0 +1,74 @@
|
||||
#ifndef OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_
|
||||
#define OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_
|
||||
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
|
||||
#include "partition/bisection_graph.hpp"
|
||||
#include "util/typedefs.hpp"
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
// The recursive state describes the relation between our global graph and the recursive state in a
|
||||
// recursive bisection.
|
||||
//
|
||||
// We describe the state with the use of two arrays:
|
||||
//
|
||||
// The id-arrays keeps nodes in order, based on their partitioning. Initially, it contains all nodes
|
||||
// in sorted order:
|
||||
//
|
||||
// ids: [0,1,2,3,4,5,6,7,8,9]
|
||||
//
|
||||
// When partitioned (for this example we use even : odd), the arrays is re-ordered to group all
|
||||
// elements within a single cell of the partition:
|
||||
//
|
||||
// ids: [0,2,4,6,8,1,3,5,7,9]
|
||||
//
|
||||
// This can be performed recursively by interpreting the arrays [0,2,4,6,8] and [1,3,5,7,9] as new
|
||||
// input.
|
||||
//
|
||||
// The partitioning array describes all results of the partitioning in form of `left` or `right`.
|
||||
// It is a sequence of bits for every id that describes if it is moved to the `front` or `back`
|
||||
// during the split of the ID array. In the example, we would get the result
|
||||
//
|
||||
// bisection-ids: [0,1,0,1,0,1,0,1,0,1]
|
||||
//
|
||||
// Further partitioning [0,2,4,6,8] into [0,4,8], [2,6] and [1,3,5,7,9] into [1,3,9] and [5,7]
|
||||
// the result would be:
|
||||
//
|
||||
// bisection-ids: [00,10,01,10,00,11,01,11,00,10]
|
||||
|
||||
class RecursiveBisectionState
|
||||
{
|
||||
public:
|
||||
// the ID in the partition arr
|
||||
using BisectionID = std::uint32_t;
|
||||
using IDIterator = std::vector<NodeID>::const_iterator;
|
||||
|
||||
RecursiveBisectionState(const BisectionGraph &bisection_graph);
|
||||
~RecursiveBisectionState();
|
||||
|
||||
BisectionID GetBisectionID(const NodeID nid) const;
|
||||
|
||||
// returns the center of the bisection
|
||||
IDIterator ApplyBisection(const IDIterator begin,
|
||||
const IDIterator end,
|
||||
const std::vector<bool> &partition);
|
||||
|
||||
const IDIterator Begin() const;
|
||||
const IDIterator End() const;
|
||||
|
||||
private:
|
||||
const BisectionGraph &bisection_graph;
|
||||
|
||||
std::vector<NodeID> id_array;
|
||||
std::vector<BisectionID> bisection_ids;
|
||||
};
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
||||
|
||||
#endif // OSRM_PARTITION_RECURSIVE_BISECTION_STATE_HPP_
|
@ -18,54 +18,64 @@ namespace osrm
|
||||
namespace util
|
||||
{
|
||||
|
||||
template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
|
||||
namespace static_graph_details
|
||||
{
|
||||
|
||||
using NodeIterator = NodeID;
|
||||
using EdgeIterator = NodeID;
|
||||
|
||||
struct NodeArrayEntry
|
||||
{
|
||||
// index of the first edge
|
||||
EdgeIterator first_edge;
|
||||
};
|
||||
|
||||
template <typename EdgeDataT> struct EdgeArrayEntry
|
||||
{
|
||||
NodeID target;
|
||||
EdgeDataT data;
|
||||
};
|
||||
|
||||
template <typename EdgeDataT> class SortableEdgeWithData
|
||||
{
|
||||
public:
|
||||
using NodeIterator = NodeID;
|
||||
using EdgeIterator = NodeID;
|
||||
using EdgeData = EdgeDataT;
|
||||
NodeIterator source;
|
||||
NodeIterator target;
|
||||
EdgeDataT data;
|
||||
|
||||
template <typename... Ts>
|
||||
SortableEdgeWithData(NodeIterator source, NodeIterator target, Ts &&... data)
|
||||
: source(source), target(target), data(std::forward<Ts>(data)...)
|
||||
{
|
||||
}
|
||||
bool operator<(const SortableEdgeWithData &right) const
|
||||
{
|
||||
if (source != right.source)
|
||||
{
|
||||
return source < right.source;
|
||||
}
|
||||
return target < right.target;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace static_graph_details
|
||||
|
||||
template <typename NodeT, typename EdgeT, bool UseSharedMemory = false> class FlexibleStaticGraph
|
||||
{
|
||||
public:
|
||||
using NodeIterator = static_graph_details::NodeIterator;
|
||||
using EdgeIterator = static_graph_details::EdgeIterator;
|
||||
using EdgeData = decltype(EdgeT::data);
|
||||
using EdgeRange = range<EdgeIterator>;
|
||||
|
||||
class InputEdge
|
||||
{
|
||||
public:
|
||||
NodeIterator source;
|
||||
NodeIterator target;
|
||||
EdgeDataT data;
|
||||
|
||||
template <typename... Ts>
|
||||
InputEdge(NodeIterator source, NodeIterator target, Ts &&... data)
|
||||
: source(source), target(target), data(std::forward<Ts>(data)...)
|
||||
{
|
||||
}
|
||||
bool operator<(const InputEdge &right) const
|
||||
{
|
||||
if (source != right.source)
|
||||
{
|
||||
return source < right.source;
|
||||
}
|
||||
return target < right.target;
|
||||
}
|
||||
};
|
||||
|
||||
struct NodeArrayEntry
|
||||
{
|
||||
// index of the first edge
|
||||
EdgeIterator first_edge;
|
||||
};
|
||||
|
||||
struct EdgeArrayEntry
|
||||
{
|
||||
NodeID target;
|
||||
EdgeDataT data;
|
||||
};
|
||||
using NodeArrayEntry = NodeT;
|
||||
using EdgeArrayEntry = EdgeT;
|
||||
|
||||
EdgeRange GetAdjacentEdgeRange(const NodeID node) const
|
||||
{
|
||||
return irange(BeginEdges(node), EndEdges(node));
|
||||
}
|
||||
|
||||
template <typename ContainerT> StaticGraph(const int nodes, const ContainerT &graph)
|
||||
template <typename ContainerT> FlexibleStaticGraph(const int nodes, const ContainerT &graph)
|
||||
{
|
||||
BOOST_ASSERT(std::is_sorted(const_cast<ContainerT &>(graph).begin(),
|
||||
const_cast<ContainerT &>(graph).end()));
|
||||
@ -99,8 +109,8 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
|
||||
}
|
||||
}
|
||||
|
||||
StaticGraph(typename ShM<NodeArrayEntry, UseSharedMemory>::vector &nodes,
|
||||
typename ShM<EdgeArrayEntry, UseSharedMemory>::vector &edges)
|
||||
FlexibleStaticGraph(typename ShM<NodeT, UseSharedMemory>::vector &nodes,
|
||||
typename ShM<EdgeT, UseSharedMemory>::vector &edges)
|
||||
{
|
||||
number_of_nodes = static_cast<decltype(number_of_nodes)>(nodes.size() - 1);
|
||||
number_of_edges = static_cast<decltype(number_of_edges)>(edges.size());
|
||||
@ -121,9 +131,9 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
|
||||
return NodeIterator(edge_array[e].target);
|
||||
}
|
||||
|
||||
EdgeDataT &GetEdgeData(const EdgeIterator e) { return edge_array[e].data; }
|
||||
auto &GetEdgeData(const EdgeIterator e) { return edge_array[e].data; }
|
||||
|
||||
const EdgeDataT &GetEdgeData(const EdgeIterator e) const { return edge_array[e].data; }
|
||||
const auto &GetEdgeData(const EdgeIterator e) const { return edge_array[e].data; }
|
||||
|
||||
EdgeIterator BeginEdges(const NodeIterator n) const
|
||||
{
|
||||
@ -200,13 +210,21 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
|
||||
return current_iterator;
|
||||
}
|
||||
|
||||
const NodeArrayEntry& GetNode(const NodeID nid) const { return node_array[nid]; }
|
||||
const EdgeArrayEntry& GetEdge(const EdgeID eid) const { return edge_array[eid]; }
|
||||
|
||||
private:
|
||||
NodeIterator number_of_nodes;
|
||||
EdgeIterator number_of_edges;
|
||||
|
||||
typename ShM<NodeArrayEntry, UseSharedMemory>::vector node_array;
|
||||
typename ShM<EdgeArrayEntry, UseSharedMemory>::vector edge_array;
|
||||
typename ShM<NodeT, UseSharedMemory>::vector node_array;
|
||||
typename ShM<EdgeT, UseSharedMemory>::vector edge_array;
|
||||
};
|
||||
|
||||
template <typename EdgeDataT, bool UseSharedMemory = false>
|
||||
using StaticGraph = FlexibleStaticGraph<static_graph_details::NodeArrayEntry,
|
||||
static_graph_details::EdgeArrayEntry<EdgeDataT>,
|
||||
UseSharedMemory>;
|
||||
}
|
||||
}
|
||||
|
||||
|
65
src/partition/graph_view.cpp
Normal file
65
src/partition/graph_view.cpp
Normal file
@ -0,0 +1,65 @@
|
||||
#include "partition/graph_view.hpp"
|
||||
#include <iterator>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
HasSamePartitionID::HasSamePartitionID(const RecursiveBisectionState::BisectionID bisection_id_,
|
||||
const BisectionGraph &bisection_graph_,
|
||||
const RecursiveBisectionState &recursive_bisection_state_)
|
||||
: bisection_id(bisection_id_), bisection_graph(bisection_graph_),
|
||||
recursive_bisection_state(recursive_bisection_state_)
|
||||
{
|
||||
}
|
||||
|
||||
bool HasSamePartitionID::operator()(const EdgeID eid) const
|
||||
{
|
||||
return recursive_bisection_state.GetBisectionID(bisection_graph.GetTarget(eid)) == bisection_id;
|
||||
}
|
||||
|
||||
GraphView::GraphView(const BisectionGraph &bisection_graph_,
|
||||
const RecursiveBisectionState &bisection_state_,
|
||||
const RecursiveBisectionState::IDIterator begin_,
|
||||
const RecursiveBisectionState::IDIterator end_)
|
||||
: bisection_graph(bisection_graph_), bisection_state(bisection_state_), begin(begin_), end(end_)
|
||||
{
|
||||
// print graph
|
||||
std::cout << "Graph\n";
|
||||
for( auto itr = begin_; itr != end_; ++itr )
|
||||
{
|
||||
std::cout << "Node: " << *itr << std::endl;
|
||||
for( auto eitr = EdgeBegin(*itr); eitr != EdgeEnd(*itr); ++eitr )
|
||||
{
|
||||
std::cout << "\t" << *eitr << " -> " << bisection_graph.GetTarget(*eitr) << std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RecursiveBisectionState::IDIterator GraphView::Begin() const { return begin; }
|
||||
|
||||
RecursiveBisectionState::IDIterator GraphView::End() const { return end; }
|
||||
|
||||
std::size_t GraphView::NumberOfNodes() const { return std::distance(begin, end); }
|
||||
|
||||
GraphView::EdgeIterator GraphView::EdgeBegin(const NodeID nid) const
|
||||
{
|
||||
return boost::make_filter_iterator(
|
||||
HasSamePartitionID(bisection_state.GetBisectionID(nid),
|
||||
bisection_graph,
|
||||
bisection_state),
|
||||
EdgeIDIterator(bisection_graph.BeginEdges(nid)),
|
||||
EdgeIDIterator(bisection_graph.EndEdges(nid)));
|
||||
}
|
||||
|
||||
GraphView::EdgeIterator GraphView::EdgeEnd(const NodeID nid) const
|
||||
{
|
||||
return boost::make_filter_iterator(
|
||||
HasSamePartitionID(bisection_state.GetBisectionID(nid), bisection_graph, bisection_state),
|
||||
EdgeIDIterator(bisection_graph.EndEdges(nid)),
|
||||
EdgeIDIterator(bisection_graph.EndEdges(nid)));
|
||||
}
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
22
src/partition/inertial_flow.cpp
Normal file
22
src/partition/inertial_flow.cpp
Normal file
@ -0,0 +1,22 @@
|
||||
#include "partition/inertial_flow.hpp"
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
InertialFlow::InertialFlow(const GraphView &view_) : view(view_) {}
|
||||
|
||||
std::vector<bool> InertialFlow::ComputePartition(const double balance, const double source_sink_rate)
|
||||
{
|
||||
std::vector<bool> partition(view.NumberOfNodes());
|
||||
std::size_t i = 0;
|
||||
for( auto itr = partition.begin(); itr != partition.end(); ++itr )
|
||||
{
|
||||
*itr = (i++ % 2) != 0;
|
||||
}
|
||||
return partition;
|
||||
}
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
78
src/partition/partitioner.cpp
Normal file
78
src/partition/partitioner.cpp
Normal file
@ -0,0 +1,78 @@
|
||||
#include "partition/partitioner.hpp"
|
||||
#include "partition/bisection_graph.hpp"
|
||||
|
||||
#include "partition/recursive_bisection.hpp"
|
||||
|
||||
// TODO remove after testing
|
||||
#include "util/coordinate.hpp"
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
int Partitioner::Run(const PartitionConfig &config)
|
||||
{
|
||||
struct TestEdge
|
||||
{
|
||||
NodeID source;
|
||||
NodeID target;
|
||||
};
|
||||
|
||||
std::vector<TestEdge> input_edges;
|
||||
|
||||
// 0 - 1 - 2 - 3
|
||||
// | \ | |
|
||||
// 4 - 5 - 6 - 7
|
||||
|
||||
input_edges.push_back({0, 1});
|
||||
input_edges.push_back({0, 4});
|
||||
input_edges.push_back({0, 5});
|
||||
|
||||
input_edges.push_back({1, 0});
|
||||
input_edges.push_back({1, 2});
|
||||
|
||||
input_edges.push_back({2, 1});
|
||||
input_edges.push_back({2, 3});
|
||||
input_edges.push_back({2, 6});
|
||||
|
||||
input_edges.push_back({3, 2});
|
||||
input_edges.push_back({3, 7});
|
||||
|
||||
input_edges.push_back({4, 0});
|
||||
input_edges.push_back({4, 5});
|
||||
|
||||
input_edges.push_back({5, 0});
|
||||
input_edges.push_back({5, 4});
|
||||
input_edges.push_back({5, 6});
|
||||
|
||||
input_edges.push_back({6, 2});
|
||||
input_edges.push_back({6, 5});
|
||||
input_edges.push_back({6, 7});
|
||||
|
||||
input_edges.push_back({7, 3});
|
||||
input_edges.push_back({7, 6});
|
||||
|
||||
input_edges = groupBySource(std::move(input_edges));
|
||||
|
||||
std::vector<util::Coordinate> coordinates;
|
||||
|
||||
for (std::size_t i = 0; i < 8; ++i)
|
||||
{
|
||||
coordinates.push_back(
|
||||
{util::FloatLongitude{(i % 4) / 4.0}, util::FloatLatitude{(double)(i / 4)}});
|
||||
}
|
||||
|
||||
// do the partitioning
|
||||
std::vector<BisectionNode> nodes = computeNodes(coordinates, input_edges);
|
||||
std::vector<BisectionEdge> edges = adaptToBisectionEdge(input_edges);
|
||||
|
||||
BisectionGraph graph(nodes, edges);
|
||||
|
||||
RecursiveBisection recursive_bisection(1024, 1.1, 0.25, graph);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
38
src/partition/recursive_bisection.cpp
Normal file
38
src/partition/recursive_bisection.cpp
Normal file
@ -0,0 +1,38 @@
|
||||
#include "partition/recursive_bisection.hpp"
|
||||
#include "partition/inertial_flow.hpp"
|
||||
|
||||
#include "partition/graph_view.hpp"
|
||||
#include "partition/recursive_bisection_state.hpp"
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
RecursiveBisection::RecursiveBisection(std::size_t maximum_cell_size,
|
||||
double balance,
|
||||
double boundary_factor,
|
||||
const BisectionGraph &bisection_graph_)
|
||||
: bisection_graph(bisection_graph_), internal_state(bisection_graph_)
|
||||
{
|
||||
GraphView view(bisection_graph, internal_state, internal_state.Begin(), internal_state.End());
|
||||
InertialFlow flow(view);
|
||||
const auto partition = flow.ComputePartition(balance, boundary_factor);
|
||||
const auto center = internal_state.ApplyBisection(view.Begin(), view.End(), partition);
|
||||
{
|
||||
auto state = internal_state;
|
||||
}
|
||||
|
||||
GraphView recursive_view_lhs(bisection_graph, internal_state, view.Begin(), center);
|
||||
InertialFlow flow_lhs(recursive_view_lhs);
|
||||
const auto partition_lhs = flow_lhs.ComputePartition(balance,boundary_factor);
|
||||
internal_state.ApplyBisection(recursive_view_lhs.Begin(),recursive_view_lhs.End(),partition_lhs);
|
||||
|
||||
GraphView recursive_view_rhs(bisection_graph, internal_state, center, view.End());
|
||||
InertialFlow flow_rhs(recursive_view_rhs);
|
||||
const auto partition_rhs = flow_rhs.ComputePartition(balance,boundary_factor);
|
||||
internal_state.ApplyBisection(recursive_view_rhs.Begin(),recursive_view_rhs.End(),partition_rhs);
|
||||
}
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
69
src/partition/recursive_bisection_state.cpp
Normal file
69
src/partition/recursive_bisection_state.cpp
Normal file
@ -0,0 +1,69 @@
|
||||
#include "partition/recursive_bisection_state.hpp"
|
||||
|
||||
#include <numeric>
|
||||
|
||||
//TODO remove
|
||||
#include <iostream>
|
||||
#include <bitset>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace partition
|
||||
{
|
||||
|
||||
RecursiveBisectionState::RecursiveBisectionState(const BisectionGraph &bisection_graph_)
|
||||
: bisection_graph(bisection_graph_)
|
||||
{
|
||||
id_array.resize(bisection_graph.GetNumberOfNodes());
|
||||
std::iota(id_array.begin(), id_array.end(), 0);
|
||||
bisection_ids.resize(bisection_graph.GetNumberOfNodes(), 0);
|
||||
}
|
||||
|
||||
RecursiveBisectionState::~RecursiveBisectionState()
|
||||
{
|
||||
std::cout << "Internal Result\n";
|
||||
std::cout << "IDArray:";
|
||||
for( auto id : id_array )
|
||||
std::cout << " " << id;
|
||||
std::cout << std::endl;
|
||||
|
||||
std::cout << "BisectionIDs:";
|
||||
for( auto id : bisection_ids)
|
||||
std::cout << " " << (std::bitset<4>(id));
|
||||
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
const RecursiveBisectionState::IDIterator RecursiveBisectionState::Begin() const
|
||||
{
|
||||
return id_array.begin();
|
||||
}
|
||||
|
||||
const RecursiveBisectionState::IDIterator RecursiveBisectionState::End() const
|
||||
{
|
||||
return id_array.end();
|
||||
}
|
||||
|
||||
RecursiveBisectionState::BisectionID RecursiveBisectionState::GetBisectionID(const NodeID nid) const
|
||||
{
|
||||
return bisection_ids[nid];
|
||||
}
|
||||
|
||||
RecursiveBisectionState::IDIterator RecursiveBisectionState::ApplyBisection(
|
||||
const IDIterator begin, const IDIterator end, const std::vector<bool> &partition)
|
||||
{
|
||||
// augment the partition ids
|
||||
for (auto itr = begin; itr != end; ++itr)
|
||||
{
|
||||
bisection_ids[*itr] <<= 1;
|
||||
bisection_ids[*itr] |= partition[std::distance(begin, itr)];
|
||||
}
|
||||
|
||||
// keep items with `0` as partition id to the left, move other to the right
|
||||
return std::stable_partition(id_array.begin() + std::distance(id_array.cbegin(), begin),
|
||||
id_array.begin() + std::distance(id_array.cbegin(), end),
|
||||
[this](const auto nid) { return 0 == (bisection_ids[nid] & 1); });
|
||||
}
|
||||
|
||||
} // namespace partition
|
||||
} // namespace osrm
|
@ -42,7 +42,7 @@ struct TarjanEdgeData
|
||||
};
|
||||
|
||||
using TarjanGraph = util::StaticGraph<TarjanEdgeData>;
|
||||
using TarjanEdge = TarjanGraph::InputEdge;
|
||||
using TarjanEdge = util::static_graph_details::SortableEdgeWithData<TarjanEdgeData>;
|
||||
|
||||
std::size_t loadGraph(const std::string &path,
|
||||
std::vector<extractor::QueryNode> &coordinate_list,
|
||||
|
145
src/tools/partition.cpp
Normal file
145
src/tools/partition.cpp
Normal file
@ -0,0 +1,145 @@
|
||||
#include "partition/partitioner.hpp"
|
||||
#include "partition/partition_config.hpp"
|
||||
|
||||
#include "util/log.hpp"
|
||||
#include "util/version.hpp"
|
||||
|
||||
#include <tbb/task_scheduler_init.h>
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/program_options.hpp>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
using namespace osrm;
|
||||
|
||||
enum class return_code : unsigned
|
||||
{
|
||||
ok,
|
||||
fail,
|
||||
exit
|
||||
};
|
||||
|
||||
return_code parseArguments(int argc, char *argv[], partition::PartitionConfig &partition_config)
|
||||
{
|
||||
// declare a group of options that will be allowed only on command line
|
||||
boost::program_options::options_description generic_options("Options");
|
||||
generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message");
|
||||
|
||||
// declare a group of options that will be allowed both on command line
|
||||
boost::program_options::options_description config_options("Configuration");
|
||||
config_options.add_options()(
|
||||
"threads,t",
|
||||
boost::program_options::value<unsigned int>(&partition_config.requested_num_threads)
|
||||
->default_value(tbb::task_scheduler_init::default_num_threads()),
|
||||
"Number of threads to use");
|
||||
|
||||
// hidden options, will be allowed on command line, but will not be
|
||||
// shown to the user
|
||||
boost::program_options::options_description hidden_options("Hidden options");
|
||||
hidden_options.add_options()(
|
||||
"input,i",
|
||||
boost::program_options::value<boost::filesystem::path>(&partition_config.base_path),
|
||||
"Input file in .osrm format");
|
||||
|
||||
// positional option
|
||||
boost::program_options::positional_options_description positional_options;
|
||||
positional_options.add("input", 1);
|
||||
|
||||
// combine above options for parsing
|
||||
boost::program_options::options_description cmdline_options;
|
||||
cmdline_options.add(generic_options).add(config_options).add(hidden_options);
|
||||
|
||||
const auto *executable = argv[0];
|
||||
boost::program_options::options_description visible_options(
|
||||
boost::filesystem::path(executable).filename().string() + " <input.osrm> [options]");
|
||||
visible_options.add(generic_options).add(config_options);
|
||||
|
||||
// parse command line options
|
||||
boost::program_options::variables_map option_variables;
|
||||
try
|
||||
{
|
||||
boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
|
||||
.options(cmdline_options)
|
||||
.positional(positional_options)
|
||||
.run(),
|
||||
option_variables);
|
||||
}
|
||||
catch (const boost::program_options::error &e)
|
||||
{
|
||||
util::Log(logERROR) << e.what();
|
||||
return return_code::fail;
|
||||
}
|
||||
|
||||
if (option_variables.count("version"))
|
||||
{
|
||||
std::cout << OSRM_VERSION << std::endl;
|
||||
return return_code::exit;
|
||||
}
|
||||
|
||||
if (option_variables.count("help"))
|
||||
{
|
||||
std::cout << visible_options;
|
||||
return return_code::exit;
|
||||
}
|
||||
|
||||
boost::program_options::notify(option_variables);
|
||||
|
||||
if (!option_variables.count("input"))
|
||||
{
|
||||
std::cout << visible_options;
|
||||
return return_code::exit;
|
||||
}
|
||||
|
||||
return return_code::ok;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) try
|
||||
{
|
||||
util::LogPolicy::GetInstance().Unmute();
|
||||
partition::PartitionConfig partition_config;
|
||||
|
||||
const auto result = parseArguments(argc, argv, partition_config);
|
||||
|
||||
if (return_code::fail == result)
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (return_code::exit == result)
|
||||
{
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
// set the default in/output names
|
||||
partition_config.UseDefaults();
|
||||
|
||||
if (1 > partition_config.requested_num_threads)
|
||||
{
|
||||
util::Log(logERROR) << "Number of threads must be 1 or larger";
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (!boost::filesystem::is_regular_file(partition_config.base_path))
|
||||
{
|
||||
util::Log(logERROR) << "Input file " << partition_config.base_path.string()
|
||||
<< " not found!";
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
auto exitcode = partition::Partitioner().Run(partition_config);
|
||||
return exitcode;
|
||||
}
|
||||
catch (const std::bad_alloc &e)
|
||||
{
|
||||
util::Log(logERROR) << "[exception] " << e.what();
|
||||
util::Log(logERROR) << "Please provide more memory or consider using a larger swapfile";
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
#ifdef _WIN32
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
util::Log(logERROR) << "[exception] " << e.what() << std::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
#endif
|
@ -21,7 +21,7 @@ struct TestData
|
||||
typedef StaticGraph<TestData> TestStaticGraph;
|
||||
typedef TestStaticGraph::NodeArrayEntry TestNodeArrayEntry;
|
||||
typedef TestStaticGraph::EdgeArrayEntry TestEdgeArrayEntry;
|
||||
typedef TestStaticGraph::InputEdge TestInputEdge;
|
||||
typedef static_graph_details::SortableEdgeWithData<TestData> TestInputEdge;
|
||||
|
||||
constexpr unsigned TEST_NUM_NODES = 100;
|
||||
constexpr unsigned TEST_NUM_EDGES = 500;
|
||||
|
Loading…
Reference in New Issue
Block a user