clang-format
This commit is contained in:
committed by
Patrick Niklaus
parent
16665aeb00
commit
091a495632
@@ -27,10 +27,10 @@ constexpr int32_t WORLD_MIN_LON = -180 * COORDINATE_PRECISION;
|
||||
constexpr int32_t WORLD_MAX_LON = 180 * COORDINATE_PRECISION;
|
||||
|
||||
using RTreeLeaf = extractor::EdgeBasedNode;
|
||||
using BenchStaticRTree = util::StaticRTree<
|
||||
RTreeLeaf,
|
||||
util::ShM<util::Coordinate, osrm::storage::Ownership::Container>::vector,
|
||||
osrm::storage::Ownership::Container>;
|
||||
using BenchStaticRTree =
|
||||
util::StaticRTree<RTreeLeaf,
|
||||
util::ShM<util::Coordinate, osrm::storage::Ownership::Container>::vector,
|
||||
osrm::storage::Ownership::Container>;
|
||||
|
||||
std::vector<util::Coordinate> loadCoordinates(const boost::filesystem::path &nodes_file)
|
||||
{
|
||||
|
||||
@@ -84,10 +84,9 @@ auto LoadAndUpdateEdgeExpandedGraph(const CustomizationConfig &config,
|
||||
auto directed = partition::splitBidirectionalEdges(edge_based_edge_list);
|
||||
auto tidied =
|
||||
partition::prepareEdgesForUsageInGraph<StaticEdgeBasedGraphEdge>(std::move(directed));
|
||||
auto edge_based_graph =
|
||||
std::make_unique<partition::MultiLevelGraph<EdgeBasedGraphEdgeData,
|
||||
osrm::storage::Ownership::Container>>(
|
||||
mlp, num_nodes, std::move(tidied));
|
||||
auto edge_based_graph = std::make_unique<
|
||||
partition::MultiLevelGraph<EdgeBasedGraphEdgeData, osrm::storage::Ownership::Container>>(
|
||||
mlp, num_nodes, std::move(tidied));
|
||||
|
||||
util::Log() << "Loaded edge based graph for mapping partition ids: "
|
||||
<< edge_based_graph->GetNumberOfEdges() << " edges, "
|
||||
|
||||
@@ -365,15 +365,14 @@ void Storage::PopulateLayout(DataLayout &layout)
|
||||
intersection_file.Skip<std::uint32_t>(1); // sum_lengths
|
||||
|
||||
layout.SetBlockSize<unsigned>(DataLayout::BEARING_OFFSETS, bearing_blocks);
|
||||
layout.SetBlockSize<
|
||||
typename util::RangeTable<16, osrm::storage::Ownership::View>::BlockT>(
|
||||
layout.SetBlockSize<typename util::RangeTable<16, osrm::storage::Ownership::View>::BlockT>(
|
||||
DataLayout::BEARING_BLOCKS, bearing_blocks);
|
||||
|
||||
// No need to read the data
|
||||
intersection_file.Skip<unsigned>(bearing_blocks);
|
||||
intersection_file.Skip<
|
||||
typename util::RangeTable<16, osrm::storage::Ownership::View>::BlockT>(
|
||||
bearing_blocks);
|
||||
intersection_file
|
||||
.Skip<typename util::RangeTable<16, osrm::storage::Ownership::View>::BlockT>(
|
||||
bearing_blocks);
|
||||
|
||||
const auto num_bearings = intersection_file.ReadElementCount64();
|
||||
|
||||
@@ -807,8 +806,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
|
||||
intersection_file.Skip<std::uint32_t>(1); // sum_lengths
|
||||
|
||||
std::vector<unsigned> bearing_offsets_data(bearing_blocks);
|
||||
std::vector<
|
||||
typename util::RangeTable<16, osrm::storage::Ownership::View>::BlockT>
|
||||
std::vector<typename util::RangeTable<16, osrm::storage::Ownership::View>::BlockT>
|
||||
bearing_blocks_data(bearing_blocks);
|
||||
|
||||
intersection_file.ReadInto(bearing_offsets_data.data(), bearing_blocks);
|
||||
|
||||
Reference in New Issue
Block a user