generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix PR#22427. The implementation of inplace_merge had a \'small data set\' optimization; if either half of the merge was small (i.e, less than 9 items), it did an inplace merge rather than allocating a buffer and doing a faster/smarter merge. However, this failed to satisfy the complexity requirements in the standard. Remove that code. Add tests to check the complexity, and add the same tests for std::merge, since we are in that section of the test suite anyway.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@227811 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2015-02-02 17:35:53 +00:00
parent e809f4ce45
commit 4c2684ccf9
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
View File

@@ -31,6 +31,7 @@ struct indirect_less
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
#include "test_iterators.h"
#include "counting_predicates.hpp"
template <class Iter>
void
@@ -43,12 +44,14 @@ test_one(unsigned N, unsigned M)
std::random_shuffle(ia, ia+N);
std::sort(ia, ia+M, std::greater<int>());
std::sort(ia+M, ia+N, std::greater<int>());
std::inplace_merge(Iter(ia), Iter(ia+M), Iter(ia+N), std::greater<int>());
binary_counting_predicate<std::greater<int>, int, int> pred((std::greater<int>()));
std::inplace_merge(Iter(ia), Iter(ia+M), Iter(ia+N), std::ref(pred));
if(N > 0)
{
assert(ia[0] == N-1);
assert(ia[N-1] == 0);
assert(std::is_sorted(ia, ia+N, std::greater<int>()));
assert(pred.count() <= (N-1));
}
delete [] ia;
}
@@ -79,6 +82,7 @@ test()
test_one<Iter>(3, 2);
test_one<Iter>(3, 3);
test<Iter>(4);
test<Iter>(20);
test<Iter>(100);
test<Iter>(1000);
}

9
test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
View File

@@ -25,6 +25,7 @@
#include <cassert>
#include "test_iterators.h"
#include "counting_predicates.hpp"
template <class InIter1, class InIter2, class OutIter>
void
@@ -41,12 +42,14 @@ test()
ib[i] = 2*i+1;
std::reverse(ia, ia+N);
std::reverse(ib, ib+N);
binary_counting_predicate<std::greater<int>, int, int> pred((std::greater<int>()));
OutIter r = std::merge(InIter1(ia), InIter1(ia+N),
InIter2(ib), InIter2(ib+N), OutIter(ic), std::greater<int>());
InIter2(ib), InIter2(ib+N), OutIter(ic), pred);
assert(base(r) == ic+2*N);
assert(ic[0] == 2*N-1);
assert(ic[2*N-1] == 0);
assert(std::is_sorted(ic, ic+2*N, std::greater<int>()));
assert(pred.count() <= (N + N - 1));
delete [] ic;
delete [] ib;
delete [] ia;
@@ -63,12 +66,14 @@ test()
std::copy(ic+N, ic+2*N, ib);
std::sort(ia, ia+N, std::greater<int>());
std::sort(ib, ib+N, std::greater<int>());
binary_counting_predicate<std::greater<int>, int, int> pred((std::greater<int>()));
OutIter r = std::merge(InIter1(ia), InIter1(ia+N),
InIter2(ib), InIter2(ib+N), OutIter(ic), std::greater<int>());
InIter2(ib), InIter2(ib+N), OutIter(ic), pred);
assert(base(r) == ic+2*N);
assert(ic[0] == 2*N-1);
assert(ic[2*N-1] == 0);
assert(std::is_sorted(ic, ic+2*N, std::greater<int>()));
assert(pred.count() <= (N + N - 1));
delete [] ic;
delete [] ib;
delete [] ia;