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

Fix PR#22433. The algorithm is_partitioned was testing an item in the middle of the sequence twice.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@227824 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2015-02-02 18:16:35 +00:00
parent 4c2684ccf9
commit a0ec4b7c85
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/algorithm
View File

@ -3148,6 +3148,9 @@ is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)
for (; __first != __last; ++__first) for (; __first != __last; ++__first)
if (!__pred(*__first)) if (!__pred(*__first))
break; break;
if ( __first == __last )
return true;
++__first;
for (; __first != __last; ++__first) for (; __first != __last; ++__first)
if (__pred(*__first)) if (__pred(*__first))
return false; return false;

29
test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
View File

@ -17,6 +17,7 @@
#include <cassert> #include <cassert>
#include "test_iterators.h" #include "test_iterators.h"
#include "counting_predicates.hpp"
struct is_odd struct is_odd
{ {
@ -27,32 +28,50 @@ int main()
{ {
{ {
const int ia[] = {1, 2, 3, 4, 5, 6}; const int ia[] = {1, 2, 3, 4, 5, 6};
unary_counting_predicate<is_odd, int> pred((is_odd()));
assert(!std::is_partitioned(input_iterator<const int*>(std::begin(ia)), assert(!std::is_partitioned(input_iterator<const int*>(std::begin(ia)),
input_iterator<const int*>(std::end(ia)), input_iterator<const int*>(std::end(ia)),
is_odd())); std::ref(pred)));
assert(pred.count() <= std::distance(std::begin(ia), std::end(ia)));
} }
{ {
const int ia[] = {1, 3, 5, 2, 4, 6}; const int ia[] = {1, 3, 5, 2, 4, 6};
unary_counting_predicate<is_odd, int> pred((is_odd()));
assert( std::is_partitioned(input_iterator<const int*>(std::begin(ia)), assert( std::is_partitioned(input_iterator<const int*>(std::begin(ia)),
input_iterator<const int*>(std::end(ia)), input_iterator<const int*>(std::end(ia)),
is_odd())); std::ref(pred)));
assert(pred.count() <= std::distance(std::begin(ia), std::end(ia)));
} }
{ {
const int ia[] = {2, 4, 6, 1, 3, 5}; const int ia[] = {2, 4, 6, 1, 3, 5};
unary_counting_predicate<is_odd, int> pred((is_odd()));
assert(!std::is_partitioned(input_iterator<const int*>(std::begin(ia)), assert(!std::is_partitioned(input_iterator<const int*>(std::begin(ia)),
input_iterator<const int*>(std::end(ia)), input_iterator<const int*>(std::end(ia)),
is_odd())); std::ref(pred)));
assert(pred.count() <= std::distance(std::begin(ia), std::end(ia)));
} }
{ {
const int ia[] = {1, 3, 5, 2, 4, 6, 7}; const int ia[] = {1, 3, 5, 2, 4, 6, 7};
unary_counting_predicate<is_odd, int> pred((is_odd()));
assert(!std::is_partitioned(input_iterator<const int*>(std::begin(ia)), assert(!std::is_partitioned(input_iterator<const int*>(std::begin(ia)),
input_iterator<const int*>(std::end(ia)), input_iterator<const int*>(std::end(ia)),
is_odd())); std::ref(pred)));
assert(pred.count() <= std::distance(std::begin(ia), std::end(ia)));
} }
{ {
const int ia[] = {1, 3, 5, 2, 4, 6, 7}; const int ia[] = {1, 3, 5, 2, 4, 6, 7};
unary_counting_predicate<is_odd, int> pred((is_odd()));
assert( std::is_partitioned(input_iterator<const int*>(std::begin(ia)), assert( std::is_partitioned(input_iterator<const int*>(std::begin(ia)),
input_iterator<const int*>(std::begin(ia)), input_iterator<const int*>(std::begin(ia)),
is_odd())); std::ref(pred)));
assert(pred.count() <= std::distance(std::begin(ia), std::begin(ia)));
}
{
const int ia[] = {1, 3, 5, 7, 9, 11, 2};
unary_counting_predicate<is_odd, int> pred((is_odd()));
assert( std::is_partitioned(input_iterator<const int*>(std::begin(ia)),
input_iterator<const int*>(std::end(ia)),
std::ref(pred)));
assert(pred.count() <= std::distance(std::begin(ia), std::end(ia)));
} }
} }