feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Merge pull request #68 from cmazakas/multiset-heterogeneous-equal-range

Browse Source 
Multiset Heterogeneous `equal_range()`
This commit is contained in:
Peter Dimov
2022-01-01 07:23:31 +02:00
committed by GitHub
parent 81e7e4dd81 f813bbdf86
commit 7440e7f789
2 changed files with 153 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/unordered/unordered_set.hpp
View File

@ -1063,6 +1063,19 @@ namespace boost {
std::pair<const_iterator, const_iterator> equal_range(
const key_type&) const;
template <class Key>
typename boost::enable_if_c<detail::are_transparent<Key, H, P>::value,
std::pair<const_iterator, const_iterator> >::type
equal_range(const Key& k) const
{
node_pointer n = table_.find_node_impl(
table::policy::apply_hash(this->hash_function(), k), k,
this->key_eq());
return std::make_pair(
const_iterator(n), const_iterator(n ? table_.next_group(n) : n));
}
// bucket interface
size_type bucket_count() const BOOST_NOEXCEPT

146
test/unordered/transparent_tests.cpp
View File

@ -448,6 +448,19 @@ template <class UnorderedMap> void test_map_transparent_equal_range()
BOOST_TEST_EQ(val.first.x_, 0);
}
iters = map.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != map.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val.first, 1);
BOOST_TEST_EQ(val.second, 1338);
iters = map.equal_range(1337);
begin = iters.first;
@ -480,6 +493,19 @@ template <class UnorderedMap> void test_map_transparent_equal_range()
BOOST_TEST_EQ(val.first.x_, 0);
}
iters = map.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != map.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val.first, 1);
BOOST_TEST_EQ(val.second, 1338);
iters = map.equal_range(1337);
begin = iters.first;
@ -576,6 +602,19 @@ template <class UnorderedMap> void test_map_non_transparent_equal_range()
BOOST_TEST_EQ(val.first.x_, 0);
}
iters = map.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != map.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val.first, 1);
BOOST_TEST_EQ(val.second, 1338);
iters = map.equal_range(1337);
begin = iters.first;
@ -585,8 +624,8 @@ template <class UnorderedMap> void test_map_non_transparent_equal_range()
BOOST_TEST(begin == map.end());
BOOST_TEST_EQ(std::distance(begin, end), 0);
BOOST_TEST_EQ(key::count_, 2 + key_count);
key_count += 2;
BOOST_TEST_EQ(key::count_, 3 + key_count);
key_count += 3;
}
{
@ -609,6 +648,19 @@ template <class UnorderedMap> void test_map_non_transparent_equal_range()
BOOST_TEST_EQ(val.first.x_, 0);
}
iters = map.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != map.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val.first, 1);
BOOST_TEST_EQ(val.second, 1338);
iters = map.equal_range(1337);
begin = iters.first;
@ -618,7 +670,7 @@ template <class UnorderedMap> void test_map_non_transparent_equal_range()
BOOST_TEST(begin == map.end());
BOOST_TEST_EQ(std::distance(begin, end), 0);
BOOST_TEST_EQ(key::count_, 2 + key_count);
BOOST_TEST_EQ(key::count_, 3 + key_count);
}
}
@ -705,6 +757,17 @@ template <class UnorderedSet> void test_set_transparent_equal_range()
BOOST_TEST_EQ(val, 0);
}
iters = set.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != set.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val, 1);
iters = set.equal_range(1337);
begin = iters.first;
@ -737,6 +800,17 @@ template <class UnorderedSet> void test_set_transparent_equal_range()
BOOST_TEST_EQ(val, 0);
}
iters = set.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != set.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val, 1);
iters = set.equal_range(1337);
begin = iters.first;
@ -833,6 +907,17 @@ template <class UnorderedSet> void test_set_non_transparent_equal_range()
BOOST_TEST_EQ(val, 0);
}
iters = set.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != set.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val, 1);
iters = set.equal_range(1337);
begin = iters.first;
@ -842,8 +927,8 @@ template <class UnorderedSet> void test_set_non_transparent_equal_range()
BOOST_TEST(begin == set.end());
BOOST_TEST_EQ(std::distance(begin, end), 0);
BOOST_TEST_EQ(key::count_, 2 + key_count);
key_count += 2;
BOOST_TEST_EQ(key::count_, 3 + key_count);
key_count += 3;
}
{
@ -866,6 +951,17 @@ template <class UnorderedSet> void test_set_non_transparent_equal_range()
BOOST_TEST_EQ(val, 0);
}
iters = set.equal_range(1);
begin = iters.first;
end = iters.second;
BOOST_TEST(begin != end);
BOOST_TEST(begin != set.end());
BOOST_TEST_EQ(std::distance(begin, end), 1);
value_type const& val = *begin;
BOOST_TEST_EQ(val, 1);
iters = set.equal_range(1337);
begin = iters.first;
@ -875,7 +971,7 @@ template <class UnorderedSet> void test_set_non_transparent_equal_range()
BOOST_TEST(begin == set.end());
BOOST_TEST_EQ(std::distance(begin, end), 0);
BOOST_TEST_EQ(key::count_, 2 + key_count);
BOOST_TEST_EQ(key::count_, 3 + key_count);
}
}
@ -1385,10 +1481,48 @@ void test_unordered_set()
}
}
void test_unordered_multiset()
{
{
typedef boost::unordered_multiset<key, transparent_hasher,
transparent_key_equal>
unordered_set;
test_set_transparent_equal_range<unordered_set>();
}
{
// non-transparent Hash, non-transparent KeyEqual
//
typedef boost::unordered_multiset<key, hasher, key_equal> unordered_set;
test_set_non_transparent_equal_range<unordered_set>();
}
{
// transparent Hash, non-transparent KeyEqual
//
typedef boost::unordered_multiset<key, transparent_hasher, key_equal>
unordered_set;
test_set_non_transparent_equal_range<unordered_set>();
}
{
// non-transparent Hash, transparent KeyEqual
//
typedef boost::unordered_multiset<key, hasher, transparent_key_equal>
unordered_set;
test_set_non_transparent_equal_range<unordered_set>();
}
}
UNORDERED_AUTO_TEST (transparent_ops) {
test_unordered_map();
test_unordered_multimap();
test_unordered_set();
test_unordered_multiset();
}
RUN_TESTS()