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

Fix formating again

Browse Source
This commit is contained in:
Patrick Niklaus 2018-03-26 12:13:07 +00:00
parent c322d93435
commit 3ee8a963cb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
View File

@ -94,7 +94,8 @@ class ContiguousInternalMemoryAlgorithmDataFacade<CH> : public datafacade::Algor
auto filter_block_id = static_cast<storage::DataLayout::BlockID>( auto filter_block_id = static_cast<storage::DataLayout::BlockID>(
storage::DataLayout::CH_EDGE_FILTER_0 + exclude_index); storage::DataLayout::CH_EDGE_FILTER_0 + exclude_index);
auto edge_filter_ptr = data_layout.GetBlockPtr<util::vector_view<bool>::Word>(memory_block, filter_block_id); auto edge_filter_ptr =
data_layout.GetBlockPtr<util::vector_view<bool>::Word>(memory_block, filter_block_id);
util::vector_view<GraphNode> node_list( util::vector_view<GraphNode> node_list(
graph_nodes_ptr, data_layout.GetBlockEntries(storage::DataLayout::CH_GRAPH_NODE_LIST)); graph_nodes_ptr, data_layout.GetBlockEntries(storage::DataLayout::CH_GRAPH_NODE_LIST));

4
include/storage/serialization.hpp
View File

@ -143,7 +143,7 @@ template <typename T, typename BlockT = unsigned char>
inline void unpackBits(T &data, std::size_t index, std::size_t count, BlockT value) inline void unpackBits(T &data, std::size_t index, std::size_t count, BlockT value)
{ {
static_assert(std::is_same<typename T::value_type, bool>::value, "value_type is not bool"); static_assert(std::is_same<typename T::value_type, bool>::value, "value_type is not bool");
const BlockT mask = BlockT {1} << (count - 1); const BlockT mask = BlockT{1} << (count - 1);
for (std::size_t bit = 0; bit < count; value <<= 1, ++bit, ++index) for (std::size_t bit = 0; bit < count; value <<= 1, ++bit, ++index)
data[index] = value & mask; data[index] = value & mask;
} }
@ -159,7 +159,7 @@ void readBoolVector(tar::FileReader &reader, const std::string &name, VectorT &d
const auto decode = [&](const std::uint64_t block) { const auto decode = [&](const std::uint64_t block) {
auto read_size = std::min<std::size_t>(count - index, WORD_BITS); auto read_size = std::min<std::size_t>(count - index, WORD_BITS);
unpackBits<VectorT,std::uint64_t>(data, index, read_size, block); unpackBits<VectorT, std::uint64_t>(data, index, read_size, block);
index += WORD_BITS; index += WORD_BITS;
}; };

3
src/storage/storage.cpp
View File

@ -712,7 +712,8 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
{ {
auto block_id = auto block_id =
static_cast<DataLayout::BlockID>(storage::DataLayout::CH_EDGE_FILTER_0 + index); static_cast<DataLayout::BlockID>(storage::DataLayout::CH_EDGE_FILTER_0 + index);
auto data_ptr = layout.GetBlockPtr<util::vector_view<bool>::Word, true>(memory_ptr, block_id); auto data_ptr =
layout.GetBlockPtr<util::vector_view<bool>::Word, true>(memory_ptr, block_id);
auto num_entries = layout.GetBlockEntries(block_id); auto num_entries = layout.GetBlockEntries(block_id);
edge_filter.emplace_back(data_ptr, num_entries); edge_filter.emplace_back(data_ptr, num_entries);
} }