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

Refining packed_vector.hpp

Browse Source 
* Rename to std::vector-like APIs (push_back, at)
* Add size, reserve, capacity methods
This commit is contained in:
Lauren Budorick 2016-05-23 10:39:57 -04:00 committed by Daniel J. Hofmann
parent 46b58fba83
commit 1659bbf7b1
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/util/packed_vector.hpp
View File

@ -25,7 +25,7 @@ class PackedVector
public: public:
PackedVector() = default; PackedVector() = default;
void insert(OSMNodeID incoming_node_id) void push_back(OSMNodeID incoming_node_id)
{ {
std::uint64_t node_id = static_cast<std::uint64_t>(incoming_node_id); std::uint64_t node_id = static_cast<std::uint64_t>(incoming_node_id);
// mask incoming values, just in case they are > bitsize // mask incoming values, just in case they are > bitsize
@ -61,7 +61,7 @@ class PackedVector
num_elements++; num_elements++;
} }
OSMNodeID retrieve(const std::size_t &a_index) const OSMNodeID at(const std::size_t &a_index) const
{ {
BOOST_ASSERT(a_index < num_elements); BOOST_ASSERT(a_index < num_elements);
@ -102,6 +102,21 @@ class PackedVector
} }
} }
std::size_t size() const
{
return num_elements;
}
void reserve(std::size_t capacity)
{
vec.reserve(ceil(float(capacity) / ELEMSIZE) * BITSIZE);
}
std::size_t capacity() const
{
return floor(float(vec.capacity()) / BITSIZE) * ELEMSIZE;
}
private: private:
std::vector<std::uint64_t> vec; std::vector<std::uint64_t> vec;
std::size_t num_elements = 0; std::size_t num_elements = 0;

17
unit_tests/util/packed_vector.cpp
View File

@ -21,14 +21,27 @@ BOOST_AUTO_TEST_CASE(insert_and_retrieve_packed_test)
{ {
OSMNodeID r = static_cast<OSMNodeID>(rand() % 2147483647); // max 33-bit uint OSMNodeID r = static_cast<OSMNodeID>(rand() % 2147483647); // max 33-bit uint
packed_ids.insert(r); packed_ids.push_back(r);
original_ids.push_back(r); original_ids.push_back(r);
} }
for (std::size_t i = 0; i < num_test_cases; i++) for (std::size_t i = 0; i < num_test_cases; i++)
{ {
BOOST_CHECK_EQUAL(original_ids.at(i), packed_ids.retrieve(i)); BOOST_CHECK_EQUAL(original_ids.at(i), packed_ids.at(i));
} }
} }
BOOST_AUTO_TEST_CASE(packed_vector_capacity_test)
{
PackedVector packed_vec;
const std::size_t original_size = packed_vec.capacity();
std::vector<OSMNodeID> dummy_vec;
BOOST_CHECK_EQUAL(original_size, dummy_vec.capacity());
packed_vec.reserve(100);
BOOST_CHECK(packed_vec.capacity() >= 100);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()