2006-05-17 17:19:16 +00:00
|
|
|
|
2009-03-09 20:56:23 +00:00
|
|
|
// Copyright 2006-2009 Daniel James.
|
2006-07-01 22:31:26 +00:00
|
|
|
// 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)
|
2006-05-17 17:19:16 +00:00
|
|
|
|
|
|
|
#include <boost/unordered_set.hpp>
|
|
|
|
#include <boost/unordered_map.hpp>
|
2008-03-24 17:03:15 +00:00
|
|
|
#include "../helpers/test.hpp"
|
2006-05-17 17:19:16 +00:00
|
|
|
#include "../objects/test.hpp"
|
|
|
|
#include "../helpers/random_values.hpp"
|
|
|
|
#include "../helpers/tracker.hpp"
|
|
|
|
#include "../helpers/equivalent.hpp"
|
2006-08-06 20:42:45 +00:00
|
|
|
#include "../helpers/input_iterator.hpp"
|
2006-10-31 22:19:26 +00:00
|
|
|
#include "../helpers/invariants.hpp"
|
2006-05-17 17:19:16 +00:00
|
|
|
|
|
|
|
#include <iostream>
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
namespace constructor_tests {
|
|
|
|
|
2007-12-06 11:42:28 +00:00
|
|
|
test::seed_t seed(356730);
|
|
|
|
|
2006-05-17 17:19:16 +00:00
|
|
|
template <class T>
|
2008-01-20 18:55:57 +00:00
|
|
|
void constructor_tests1(T*, test::random_generator generator = test::default_generator)
|
2006-05-17 17:19:16 +00:00
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf;
|
|
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq;
|
|
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al;
|
2006-05-17 17:19:16 +00:00
|
|
|
|
|
|
|
std::cerr<<"Construct 1\n";
|
|
|
|
{
|
|
|
|
T x(0, hf, eq);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 2\n";
|
|
|
|
{
|
|
|
|
T x(100, hf);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 100);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 3\n";
|
|
|
|
{
|
|
|
|
T x(2000);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 2000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 4\n";
|
|
|
|
{
|
|
|
|
T x;
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 5\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(1000, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 10000, hf, eq);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() >= 10000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 6\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(10, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 10000, hf);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() >= 10000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 7\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(100, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 100);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() >= 100);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 8\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(1, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end());
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 9\n";
|
|
|
|
{
|
|
|
|
T x(0, hf, eq, al);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 10\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(1000, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
T x(v.begin(), v.end(), 10000, hf, eq, al);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() >= 10000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
Add the new allocator constructors, use composition instead of inheritance for the implementation and some small fixes.
Merged revisions 43922,43962,43966,43971,43981,43995-43996,44042,44046-44048,44057 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r43922 | danieljames | 2008-03-29 14:55:59 +0000 (Sat, 29 Mar 2008) | 1 line
Fix some typos in the reference documentation.
........
r43962 | danieljames | 2008-03-31 18:29:59 +0100 (Mon, 31 Mar 2008) | 1 line
Add a name variable to the release script, so that I can have different release names in different branches.
........
r43966 | danieljames | 2008-03-31 18:43:16 +0100 (Mon, 31 Mar 2008) | 1 line
Fix the image directory for standalone docs.
........
r43971 | danieljames | 2008-03-31 19:17:25 +0100 (Mon, 31 Mar 2008) | 1 line
Fix the unordered stylesheet.
........
r43981 | danieljames | 2008-04-01 13:31:26 +0100 (Tue, 01 Apr 2008) | 2 lines
Cast the pointer in the Visual C++ 6.5 _Charalloc method.
........
r43995 | danieljames | 2008-04-02 12:50:27 +0100 (Wed, 02 Apr 2008) | 1 line
Try using the interprocess containers for testing. Compilation is a bit slower but hopefully I'll run into less cross-platform problems.
........
r43996 | danieljames | 2008-04-02 13:25:49 +0100 (Wed, 02 Apr 2008) | 1 line
Revert my experiment with the interprocess containers. It didn't work out.
........
r44042 | danieljames | 2008-04-04 20:38:09 +0100 (Fri, 04 Apr 2008) | 1 line
Make hash table data a member of hash table, instead of a base.
........
r44046 | danieljames | 2008-04-05 12:38:05 +0100 (Sat, 05 Apr 2008) | 1 line
Remove rvalue_ref from Jamfile.v2 - I didn't mean to check it in.
........
r44047 | danieljames | 2008-04-05 12:39:38 +0100 (Sat, 05 Apr 2008) | 1 line
New constructors with allocators.
........
r44048 | danieljames | 2008-04-05 12:58:11 +0100 (Sat, 05 Apr 2008) | 1 line
Document the new constructors.
........
r44057 | danieljames | 2008-04-05 17:08:23 +0100 (Sat, 05 Apr 2008) | 1 line
Fix some bugs in the exception testing code.
........
[SVN r44417]
2008-04-14 15:10:26 +00:00
|
|
|
|
|
|
|
std::cerr<<"Construct 11\n";
|
|
|
|
{
|
|
|
|
test::random_values<T> v(1000, generator);
|
|
|
|
T x(al);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
Add the new allocator constructors, use composition instead of inheritance for the implementation and some small fixes.
Merged revisions 43922,43962,43966,43971,43981,43995-43996,44042,44046-44048,44057 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r43922 | danieljames | 2008-03-29 14:55:59 +0000 (Sat, 29 Mar 2008) | 1 line
Fix some typos in the reference documentation.
........
r43962 | danieljames | 2008-03-31 18:29:59 +0100 (Mon, 31 Mar 2008) | 1 line
Add a name variable to the release script, so that I can have different release names in different branches.
........
r43966 | danieljames | 2008-03-31 18:43:16 +0100 (Mon, 31 Mar 2008) | 1 line
Fix the image directory for standalone docs.
........
r43971 | danieljames | 2008-03-31 19:17:25 +0100 (Mon, 31 Mar 2008) | 1 line
Fix the unordered stylesheet.
........
r43981 | danieljames | 2008-04-01 13:31:26 +0100 (Tue, 01 Apr 2008) | 2 lines
Cast the pointer in the Visual C++ 6.5 _Charalloc method.
........
r43995 | danieljames | 2008-04-02 12:50:27 +0100 (Wed, 02 Apr 2008) | 1 line
Try using the interprocess containers for testing. Compilation is a bit slower but hopefully I'll run into less cross-platform problems.
........
r43996 | danieljames | 2008-04-02 13:25:49 +0100 (Wed, 02 Apr 2008) | 1 line
Revert my experiment with the interprocess containers. It didn't work out.
........
r44042 | danieljames | 2008-04-04 20:38:09 +0100 (Fri, 04 Apr 2008) | 1 line
Make hash table data a member of hash table, instead of a base.
........
r44046 | danieljames | 2008-04-05 12:38:05 +0100 (Sat, 05 Apr 2008) | 1 line
Remove rvalue_ref from Jamfile.v2 - I didn't mean to check it in.
........
r44047 | danieljames | 2008-04-05 12:39:38 +0100 (Sat, 05 Apr 2008) | 1 line
New constructors with allocators.
........
r44048 | danieljames | 2008-04-05 12:58:11 +0100 (Sat, 05 Apr 2008) | 1 line
Document the new constructors.
........
r44057 | danieljames | 2008-04-05 17:08:23 +0100 (Sat, 05 Apr 2008) | 1 line
Fix some bugs in the exception testing code.
........
[SVN r44417]
2008-04-14 15:10:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
}
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class T>
|
2008-01-20 18:55:57 +00:00
|
|
|
void constructor_tests2(T*, test::random_generator const& generator = test::default_generator)
|
2006-05-17 17:19:16 +00:00
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf;
|
|
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf1(1);
|
|
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf2(2);
|
|
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq;
|
|
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq1(1);
|
|
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq2(2);
|
|
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al;
|
|
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al1(1);
|
|
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al2(2);
|
2006-05-17 17:19:16 +00:00
|
|
|
|
|
|
|
std::cerr<<"Construct 1\n";
|
|
|
|
{
|
|
|
|
T x(10000, hf1, eq1);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() >= 10000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq1));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 2\n";
|
|
|
|
{
|
|
|
|
T x(100, hf1);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 100);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 3\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(100, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 0, hf1, eq1);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq1));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 4\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(5, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 1000, hf1);
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() >= 1000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::cerr<<"Construct 5\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(100, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
T x(v.begin(), v.end(), 0, hf, eq, al1);
|
|
|
|
T y(x.begin(), x.end(), 0, hf1, eq1, al2);
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
|
|
|
test::check_container(y, x);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
test::check_equivalent_keys(y);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 6\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(100, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 0, hf1, eq1);
|
|
|
|
T y(x.begin(), x.end(), 0, hf, eq);
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
|
|
|
test::check_container(y, x);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
test::check_equivalent_keys(y);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Construct 7\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(100, generator);
|
2006-05-17 17:19:16 +00:00
|
|
|
T x(v.begin(), v.end(), 0, hf1, eq1);
|
|
|
|
T y(x.begin(), x.end(), 0, hf2, eq2);
|
2006-06-12 23:30:46 +00:00
|
|
|
test::check_container(x, v);
|
|
|
|
test::check_container(y, x);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
test::check_equivalent_keys(y);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
2006-08-06 20:42:45 +00:00
|
|
|
|
|
|
|
std::cerr<<"Construct 8 - from input iterator\n";
|
|
|
|
{
|
2008-01-20 18:55:57 +00:00
|
|
|
test::random_values<T> v(100, generator);
|
2006-08-06 20:42:45 +00:00
|
|
|
T x(test::input_iterator(v.begin()), test::input_iterator(v.end()), 0, hf1, eq1);
|
|
|
|
T y(test::input_iterator(x.begin()), test::input_iterator(x.end()), 0, hf2, eq2);
|
|
|
|
test::check_container(x, v);
|
|
|
|
test::check_container(y, x);
|
2006-10-31 22:19:26 +00:00
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
test::check_equivalent_keys(y);
|
2006-08-06 20:42:45 +00:00
|
|
|
}
|
2009-09-21 21:17:40 +00:00
|
|
|
|
|
|
|
std::cerr<<"Construct 9\n";
|
|
|
|
{
|
|
|
|
test::random_values<T> v(100, generator);
|
|
|
|
T x(50);
|
|
|
|
BOOST_TEST(x.bucket_count() >= 50);
|
|
|
|
x.max_load_factor(10);
|
|
|
|
BOOST_TEST(x.bucket_count() >= 50);
|
|
|
|
x.insert(v.begin(), v.end());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 50);
|
|
|
|
test::check_container(x, v);
|
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
}
|
2009-10-19 19:32:09 +00:00
|
|
|
|
|
|
|
#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
|
|
|
|
std::initializer_list<BOOST_DEDUCED_TYPENAME T::value_type> list;
|
|
|
|
|
|
|
|
std::cerr<<"Initializer list construct 1\n";
|
|
|
|
{
|
|
|
|
T x(list);
|
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Initializer list construct 2\n";
|
|
|
|
{
|
|
|
|
T x(list, 1000);
|
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 1000);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Initializer list construct 3\n";
|
|
|
|
{
|
|
|
|
T x(list, 10, hf1);
|
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 10);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Initializer list construct 4\n";
|
|
|
|
{
|
|
|
|
T x(list, 10, hf1, eq1);
|
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 10);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq1));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al));
|
|
|
|
}
|
|
|
|
|
|
|
|
std::cerr<<"Initializer list construct 5\n";
|
|
|
|
{
|
|
|
|
T x(list, 10, hf1, eq1, al1);
|
|
|
|
BOOST_TEST(x.empty());
|
|
|
|
BOOST_TEST(x.bucket_count() >= 10);
|
|
|
|
BOOST_TEST(test::equivalent(x.hash_function(), hf1));
|
|
|
|
BOOST_TEST(test::equivalent(x.key_eq(), eq1));
|
|
|
|
BOOST_TEST(test::equivalent(x.get_allocator(), al1));
|
|
|
|
}
|
|
|
|
#endif
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
template <class T>
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
void map_constructor_test(T* = 0, test::random_generator const& generator = test::default_generator)
|
2006-10-31 22:19:26 +00:00
|
|
|
{
|
|
|
|
std::cerr<<"map_constructor_test\n";
|
|
|
|
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
typedef test::list<std::pair<BOOST_DEDUCED_TYPENAME T::key_type, BOOST_DEDUCED_TYPENAME T::mapped_type> > list;
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<T> v(1000, generator);
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
list l(v.begin(), v.end());
|
2006-10-31 22:19:26 +00:00
|
|
|
T x(l.begin(), l.end());
|
|
|
|
|
|
|
|
test::check_container(x, v);
|
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
}
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
|
|
|
|
boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
|
|
|
|
boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
|
|
|
|
boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
|
|
|
|
|
|
|
|
using test::default_generator;
|
|
|
|
using test::generate_collisions;
|
|
|
|
|
|
|
|
UNORDERED_TEST(constructor_tests1,
|
|
|
|
((test_set)(test_multiset)(test_map)(test_multimap))
|
|
|
|
((default_generator)(generate_collisions))
|
|
|
|
)
|
|
|
|
|
|
|
|
UNORDERED_TEST(constructor_tests2,
|
|
|
|
((test_set)(test_multiset)(test_map)(test_multimap))
|
|
|
|
((default_generator)(generate_collisions))
|
|
|
|
)
|
|
|
|
|
|
|
|
UNORDERED_TEST(map_constructor_test,
|
|
|
|
((test_map)(test_multimap))
|
|
|
|
)
|
|
|
|
|
2009-05-28 22:06:42 +00:00
|
|
|
#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
|
2008-12-04 21:30:19 +00:00
|
|
|
|
2009-06-01 06:50:37 +00:00
|
|
|
UNORDERED_AUTO_TEST(test_default_initializer_list) {
|
|
|
|
std::cerr<<"Initializer List Tests\n";
|
|
|
|
std::initializer_list<int> init;
|
|
|
|
boost::unordered_set<int> x1 = init;
|
|
|
|
BOOST_TEST(x1.empty());
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2009-10-14 20:30:48 +00:00
|
|
|
#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST) && \
|
|
|
|
!defined(BOOST_NO_INITIALIZER_LISTS)
|
2009-06-01 06:50:37 +00:00
|
|
|
|
2008-12-04 21:30:19 +00:00
|
|
|
UNORDERED_AUTO_TEST(test_initializer_list) {
|
|
|
|
std::cerr<<"Initializer List Tests\n";
|
|
|
|
boost::unordered_set<int> x1 = { 2, 10, 45, -5 };
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x1.find(10) != x1.end());
|
|
|
|
BOOST_TEST(x1.find(46) == x1.end());
|
2008-12-04 21:30:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
2008-03-24 17:03:15 +00:00
|
|
|
|
|
|
|
RUN_TESTS()
|