boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 11:27:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some unordered TODOs.

Browse Source 
[SVN r56570]
This commit is contained in:
Daniel James
2009-10-04 10:37:36 +00:00
parent ae0c97a77a
commit fe3d612fe0
4 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/unordered/detail/buckets.hpp
View File

@ -15,7 +15,6 @@ namespace boost { namespace unordered_detail {
////////////////////////////////////////////////////////////////////////////
// Buckets
// TODO: Are these needed?
template <class A, class G>
inline BOOST_DEDUCED_TYPENAME hash_buckets<A, G>::bucket_ptr
@ -32,7 +31,7 @@ namespace boost { namespace unordered_detail {
}
template <class A, class G>
inline std::size_t hash_buckets<A, G>::bucket_size(std::size_t index) const
std::size_t hash_buckets<A, G>::bucket_size(std::size_t index) const
{
if(!buckets_) return 0;
bucket_ptr ptr = get_bucket(index)->next_;

1
include/boost/unordered/detail/equivalent.hpp
View File

@ -257,7 +257,6 @@ namespace boost { namespace unordered_detail {
// if hash function throws, or inserting > 1 element, basic exception safety
// strong otherwise
// TODO: Should I special case an empty container?
template <class H, class P, class A, class K>
template <class I>
void hash_equivalent_table<H, P, A, K>::insert_range(I i, I j)

17
include/boost/unordered/detail/table.hpp
View File

@ -431,23 +431,20 @@ namespace boost { namespace unordered_detail {
// if hash function throws, basic exception safety
// strong otherwise.
// TODO: Should this always create buckets?
template <class H, class P, class A, class G, class K>
inline void hash_table<H, P, A, G, K>::rehash(std::size_t min_buckets)
{
using namespace std;
if(!this->buckets_) {
if(!this->size_) {
if(this->buckets_) this->delete_buckets();
this->bucket_count_ = next_prime(min_buckets);
this->create_buckets();
this->init_buckets();
}
else {
// no throw:
// TODO: Needlessly calling next_prime twice.
min_buckets = (std::max)(
next_prime(min_buckets),
this->min_buckets_for_size(this->size_));
min_buckets = next_prime((std::max)(min_buckets,
double_to_size_t(floor(this->size_ / (double) mlf_)) + 1));
if(min_buckets != this->bucket_count_) rehash_impl(min_buckets);
}
}
@ -619,7 +616,6 @@ namespace boost { namespace unordered_detail {
template <class H, class P, class A, class G, class K>
void hash_table<H, P, A, G, K>::clear()
{
// TODO: Is this check needed when called internally?
if(!this->size_) return;
bucket_ptr end = this->get_bucket(this->bucket_count_);
@ -645,8 +641,7 @@ namespace boost { namespace unordered_detail {
}
template <class H, class P, class A, class G, class K>
std::size_t hash_table<H, P, A, G, K>
::erase_key(key_type const& k)
std::size_t hash_table<H, P, A, G, K>::erase_key(key_type const& k)
{
if(!this->size_) return 0;

43
test/unordered/rehash_tests.cpp
View File

@ -32,6 +32,43 @@ void rehash_empty_test1(X* = 0)
BOOST_TEST(postcondition(x, 0));
}
template <class X>
void rehash_empty_test2(X* = 0, test::random_generator generator = test::default_generator)
{
test::random_values<X> v(1000, generator);
test::ordered<X> tracker;
X x;
x.rehash(10000);
BOOST_TEST(postcondition(x, 10000));
tracker.insert_range(v.begin(), v.end());
x.insert(v.begin(), v.end());
tracker.compare(x);
BOOST_TEST(postcondition(x, 10000));
}
template <class X>
void rehash_empty_test3(X* = 0, test::random_generator generator = test::default_generator)
{
test::random_values<X> v(1000, generator);
test::ordered<X> tracker;
X x;
x.rehash(0);
BOOST_TEST(postcondition(x, 0));
tracker.insert_range(v.begin(), v.end());
x.insert(v.begin(), v.end());
tracker.compare(x);
BOOST_TEST(postcondition(x, 0));
}
template <class X>
void rehash_test1(X* = 0, test::random_generator generator = test::default_generator)
{
@ -63,6 +100,12 @@ boost::unordered_multimap<int, int>* int_multimap_ptr;
UNORDERED_TEST(rehash_empty_test1,
((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
)
UNORDERED_TEST(rehash_empty_test2,
((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
)
UNORDERED_TEST(rehash_empty_test3,
((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
)
UNORDERED_TEST(rehash_test1,
((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
)