boostorg/move
1
0
Fork 1
mirror of https://github.com/boostorg/move.git synced 2025-08-02 13:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DanielaE-feature/remove-deprecated' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2017-04-13 12:32:52 +02:00
parent 1dbc7bab5c 4939e1f652
commit 96eeebb892
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/bench_merge.cpp
View File

@@ -19,6 +19,7 @@
#include <boost/timer/timer.hpp> #include <boost/timer/timer.hpp>
#include "order_type.hpp" #include "order_type.hpp"
#include "random_shuffle.hpp"
using boost::timer::cpu_timer; using boost::timer::cpu_timer;
using boost::timer::cpu_times; using boost::timer::cpu_times;
@@ -45,9 +46,9 @@ std::size_t generate_elements(T elements[], std::size_t element_count, std::size
std::size_t key = key_len ? (i % key_len) : i; std::size_t key = key_len ? (i % key_len) : i;
elements[i].key=key; elements[i].key=key;
} }
std::random_shuffle(elements, elements + element_count); ::random_shuffle(elements, elements + element_count);
std::random_shuffle(elements, elements + element_count); ::random_shuffle(elements, elements + element_count);
std::random_shuffle(elements, elements + element_count); ::random_shuffle(elements, elements + element_count);
for(std::size_t i = 0; i < element_count; ++i){ for(std::size_t i = 0; i < element_count; ++i){
elements[i].val = key_reps[elements[i].key]++; elements[i].val = key_reps[elements[i].key]++;
} }

7
test/bench_sort.cpp
View File

@@ -24,6 +24,7 @@ using boost::timer::cpu_times;
using boost::timer::nanosecond_type; using boost::timer::nanosecond_type;
#include "order_type.hpp" #include "order_type.hpp"
#include "random_shuffle.hpp"
//#define BOOST_MOVE_ADAPTIVE_SORT_STATS //#define BOOST_MOVE_ADAPTIVE_SORT_STATS
//#define BOOST_MOVE_ADAPTIVE_SORT_INVARIANTS //#define BOOST_MOVE_ADAPTIVE_SORT_INVARIANTS
@@ -48,9 +49,9 @@ void generate_elements(T elements[], std::size_t element_count, std::size_t key_
std::size_t key = key_len ? (i % key_len) : i; std::size_t key = key_len ? (i % key_len) : i;
elements[i].key=key; elements[i].key=key;
} }
std::random_shuffle(elements, elements + element_count); ::random_shuffle(elements, elements + element_count);
std::random_shuffle(elements, elements + element_count); ::random_shuffle(elements, elements + element_count);
std::random_shuffle(elements, elements + element_count); ::random_shuffle(elements, elements + element_count);
for(std::size_t i = 0; i < element_count; ++i){ for(std::size_t i = 0; i < element_count; ++i){
elements[i].val = key_reps[elements[i].key]++; elements[i].val = key_reps[elements[i].key]++;
} }