2006-05-21 17:14:11 +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-21 17:14:11 +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-21 17:14:11 +00:00
|
|
|
#include <boost/limits.hpp>
|
|
|
|
#include "../helpers/random_values.hpp"
|
|
|
|
|
2007-08-14 09:55:30 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(push)
|
|
|
|
#pragma warning(disable:4127) // conditional expression is constant
|
|
|
|
#endif
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
namespace load_factor_tests
|
|
|
|
{
|
|
|
|
|
2007-12-06 11:42:28 +00:00
|
|
|
test::seed_t seed(783656);
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
template <class X>
|
2008-05-23 13:25:05 +00:00
|
|
|
void set_load_factor_tests(X* = 0)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
|
|
|
X x;
|
|
|
|
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.max_load_factor() == 1.0);
|
|
|
|
BOOST_TEST(x.load_factor() == 0);
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
// A valid implementation could fail these tests, but I think they're
|
|
|
|
// reasonable.
|
2009-05-27 17:44:09 +00:00
|
|
|
x.max_load_factor(2.0); BOOST_TEST(x.max_load_factor() == 2.0);
|
|
|
|
x.max_load_factor(0.5); BOOST_TEST(x.max_load_factor() == 0.5);
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class X>
|
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 insert_test(X*, float mlf, test::random_generator generator = test::default_generator)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
|
|
|
X x;
|
|
|
|
x.max_load_factor(mlf);
|
|
|
|
float b = x.max_load_factor();
|
|
|
|
|
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<X> values(1000, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
|
2008-01-10 22:30:46 +00:00
|
|
|
for(BOOST_DEDUCED_TYPENAME test::random_values<X>::const_iterator
|
2006-05-21 17:14:11 +00:00
|
|
|
it = values.begin(), end = values.end(); it != end; ++it)
|
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
BOOST_DEDUCED_TYPENAME X::size_type old_size = x.size(),
|
2006-05-21 17:14:11 +00:00
|
|
|
old_bucket_count = x.bucket_count();
|
|
|
|
x.insert(*it);
|
|
|
|
if(old_size + 1 < b * old_bucket_count)
|
2009-05-27 17:44:09 +00:00
|
|
|
BOOST_TEST(x.bucket_count() == old_bucket_count);
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class X>
|
|
|
|
void load_factor_insert_tests(X* ptr = 0)
|
|
|
|
{
|
2006-06-12 23:30:46 +00:00
|
|
|
insert_test(ptr, 1.0f);
|
|
|
|
insert_test(ptr, 0.1f);
|
|
|
|
insert_test(ptr, 100.0f);
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
insert_test(ptr, (std::numeric_limits<float>::min)());
|
|
|
|
|
|
|
|
if(std::numeric_limits<float>::has_infinity)
|
|
|
|
insert_test(ptr, std::numeric_limits<float>::infinity());
|
|
|
|
}
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
boost::unordered_set<int>* int_set_ptr;
|
|
|
|
boost::unordered_multiset<int>* int_multiset_ptr;
|
|
|
|
boost::unordered_map<int, int>* int_map_ptr;
|
|
|
|
boost::unordered_multimap<int, int>* int_multimap_ptr;
|
2006-05-21 17:14:11 +00:00
|
|
|
|
2008-05-23 13:25:05 +00:00
|
|
|
UNORDERED_TEST(set_load_factor_tests,
|
2008-03-24 17:03:15 +00:00
|
|
|
((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
|
|
|
|
)
|
|
|
|
|
|
|
|
UNORDERED_TEST(load_factor_insert_tests,
|
|
|
|
((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
|
|
|
|
)
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
}
|
2007-08-14 09:55:30 +00:00
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
RUN_TESTS()
|
|
|
|
|
2007-08-14 09:55:30 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(pop)
|
|
|
|
#pragma warning(disable:4127) // conditional expression is constant
|
|
|
|
#endif
|