mirror of
https://github.com/boostorg/unordered.git
synced 2025-05-10 07:34:00 +00:00
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from https://svn.boost.org/svn/boost/branches/unordered/trunk ................ r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines Add C++-0x support to the test allocators. ................ r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines Add a C++-0x node_constructor. ................ r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines C++-0x constructor for node. ................ r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines Merge in my work so far on implementing emplace for compilers with variadic template & rvalue references. Merged revisions 44059-44062 via svnmerge from https://svn.boost.org/svn/boost/branches/unordered/dev ........ r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line First stab at implementing emplace - only for compilers with variadic template & rvalue references. ........ r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line Better variable template arguments, need to add proper support to BoostBook. ........ ................ r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line Merge with trunk, fixes tabs. ................ r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines Some extra compile tests. ................ r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines Fix an error message. ................ r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines Merge latest changes from trunk. Merged revisions 44616-44702 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line Update an include. ........ r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies. ........ ................ r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines Remove 'reserve_extra'. ................ r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines More unnecessary copy tests - showing some weakness in the emplace implementation. ................ r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines More tests. ................ r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines Comment out a test which requires a C++0x std::pair. ................ r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace. ................ [SVN r44738]
238 lines
7.1 KiB
C++
238 lines
7.1 KiB
C++
|
|
// Copyright 2006-2008 Daniel James.
|
|
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
|
|
#include "./containers.hpp"
|
|
#include <string>
|
|
#include "../helpers/random_values.hpp"
|
|
#include "../helpers/invariants.hpp"
|
|
#include "../helpers/strong.hpp"
|
|
#include "../helpers/input_iterator.hpp"
|
|
#include <boost/utility.hpp>
|
|
#include <cmath>
|
|
|
|
test::seed_t seed(747373);
|
|
|
|
template <class T>
|
|
struct insert_test_base : public test::exception_base
|
|
{
|
|
test::random_values<T> values;
|
|
insert_test_base(unsigned int count = 5) : values(count) {}
|
|
|
|
typedef T data_type;
|
|
typedef test::strong<T> strong_type;
|
|
|
|
data_type init() const {
|
|
return T();
|
|
}
|
|
|
|
void check(T const& x, strong_type const& strong) const {
|
|
std::string scope(test::scope);
|
|
|
|
if(scope.find("hash::operator()") == std::string::npos)
|
|
strong.test(x);
|
|
test::check_equivalent_keys(x);
|
|
}
|
|
};
|
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
|
|
|
|
template <class T>
|
|
struct emplace_test1 : public insert_test_base<T>
|
|
{
|
|
typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
|
|
|
|
void run(T& x, strong_type& strong) const {
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
|
|
it = this->values.begin(), end = this->values.end(); it != end; ++it)
|
|
{
|
|
strong.store(x);
|
|
x.emplace(*it);
|
|
}
|
|
}
|
|
};
|
|
|
|
#endif
|
|
|
|
template <class T>
|
|
struct insert_test1 : public insert_test_base<T>
|
|
{
|
|
typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
|
|
|
|
void run(T& x, strong_type& strong) const {
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
|
|
it = this->values.begin(), end = this->values.end(); it != end; ++it)
|
|
{
|
|
strong.store(x);
|
|
x.insert(*it);
|
|
}
|
|
}
|
|
};
|
|
|
|
template <class T>
|
|
struct insert_test2 : public insert_test_base<T>
|
|
{
|
|
typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
|
|
|
|
void run(T& x, strong_type& strong) const {
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
|
|
it = this->values.begin(), end = this->values.end(); it != end; ++it)
|
|
{
|
|
strong.store(x);
|
|
x.insert(x.begin(), *it);
|
|
}
|
|
}
|
|
};
|
|
|
|
template <class T>
|
|
struct insert_test3 : public insert_test_base<T>
|
|
{
|
|
void run(T& x) const {
|
|
x.insert(this->values.begin(), this->values.end());
|
|
}
|
|
|
|
void check(T const& x) const {
|
|
test::check_equivalent_keys(x);
|
|
}
|
|
};
|
|
|
|
template <class T>
|
|
struct insert_test4 : public insert_test_base<T>
|
|
{
|
|
typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
|
|
|
|
void run(T& x, strong_type& strong) const {
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
|
|
it = this->values.begin(), end = this->values.end(); it != end; ++it)
|
|
{
|
|
strong.store(x);
|
|
x.insert(it, boost::next(it));
|
|
}
|
|
}
|
|
};
|
|
|
|
template <class T>
|
|
struct insert_test_rehash1 : public insert_test_base<T>
|
|
{
|
|
typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
|
|
|
|
insert_test_rehash1() : insert_test_base<T>(1000) {}
|
|
|
|
T init() const {
|
|
using namespace std;
|
|
typedef BOOST_DEDUCED_TYPENAME T::size_type size_type;
|
|
|
|
T x;
|
|
x.max_load_factor(0.25);
|
|
size_type bucket_count = x.bucket_count();
|
|
size_type initial_elements = static_cast<size_type>(
|
|
ceil(bucket_count * (double) x.max_load_factor()) - 1);
|
|
BOOST_REQUIRE(initial_elements < this->values.size());
|
|
x.insert(this->values.begin(),
|
|
boost::next(this->values.begin(), initial_elements));
|
|
BOOST_REQUIRE(bucket_count == x.bucket_count());
|
|
return x;
|
|
}
|
|
|
|
void run(T& x, strong_type& strong) const {
|
|
BOOST_DEDUCED_TYPENAME T::size_type bucket_count = x.bucket_count();
|
|
int count = 0;
|
|
BOOST_DEDUCED_TYPENAME T::const_iterator pos = x.cbegin();
|
|
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
|
|
it = boost::next(this->values.begin(), x.size()), end = this->values.end();
|
|
it != end && count < 10; ++it, ++count)
|
|
{
|
|
strong.store(x);
|
|
pos = x.insert(pos, *it);
|
|
}
|
|
|
|
// This isn't actually a failure, but it means the test isn't doing its
|
|
// job.
|
|
BOOST_REQUIRE(x.bucket_count() != bucket_count);
|
|
}
|
|
};
|
|
|
|
template <class T>
|
|
struct insert_test_rehash2 : public insert_test_rehash1<T>
|
|
{
|
|
typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
|
|
|
|
void run(T& x, strong_type& strong) const {
|
|
BOOST_DEDUCED_TYPENAME T::size_type bucket_count = x.bucket_count();
|
|
int count = 0;
|
|
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
|
|
it = boost::next(this->values.begin(), x.size()), end = this->values.end();
|
|
it != end && count < 10; ++it, ++count)
|
|
{
|
|
strong.store(x);
|
|
x.insert(*it);
|
|
}
|
|
|
|
// This isn't actually a failure, but it means the test isn't doing its
|
|
// job.
|
|
BOOST_REQUIRE(x.bucket_count() != bucket_count);
|
|
}
|
|
};
|
|
|
|
template <class T>
|
|
struct insert_test_rehash3 : public insert_test_base<T>
|
|
{
|
|
BOOST_DEDUCED_TYPENAME T::size_type mutable rehash_bucket_count, original_bucket_count;
|
|
|
|
insert_test_rehash3() : insert_test_base<T>(1000) {}
|
|
|
|
T init() const {
|
|
using namespace std;
|
|
typedef BOOST_DEDUCED_TYPENAME T::size_type size_type;
|
|
|
|
T x;
|
|
x.max_load_factor(0.25);
|
|
|
|
original_bucket_count = x.bucket_count();
|
|
rehash_bucket_count = static_cast<size_type>(
|
|
ceil(original_bucket_count * (double) x.max_load_factor())) - 1;
|
|
|
|
size_type initial_elements = rehash_bucket_count - 5;
|
|
|
|
BOOST_REQUIRE(initial_elements < this->values.size());
|
|
x.insert(this->values.begin(),
|
|
boost::next(this->values.begin(), initial_elements));
|
|
BOOST_REQUIRE(original_bucket_count == x.bucket_count());
|
|
return x;
|
|
}
|
|
|
|
void run(T& x) const {
|
|
BOOST_DEDUCED_TYPENAME T::size_type bucket_count = x.bucket_count();
|
|
|
|
x.insert(boost::next(this->values.begin(), x.size()),
|
|
boost::next(this->values.begin(), x.size() + 20));
|
|
|
|
// This isn't actually a failure, but it means the test isn't doing its
|
|
// job.
|
|
BOOST_REQUIRE(x.bucket_count() != bucket_count);
|
|
}
|
|
|
|
void check(T const& x) const {
|
|
if(x.size() < rehash_bucket_count) {
|
|
//BOOST_CHECK(x.bucket_count() == original_bucket_count);
|
|
}
|
|
test::check_equivalent_keys(x);
|
|
}
|
|
};
|
|
|
|
#define BASIC_TESTS \
|
|
(insert_test1)(insert_test2)(insert_test3)(insert_test4) \
|
|
(insert_test_rehash1)(insert_test_rehash2)(insert_test_rehash3)
|
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
|
|
#define ALL_TESTS (emplace_test1)BASIC_TESTS
|
|
#else
|
|
#define ALL_TESTS BASIC_TESTS
|
|
#endif
|
|
|
|
|
|
RUN_EXCEPTION_TESTS(ALL_TESTS, CONTAINER_SEQ)
|