feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Conditionally replace deprecated c++98 features by c++11 ones

Browse Source 
change std::random_shuffle -> std::shuffle + random_engine if indicated by the supported language level or Boost configuration macro.

Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert
2017-04-22 17:13:39 +02:00
parent f14719c3a9
commit 8ae18ae455
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
minmax/test/minmax_element_test.cpp
View File

@ -20,6 +20,19 @@
#define BOOST_TEST_MAIN #define BOOST_TEST_MAIN
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#if (__cplusplus >= 201103L) || defined(BOOST_NO_CXX98_RANDOM_SHUFFLE)
#include <random>
std::default_random_engine gen;
template<typename RandomIt>
void do_shuffle(RandomIt first, RandomIt last)
{ std::shuffle(first, last, gen); }
#else
template<typename RandomIt>
void do_shuffle(RandomIt first, RandomIt last)
{ std::random_shuffle(first, last); }
#endif
class custom { class custom {
int m_x; int m_x;
friend bool operator<(custom const& x, custom const& y); friend bool operator<(custom const& x, custom const& y);
@ -117,7 +130,7 @@ void test_minmax(CIterator first, CIterator last, int n)
CHECK_EQUAL_ITERATORS( min, std::min_element(first, last), first ); CHECK_EQUAL_ITERATORS( min, std::min_element(first, last), first );
CHECK_EQUAL_ITERATORS( max, std::max_element(first, last), first ); CHECK_EQUAL_ITERATORS( max, std::max_element(first, last), first );
// second version, comp function object (keeps a counter!) // second version, comp function object (keeps a counter!)
lc.reset(); lc.reset();
tie( boost::minmax_element(first, last, lc), min, max ); tie( boost::minmax_element(first, last, lc), min, max );
@ -183,7 +196,7 @@ void test_minmax(CIterator first, CIterator last, int n)
template <class Container, class Iterator, class Value> template <class Container, class Iterator, class Value>
void test_container(Iterator first, Iterator last, int n, void test_container(Iterator first, Iterator last, int n,
Container* dummy = 0 Container* /* dummy */ = 0
BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Value) ) BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Value) )
{ {
Container c(first, last); Container c(first, last);
@ -223,7 +236,7 @@ void test(int n BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Value))
test_range(first, last, n); test_range(first, last, n);
// Populate test vector with random values // Populate test vector with random values
std::random_shuffle(first, last); do_shuffle(first, last);
test_range(first, last, n); test_range(first, last, n);
} }

10
test/partition_subrange_test.cpp
View File

@ -8,7 +8,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#if __cplusplus >= 201103L #if (__cplusplus >= 201103L) || defined(BOOST_NO_CXX98_RANDOM_SHUFFLE)
#include <random> #include <random>
std::default_random_engine gen; std::default_random_engine gen;
@ -34,7 +34,7 @@ void check_sequence ( Iter first, Iter last, Iter sf, Iter sl )
// } // }
// if (sl == last) std::cout << "<"; // if (sl == last) std::cout << "<";
// std::cout << '\n'; // std::cout << '\n';
if (sf == sl) return; if (sf == sl) return;
for (Iter i = first; i < sf; ++i) for (Iter i = first; i < sf; ++i)
BOOST_CHECK(*i < *sf); BOOST_CHECK(*i < *sf);
@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE( test_main )
std::vector<int> v; std::vector<int> v;
for ( int i = 0; i < 10; ++i ) for ( int i = 0; i < 10; ++i )
v.push_back(i); v.push_back(i);
const std::vector<int>::iterator b = v.begin(); const std::vector<int>::iterator b = v.begin();
ba::partition_subrange(b, v.end(), b + 3, b + 6); ba::partition_subrange(b, v.end(), b + 3, b + 6);
check_sequence (b, v.end(), b + 3, b + 6); check_sequence (b, v.end(), b + 3, b + 6);
@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE( test_main )
// BOOST_CHECK_EQUAL(v[3], 3); // BOOST_CHECK_EQUAL(v[3], 3);
// BOOST_CHECK_EQUAL(v[4], 4); // BOOST_CHECK_EQUAL(v[4], 4);
// BOOST_CHECK_EQUAL(v[5], 5); // BOOST_CHECK_EQUAL(v[5], 5);
// Mix them up and try again - single element // Mix them up and try again - single element
do_shuffle(v.begin(), v.end()); do_shuffle(v.begin(), v.end());
ba::partition_subrange(b, v.end(), b + 7, b + 8); ba::partition_subrange(b, v.end(), b + 7, b + 8);
@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE( test_main )
std::vector<int> v; std::vector<int> v;
for ( int i = 0; i < 10; ++i ) for ( int i = 0; i < 10; ++i )
v.push_back(i); v.push_back(i);
const std::vector<int>::iterator b = v.begin(); const std::vector<int>::iterator b = v.begin();
ba::partition_subrange(b, v.end(), b + 3, b + 6, std::greater<int>()); ba::partition_subrange(b, v.end(), b + 3, b + 6, std::greater<int>());
check_sequence (b, v.end(), b + 3, b + 6, std::greater<int>()); check_sequence (b, v.end(), b + 3, b + 6, std::greater<int>());

8
test/sort_subrange_test.cpp
View File

@ -8,7 +8,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#if __cplusplus >= 201103L #if (__cplusplus >= 201103L) || defined(BOOST_NO_CXX98_RANDOM_SHUFFLE)
#include <random> #include <random>
std::default_random_engine gen; std::default_random_engine gen;
@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE( test_main )
std::vector<int> v; std::vector<int> v;
for ( int i = 0; i < 10; ++i ) for ( int i = 0; i < 10; ++i )
v.push_back(i); v.push_back(i);
const std::vector<int>::iterator b = v.begin(); const std::vector<int>::iterator b = v.begin();
ba::sort_subrange(b, v.end(), b + 3, b + 6); ba::sort_subrange(b, v.end(), b + 3, b + 6);
check_sequence (b, v.end(), b + 3, b + 6); check_sequence (b, v.end(), b + 3, b + 6);
@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE( test_main )
BOOST_CHECK_EQUAL(v[3], 3); BOOST_CHECK_EQUAL(v[3], 3);
BOOST_CHECK_EQUAL(v[4], 4); BOOST_CHECK_EQUAL(v[4], 4);
BOOST_CHECK_EQUAL(v[5], 5); BOOST_CHECK_EQUAL(v[5], 5);
// Mix them up and try again - single element // Mix them up and try again - single element
do_shuffle(v.begin(), v.end()); do_shuffle(v.begin(), v.end());
ba::sort_subrange(b, v.end(), b + 7, b + 8); ba::sort_subrange(b, v.end(), b + 7, b + 8);
@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE( test_main )
std::vector<int> v; std::vector<int> v;
for ( int i = 0; i < 10; ++i ) for ( int i = 0; i < 10; ++i )
v.push_back(i); v.push_back(i);
const std::vector<int>::iterator b = v.begin(); const std::vector<int>::iterator b = v.begin();
ba::sort_subrange(b, v.end(), b + 3, b + 6, std::greater<int>()); ba::sort_subrange(b, v.end(), b + 3, b + 6, std::greater<int>());
check_sequence (b, v.end(), b + 3, b + 6, std::greater<int>()); check_sequence (b, v.end(), b + 3, b + 6, std::greater<int>());