OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code Packages Releases Activity

0032909: Coding Rules - replace (removed from C++17) std::random_shuffle with std::shuffle for random permutation algorithm

Browse Source 
Since C++17 the accessible version of permutation function left the function:

template< class RandomIt, class URBG >
void shuffle( RandomIt first, RandomIt last, URBG&& g );

See details and example of use: https://en.cppreference.com/w/cpp/algorithm/random_shuffle
This commit is contained in:
ddzama 2022-03-30 12:30:01 +03:00 committed by smoskvin
parent e455c54bf0
commit 7021de2fe7
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/QANCollection/QANCollection_Stl.cxx
View File

@ -38,18 +38,11 @@
#include <set> #include <set>
#include <typeinfo> #include <typeinfo>
#include <vector> #include <vector>
#include <random>
//! Size of test data sets. //! Size of test data sets.
const int THE_TEST_SIZE = 5000; const int THE_TEST_SIZE = 5000;
namespace {
// Auxiliary class to use in std::random_shuffle()
struct RandomGenerator {
RandomGenerator () { srand(1); }
ptrdiff_t operator () (ptrdiff_t upper) const { return rand() % upper; }
};
}
template<class CollectionType, class StlType> template<class CollectionType, class StlType>
struct CollectionFiller struct CollectionFiller
{ {
@ -951,11 +944,13 @@ void TestPerformanceRandomIterator(Draw_Interpretor& di)
aTimer.Reset(); aTimer.Reset();
aTimer.Start(); aTimer.Start();
{ {
RandomGenerator aRandomGen; std::random_device ran_dev;
std::mt19937 gen(ran_dev());
gen.seed(0x03ac38f2);
for (Standard_Integer anIdx = 0; anIdx < 10; ++anIdx) for (Standard_Integer anIdx = 0; anIdx < 10; ++anIdx)
{ {
std::sort (aVector->begin(), aVector->end()); std::sort (aVector->begin(), aVector->end());
std::random_shuffle (aVector->begin(), aVector->end(), aRandomGen); std::shuffle (aVector->begin(), aVector->end(), gen);
} }
} }
aTimer.Stop(); aTimer.Stop();
@ -965,11 +960,13 @@ void TestPerformanceRandomIterator(Draw_Interpretor& di)
aTimer.Reset(); aTimer.Reset();
aTimer.Start(); aTimer.Start();
{ {
RandomGenerator aRandomGen; std::random_device ran_dev;
std::mt19937 gen(ran_dev());
gen.seed(0x03ac38f2);
for (Standard_Integer anIdx = 0; anIdx < 10; ++anIdx) for (Standard_Integer anIdx = 0; anIdx < 10; ++anIdx)
{ {
std::sort (aCollec->begin(), aCollec->end()); std::sort (aCollec->begin(), aCollec->end());
std::random_shuffle (aCollec->begin(), aCollec->end(), aRandomGen); std::shuffle (aCollec->begin(), aCollec->end(), gen);
} }
} }
aTimer.Stop(); aTimer.Stop();
@ -981,7 +978,7 @@ void TestPerformanceRandomIterator(Draw_Interpretor& di)
// check that result is the same // check that result is the same
if ( ! std::equal (aVector->begin(), aVector->end(), aCollec->begin()) ) if ( ! std::equal (aVector->begin(), aVector->end(), aCollec->begin()) )
di << "Error: sequences are not the same at the end!\n"; di << "Error: sequences are not the same at the end (random iterator)!\n";
delete aVector; delete aVector;
delete aCollec; delete aCollec;
@ -1033,7 +1030,7 @@ void TestPerformanceForwardIterator(Draw_Interpretor& di)
// check that result is the same // check that result is the same
if ( ! std::equal (aVector->begin(), aVector->end(), aCollec->begin()) ) if ( ! std::equal (aVector->begin(), aVector->end(), aCollec->begin()) )
di << "Error: sequences are not the same at the end!\n"; di << "Error: sequences are not the same at the end (forward iterator)!\n";
delete aVector; delete aVector;
delete aCollec; delete aCollec;
@ -1085,7 +1082,7 @@ void TestPerformanceBidirIterator(Draw_Interpretor& di)
// check that result is the same // check that result is the same
if ( ! std::equal (aVector->begin(), aVector->end(), aCollec->begin()) ) if ( ! std::equal (aVector->begin(), aVector->end(), aCollec->begin()) )
di << "Error: sequences are not the same at the end!\n"; di << "Error: sequences are not the same at the end (bidir iterator)!\n";
delete aVector; delete aVector;
delete aCollec; delete aCollec;