Skip to content

Preserve clamped maximum load factors #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fhgffy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve clamped maximum load factors #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/tsl/ordered_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,6 @@ class ordered_hash : private Hash, private KeyEqual {
m_max_load_factor = clamp(ml, float(MAX_LOAD_FACTOR__MINIMUM),
float(MAX_LOAD_FACTOR__MAXIMUM));

m_max_load_factor = ml;
m_load_threshold = size_type(float(bucket_count()) * m_max_load_factor);
}

Expand Down
34 changes: 34 additions & 0 deletions tests/ordered_map_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,6 +1352,40 @@ BOOST_AUTO_TEST_CASE(test_swap_empty) {
{1, 10}, {8, 80}, {3, 30}, {4, 40}}));
}

/**
* max_load_factor
*/
BOOST_AUTO_TEST_CASE_TEMPLATE(test_max_load_factor_clamp, HMap, test_types) {
const std::pair<float, float> factors[] = {
{0.05f, 0.1f}, {0.1f, 0.1f}, {0.5f, 0.5f},
{0.95f, 0.95f}, {0.99f, 0.95f}};

for (std::size_t count : {std::size_t(0), std::size_t(3)}) {
for (const auto& factor : factors) {
auto map = utils::get_filled_hash_map<HMap>(count);
const auto buckets = map.bucket_count();
map.max_load_factor(factor.first);
BOOST_REQUIRE_EQUAL(map.max_load_factor(), factor.second);
BOOST_CHECK_EQUAL(map.bucket_count(), buckets);

serializer serial;
map.serialize(serial);
deserializer header(serial.str());
header.template operator()<std::uint64_t>(); // protocol version
BOOST_CHECK_EQUAL(header.template operator()<std::uint64_t>(), count);
BOOST_CHECK_EQUAL(header.template operator()<std::uint64_t>(), buckets);
BOOST_CHECK_EQUAL(header.template operator()<float>(), factor.second);

for (bool hash_compatible : {false, true}) {
deserializer dserial(serial.str());
auto restored = HMap::deserialize(dserial, hash_compatible);
BOOST_CHECK_EQUAL(restored.max_load_factor(), factor.second);
BOOST_CHECK(utils::test_is_equal(restored, map));
}
}
}
}

/**
* serialize and deserialize
*/
Expand Down
40 changes: 40 additions & 0 deletions tests/ordered_set_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,46 @@ using test_types = boost::mpl::list<
tsl::ordered_set<std::string, mod_hash<9>>,
tsl::ordered_set<move_only_test, mod_hash<9>>>;

/**
* max_load_factor
*/
BOOST_AUTO_TEST_CASE_TEMPLATE(test_max_load_factor_clamp, HSet, test_types) {
const std::pair<float, float> factors[] = {
{0.05f, 0.1f}, {0.1f, 0.1f}, {0.5f, 0.5f},
{0.95f, 0.95f}, {0.99f, 0.95f}};

for (std::size_t count : {std::size_t(0), std::size_t(3)}) {
for (const auto& factor : factors) {
HSet set;
for (std::size_t i = 0; i < count; ++i) {
set.insert(utils::get_key<typename HSet::key_type>(i));
}
const auto buckets = set.bucket_count();
set.max_load_factor(factor.first);
BOOST_REQUIRE_EQUAL(set.max_load_factor(), factor.second);
BOOST_CHECK_EQUAL(set.bucket_count(), buckets);

serializer serial;
set.serialize(serial);
deserializer header(serial.str());
header.template operator()<std::uint64_t>(); // protocol version
BOOST_CHECK_EQUAL(header.template operator()<std::uint64_t>(), count);
BOOST_CHECK_EQUAL(header.template operator()<std::uint64_t>(), buckets);
BOOST_CHECK_EQUAL(header.template operator()<float>(), factor.second);

for (bool hash_compatible : {false, true}) {
deserializer dserial(serial.str());
auto restored = HSet::deserialize(dserial, hash_compatible);
BOOST_CHECK_EQUAL(restored.max_load_factor(), factor.second);
BOOST_CHECK(restored == set);
for (const auto& key : set) {
BOOST_CHECK(restored.find(key) != restored.end());
}
}
}
}
}

/**
* insert
*/
Expand Down