Merge pull request #91 from glenfe/develop

Implement min_element and max_element and sever algorithm dependency
2026-02-07 07:34:35 +01:00 · 2019-04-23 09:13:53 +10:00 · 2019-04-22 18:20:35 -04:00 · 2019-04-02 08:40:20 -04:00 · 2019-04-02 08:39:11 -04:00 · 2019-03-08 17:59:18 +01:00
9 changed files with 135 additions and 29 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,26 @@ matrix:
      compiler: g++
      env: TOOLSET=gcc CXXSTD=03,11

+    - os: linux
+      compiler: g++-4.4
+      env: TOOLSET=gcc-4.4 CXXSTD=98,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.6
+      env: TOOLSET=gcc-4.6 CXXSTD=03,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
+
    - os: linux
      compiler: g++-5
      env: TOOLSET=gcc-5 CXXSTD=03,11
--- a/doc/reference/algorithm/remove_if.qbk
+++ b/doc/reference/algorithm/remove_if.qbk
@@ -13,14 +13,14 @@ template<
    class UnaryPredicate
    >
 typename range_iterator<ForwardRange>::type
-remove(ForwardRange& rng, UnaryPredicate pred);
+remove_if(ForwardRange& rng, UnaryPredicate pred);

 template<
    class ForwardRange,
    class UnaryPredicate
    >
 typename range_iterator<const ForwardRange>::type
-remove(const ForwardRange& rng, UnaryPredicate pred);
+remove_if(const ForwardRange& rng, UnaryPredicate pred);

 template<
    range_return_value re,
@@ -28,7 +28,7 @@ template<
    class UnaryPredicate
    >
 typename range_return<ForwardRange,re>::type
-remove(ForwardRange& rng, UnaryPredicate pred);
+remove_if(ForwardRange& rng, UnaryPredicate pred);

 template<
    range_return_value re,
@@ -36,7 +36,7 @@ template<
    class UnaryPredicate
    >
 typename range_return<const ForwardRange,re>::type
-remove(const ForwardRange& rng, UnaryPredicate pred);
+remove_if(const ForwardRange& rng, UnaryPredicate pred);
 ``

 [heading Description]
--- a/doc/reference/utilities.qbk
+++ b/doc/reference/utilities.qbk
@@ -354,7 +354,7 @@ int main(int, const char*[])
    char tc;
    BOOST_FOREACH(boost::tie(ti, tc), boost::combine(v, l))
    {
-        std::cout << '(' << ti << ',' << tv << ')' << '\n';
+        std::cout << '(' << ti << ',' << tc << ')' << '\n';
    }

    return 0;
--- a/include/boost/range/adaptor/ref_unwrapped.hpp
+++ b/include/boost/range/adaptor/ref_unwrapped.hpp
@@ -15,7 +15,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/reference.hpp>
 #include <boost/range/concepts.hpp>
-
+#include <boost/type_traits/declval.hpp>
 #include <utility>

 #if !defined(BOOST_NO_CXX11_DECLTYPE)
@@ -32,7 +32,7 @@ namespace boost
            typedef BOOST_DEDUCED_TYPENAME
                          range_reference<SinglePassRange>::type argument_type;

-            typedef decltype(std::declval<argument_type>().get() ) result_type;
+            typedef decltype( boost::declval<argument_type>().get() ) result_type;

            result_type operator()( argument_type &&r ) const
            {
--- a/include/boost/range/algorithm/max_element.hpp
+++ b/include/boost/range/algorithm/max_element.hpp
@@ -3,17 +3,18 @@
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
+// Copyright 2019 Glen Joseph Fernandes (glenjofe@gmail.com)
 //
 // For more information, see http://www.boost.org/libs/range/
 //
 #ifndef BOOST_RANGE_ALGORITHM_MAX_ELEMENT_HPP_INCLUDED
 #define BOOST_RANGE_ALGORITHM_MAX_ELEMENT_HPP_INCLUDED

-#include <boost/algorithm/minmax_element.hpp>
 #include <boost/concept_check.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/concepts.hpp>
+#include <boost/range/detail/less.hpp>
 #include <boost/range/detail/range_return.hpp>

 namespace boost
@@ -21,6 +22,27 @@ namespace boost
    namespace range
    {

+namespace detail
+{
+
+template<typename Iterator, class Predicate>
+inline Iterator
+max_element(Iterator first, Iterator last, Predicate comp)
+{
+    if (first == last) {
+        return last;
+    }
+    Iterator result = first;
+    while (++first != last) {
+        if (comp(*result, *first)) {
+            result = first;
+        }
+    }
+    return result;
+}
+
+} // namespace detail
+
 /// \brief template function max_element
 ///
 /// range-based version of the max_element std algorithm
@@ -32,7 +54,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
 max_element(ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
-    return boost::first_max_element(boost::begin(rng), boost::end(rng));
+    return detail::max_element(boost::begin(rng), boost::end(rng), detail::less());
 }

 /// \overload
@@ -41,7 +63,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
 max_element(const ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
-    return boost::first_max_element(boost::begin(rng), boost::end(rng));
+    return detail::max_element(boost::begin(rng), boost::end(rng), detail::less());
 }

 /// \overload
@@ -50,7 +72,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
 max_element(ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
-    return boost::first_max_element(boost::begin(rng), boost::end(rng), pred);
+    return detail::max_element(boost::begin(rng), boost::end(rng), pred);
 }

 /// \overload
@@ -59,7 +81,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
 max_element(const ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
-    return boost::first_max_element(boost::begin(rng), boost::end(rng), pred);
+    return detail::max_element(boost::begin(rng), boost::end(rng), pred);
 }

 // range_return overloads
@@ -71,7 +93,7 @@ max_element(ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
    return range_return<ForwardRange,re>::pack(
-        boost::first_max_element(boost::begin(rng), boost::end(rng)),
+        detail::max_element(boost::begin(rng), boost::end(rng), detail::less()),
        rng);
 }

@@ -82,7 +104,7 @@ max_element(const ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
    return range_return<const ForwardRange,re>::pack(
-        boost::first_max_element(boost::begin(rng), boost::end(rng)),
+        detail::max_element(boost::begin(rng), boost::end(rng), detail::less()),
        rng);
 }

@@ -93,7 +115,7 @@ max_element(ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
    return range_return<ForwardRange,re>::pack(
-        boost::first_max_element(boost::begin(rng), boost::end(rng), pred),
+        detail::max_element(boost::begin(rng), boost::end(rng), pred),
        rng);
 }

@@ -104,7 +126,7 @@ max_element(const ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
    return range_return<const ForwardRange,re>::pack(
-        boost::first_max_element(boost::begin(rng), boost::end(rng), pred),
+        detail::max_element(boost::begin(rng), boost::end(rng), pred),
        rng);
 }

--- a/include/boost/range/algorithm/min_element.hpp
+++ b/include/boost/range/algorithm/min_element.hpp
@@ -3,17 +3,18 @@
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
+// Copyright 2019 Glen Joseph Fernandes (glenjofe@gmail.com)
 //
 // For more information, see http://www.boost.org/libs/range/
 //
 #ifndef BOOST_RANGE_ALGORITHM_MIN_ELEMENT_HPP_INCLUDED
 #define BOOST_RANGE_ALGORITHM_MIN_ELEMENT_HPP_INCLUDED

-#include <boost/algorithm/minmax_element.hpp>
 #include <boost/concept_check.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/concepts.hpp>
+#include <boost/range/detail/less.hpp>
 #include <boost/range/detail/range_return.hpp>

 namespace boost
@@ -21,6 +22,27 @@ namespace boost
    namespace range
    {

+namespace detail
+{
+
+template<typename Iterator, class Predicate>
+inline Iterator
+min_element(Iterator first, Iterator last, Predicate comp)
+{
+    if (first == last) {
+        return last;
+    }
+    Iterator result = first;
+    while (++first != last) {
+        if (comp(*first, *result)) {
+            result = first;
+        }
+    }
+    return result;
+}
+
+} // namespace detail
+
 /// \brief template function min_element
 ///
 /// range-based version of the min_element std algorithm
@@ -32,7 +54,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
 min_element(ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
-    return boost::first_min_element(boost::begin(rng), boost::end(rng));
+    return detail::min_element(boost::begin(rng), boost::end(rng), detail::less());
 }

 /// \overload
@@ -41,7 +63,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
 min_element(const ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
-    return boost::first_min_element(boost::begin(rng), boost::end(rng));
+    return detail::min_element(boost::begin(rng), boost::end(rng), detail::less());
 }

 /// \overload
@@ -50,7 +72,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
 min_element(ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
-    return boost::first_min_element(boost::begin(rng), boost::end(rng), pred);
+    return detail::min_element(boost::begin(rng), boost::end(rng), pred);
 }

 /// \overload
@@ -59,7 +81,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
 min_element(const ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
-    return boost::first_min_element(boost::begin(rng), boost::end(rng), pred);
+    return detail::min_element(boost::begin(rng), boost::end(rng), pred);
 }

 // range_return overloads
@@ -71,7 +93,7 @@ min_element(ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
    return range_return<ForwardRange,re>::pack(
-        boost::first_min_element(boost::begin(rng), boost::end(rng)),
+        detail::min_element(boost::begin(rng), boost::end(rng), detail::less()),
        rng);
 }

@@ -82,7 +104,7 @@ min_element(const ForwardRange& rng)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
    return range_return<const ForwardRange,re>::pack(
-        boost::first_min_element(boost::begin(rng), boost::end(rng)),
+        detail::min_element(boost::begin(rng), boost::end(rng), detail::less()),
        rng);
 }

@@ -93,7 +115,7 @@ min_element(ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
    return range_return<ForwardRange,re>::pack(
-        boost::first_min_element(boost::begin(rng), boost::end(rng), pred),
+        detail::min_element(boost::begin(rng), boost::end(rng), pred),
        rng);
 }

@@ -104,7 +126,7 @@ min_element(const ForwardRange& rng, BinaryPredicate pred)
 {
    BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
    return range_return<const ForwardRange,re>::pack(
-        boost::first_min_element(boost::begin(rng), boost::end(rng), pred),
+        detail::min_element(boost::begin(rng), boost::end(rng), pred),
        rng);
 }

--- a/include/boost/range/begin.hpp
+++ b/include/boost/range/begin.hpp
@@ -22,6 +22,8 @@
 #else

 #include <boost/range/iterator.hpp>
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>

 namespace boost
 {
@@ -94,7 +96,10 @@ namespace range_adl_barrier
 {

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
 {
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
    using namespace range_detail;
@@ -103,7 +108,10 @@ BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T&
 }

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
 {
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
    using namespace range_detail;
--- a/include/boost/range/detail/less.hpp
+++ b/include/boost/range/detail/less.hpp
@@ -0,0 +1,26 @@
+/*
+Copyright 2019 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_RANGE_DETAIL_LESS
+#define BOOST_RANGE_DETAIL_LESS
+
+namespace boost {
+namespace range {
+namespace detail {
+
+struct less {
+    template<class T, class U>
+    bool operator()(const T& lhs, const U& rhs) const {
+        return lhs < rhs;
+    }
+};
+
+} /* detail */
+} /* range */
+} /* boost */
+
+#endif
--- a/include/boost/range/end.hpp
+++ b/include/boost/range/end.hpp
@@ -24,6 +24,8 @@
 #include <boost/range/detail/implementation_help.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/range/const_iterator.hpp>
+#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>

 namespace boost
 {
@@ -88,7 +90,10 @@ namespace range_adl_barrier
 {

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
 {
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
    using namespace range_detail;
@@ -97,7 +102,10 @@ BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r
 }

 template< class T >
-BOOST_CONSTEXPR inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40700)
+BOOST_CONSTEXPR
+#endif
+inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
 {
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
    using namespace range_detail;
Author	SHA1	Message	Date
Glen Fernandes	77a4dd5124	Merge pull request #91 from glenfe/develop Implement min_element and max_element and sever algorithm dependency	2019-04-23 09:13:53 +10:00
Glen Fernandes	4ec46acdf5	Implement min_element and max_element and sever algorithm dependency	2019-04-22 18:20:35 -04:00
Glen Fernandes	cecebeea51	Merge pull request #77 from MBoldyrev/MBoldyrev-doc-fix-var-name fixed variable name in docs	2019-04-02 08:40:20 -04:00
Glen Fernandes	802fda6701	Merge pull request #85 from Eelis/patch-1 Fix function name in remove_if documentation	2019-04-02 08:39:11 -04:00
Eelis	4ad147a220	Fix function name in remove_if documentation	2019-03-08 17:59:18 +01:00
Mikhail Boldyrev	eced0cfac8	fixed variable name in docs	2018-10-14 19:24:57 +03:00
Peter Dimov	9f94c8703b	Merge branch 'develop'	2018-10-01 15:42:04 +03:00
Peter Dimov	023f45be01	Remove constexpr from begin/end on g++ 4.6 as it doesn't like it	2018-09-30 01:34:50 +03:00
Peter Dimov	364f755d99	Use boost::declval, as g++ 4.4 has decltype but no std::declval	2018-09-30 01:11:12 +03:00
Peter Dimov	af9f65e06e	Add g++-4.4, g++-4.6 to Travis	2018-09-29 17:34:43 +03:00
Peter Dimov	4cfd4d8287	Merge branch 'develop'	2018-07-12 16:59:32 +03:00
Neil Groves	314b5d6b3c	Merge branch 'develop'	2018-04-18 11:04:16 +01:00
Peter Dimov	b1d5d23514	Add `quick` test target (for CI)	2017-12-18 21:14:16 +02:00
Daniel James	aaebfa5b20	Include boost/next_prior.hpp where needed A recent change to boost/utility.hpp removed the include of this header, so now it's needed for boost::prior and boost::next. `b74f49f1e5`	2017-12-18 21:14:06 +02:00
Peter Dimov	95a62a3b3a	Split Travis jobs to avoid timeout	2017-12-03 15:16:45 +02:00
Peter Dimov	67929cd7df	Add .travis.yml	2017-12-03 15:16:25 +02:00
Peter Dimov	efdd98332b	Qualify boost::search in test/algorithm to avoid ambiguity with C++17's std::search	2017-09-10 03:03:16 +03:00
Marcel Raad	97951d2a8b	Fix test compilation boost::detail::iterator_traits was used without including the necessary header file. It's deprecated anyway and only maps to std::iterator_traits. Also, utility was missing for std::pair.	2017-09-10 02:21:53 +03:00
Marcel Raad	efa2dc71f9	Fix compilation boost::detail::iterator_traits was used without including the necessary header file. It's deprecated anyway and only maps to std::iterator_traits.	2017-09-09 23:37:16 +03:00