Compare commits

...

32 Commits

Author SHA1 Message Date
Marshall Clow cfc892ccbe Merge pull request #132 from karpovantonme/docs/searching-param-tags
Fix \fn and \param tags in the searching algorithms
2026-08-04 21:29:36 -07:00
Anton Karpov db783f5815 Fix \fn and \param tags in the searching algorithms
The four searchers share copied comment blocks, and three of them kept
names from a function they no longer describe.

boyer_moore and knuth_morris_pratt document a predicate parameter Pred p
that none of the operators or do_search overloads take. boyer_moore also
names the block \fn operator while it sits on do_search, and so does one
of the two blocks in knuth_morris_pratt, where the real third parameter
is k_corpus_length rather than p. boyer_moore_horspool documents
k_corpus_length on a do_search that takes two arguments.

The correct form is already in the same family: boyer_moore.hpp:73 and
boyer_moore_horspool.hpp:68 both name two parameters and no predicate.
2026-08-05 06:16:33 +03:00
Marshall Clow b738d228bf Remove name of unnamed parameter in doxygen comment for 2026-08-03 21:40:27 -07:00
Marshall Clow bbb84882cd Merge pull request #131 from karpovantonme/doc-is-permutation-param-names
[doc] Fix the parameter names documented for is_permutation
2026-08-03 21:34:47 -07:00
Anton Karpov bdaee1f3f6 [doc] Fix the parameter names documented for is_permutation
The three-argument overload documents `\param last2`, but its parameters
are `first1`, `last1`, `first2` — `last2` is a local variable computed
inside the body. The four-argument overload right above it documents
`last1` correctly.

Both `\fn` lines also spell the first two parameters `first` and `last`
while the declarations use `first1` and `last1`.
2026-08-03 16:52:44 +03:00
Marshall Clow 175f443ee8 Merge pull request #130 from Lastique/feature/remove_static_assert
Remove dependencies on Boost.StaticAssert
2026-02-05 17:25:23 -08:00
Andrey Semashev fee8399772 Remove dependencies on Boost.StaticAssert.
Boost.StaticAssert has been merged into Boost.Config, so remove
the dependency.
2026-01-22 20:00:01 +03:00
Marshall Clow 0edbfe8736 Merge pull request #128 from Flamefire/test-link-update
Update Link to regression test matrix in README
2025-08-25 08:42:25 -07:00
Alexander Grund 4de0842c47 Update Link to regression test matrix in README 2025-08-25 17:26:05 +02:00
Marshall Clow e8504e45a4 Merge pull request #124 from georgthegreat/patch-1
Add missing include
2025-06-25 20:43:28 -07:00
Marshall Clow dbd2ea4617 Merge pull request #125 from jeking3/fix_minmax_timer
Fix minmax_timer build, iteration count errors, and math errors
2025-06-25 20:43:14 -07:00
James E. King III c9e890bb85 Fix minmax_timer build 2025-06-23 21:06:23 -04:00
Yuriy Chernyshov 7012619c80 Add missing include 2025-05-05 18:01:59 +02:00
Marshall Clow 6eb48dd863 Merge pull request #112 from glywk/develop
Add is_blank() string functor classification
2025-04-13 13:46:42 -07:00
Marshall Clow 1395fe720c Merge pull request #123 from ahamez/develop
Fix documentation for  trim_all and trim_fill
2025-04-13 13:44:34 -07:00
Alexandre Hamez 35a55238a7 Fix documentation for trim_all and trim_fill 2025-01-13 11:20:30 +01:00
Marshall Clow 7f07838f8b Merge pull request #121 from grafikrobot/modular
Add support for modular build structure.
2024-09-03 11:59:17 -07:00
Rene Rivera bbfcdf1322 Change Boost Test build refs to work with both old and modular test lib targets. 2024-08-08 21:45:19 -05:00
Rene Rivera 5c8e6ce9ba Add timer dependency for minmax examples. 2024-07-30 08:03:47 -05:00
Rene Rivera 0c0e84b112 Adjust self dependencies as inter-lib deps no longer apply globally. 2024-07-27 10:28:38 -05:00
Rene Rivera 81e46297b5 Move inter-lib dependencies to a project variable and into the build targets. 2024-07-23 22:34:22 -05:00
Rene Rivera 8189606c93 Update copyright dates. 2024-07-20 22:52:03 -05:00
Rene Rivera c63c45a932 Bump B2 require to 5.2 2024-06-14 11:33:55 -05:00
Rene Rivera 1213b9fd1f Add requires-b2 check to top-level build file. 2024-05-05 09:00:00 -05:00
Rene Rivera b3b2ff4d0c Remove relative references to boost-root in Jamfiles. 2024-04-13 16:18:29 -05:00
Rene Rivera 14922e71c0 Avoid global references to boost-root. 2024-04-13 11:15:55 -05:00
Rene Rivera fcf95e504b Switch to library requirements instead of source. As source puts extra source in install targets. 2024-03-29 21:12:36 -05:00
Rene Rivera 6b1d2fc5ad Make the library modular usable. 2024-03-11 08:27:02 -05:00
glywk dc14b69189 Add negative is_blank predicate tests 2023-07-27 23:15:48 +02:00
glywk 61fa3e461f Merge branch 'boostorg:develop' into develop 2023-07-27 01:17:32 +02:00
jiayuehua 3401f0398f fix range-base gather algorithm 2023-07-27 01:04:04 +02:00
glywk 1d9706feb7 Add is_blank classifier 2023-01-21 00:42:52 +01:00
22 changed files with 174 additions and 107 deletions
-1
View File
@@ -26,7 +26,6 @@ target_link_libraries(boost_algorithm
Boost::mpl Boost::mpl
Boost::range Boost::range
Boost::regex Boost::regex
Boost::static_assert
Boost::throw_exception Boost::throw_exception
Boost::tuple Boost::tuple
Boost::type_traits Boost::type_traits
-11
View File
@@ -1,11 +0,0 @@
# Boost.Algorithm Library Jamfile
#
# Copyright (c) 2018 James E. King III
#
# Use, modification, and distribution are subject to the
# Boost Software License, Version 1.0. (See accompanying file
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
# please order by name to ease maintenance
build-project example ;
build-project test ;
+2 -2
View File
@@ -13,8 +13,8 @@ Distributed under the [Boost Software License, Version 1.0](http://www.boost.org
Branch | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | Branch | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | :-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
[`master`](https://github.com/boostorg/algorithm/tree/master) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=master)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/master?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/algorithm.html) [`master`](https://github.com/boostorg/algorithm/tree/master) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=master)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/master?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://regression.boost.io/master/developer/algorithm.html)
[`develop`](https://github.com/boostorg/algorithm/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=develop)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/develop?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/algorithm.html) [`develop`](https://github.com/boostorg/algorithm/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=develop)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/develop?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://regression.boost.io/develop/developer/algorithm.html)
### Directories ### Directories
+41
View File
@@ -0,0 +1,41 @@
# Copyright René Ferdinand Rivera Morell 2023-2024
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
require-b2 5.2 ;
constant boost_dependencies :
/boost/array//boost_array
/boost/assert//boost_assert
/boost/bind//boost_bind
/boost/concept_check//boost_concept_check
/boost/config//boost_config
/boost/core//boost_core
/boost/exception//boost_exception
/boost/function//boost_function
/boost/iterator//boost_iterator
/boost/mpl//boost_mpl
/boost/range//boost_range
/boost/regex//boost_regex
/boost/throw_exception//boost_throw_exception
/boost/tuple//boost_tuple
/boost/type_traits//boost_type_traits
/boost/unordered//boost_unordered ;
project /boost/algorithm
: common-requirements
<include>include
;
explicit
[ alias boost_algorithm : : : : <library>$(boost_dependencies) ]
[ alias all : boost_algorithm test
example
minmax/example minmax/test
string/example string/test
]
;
call-if : boost-library algorithm
;
+10 -10
View File
@@ -16,18 +16,18 @@ using quickbook ;
using doxygen ; using doxygen ;
using boostbook ; using boostbook ;
doxygen autodoc doxygen autodoc
: :
[ glob ../../../boost/algorithm/*.hpp [ glob ../include/boost/algorithm/*.hpp
../../../boost/algorithm/searching/*.hpp ../include/boost/algorithm/searching/*.hpp
../../../boost/algorithm/cxx11/*.hpp ../include/boost/algorithm/cxx11/*.hpp
../../../boost/algorithm/cxx14/*.hpp ../include/boost/algorithm/cxx14/*.hpp
../../../boost/algorithm/cxx17/*.hpp ../include/boost/algorithm/cxx17/*.hpp
] ]
: :
<doxygen:param>"PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\"" <doxygen:param>"PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\""
<doxygen:param>WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile. <doxygen:param>WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile.
; ;
xml algorithm : algorithm.qbk ; xml algorithm : algorithm.qbk ;
@@ -36,7 +36,7 @@ boostbook standalone
: :
algorithm algorithm
: :
<dependency>autodoc <dependency>autodoc
<xsl:param>boost.root=../../../.. <xsl:param>boost.root=../../../..
<xsl:param>"boost.doxygen.reftitle=Boost.Algorithms C++ Reference" <xsl:param>"boost.doxygen.reftitle=Boost.Algorithms C++ Reference"
<xsl:param>chapter.autolabel=0 <xsl:param>chapter.autolabel=0
+2 -2
View File
@@ -8,9 +8,9 @@
# See http://www.boost.org for updates, documentation, and revision history. # See http://www.boost.org for updates, documentation, and revision history.
project /boost/algorithm/example project
: requirements : requirements
<include>../../../ <library>/boost/algorithm//boost_algorithm
<optimization>speed <optimization>speed
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
<toolset>msvc:<define>NOMINMAX <toolset>msvc:<define>NOMINMAX
@@ -100,7 +100,7 @@ namespace detail {
} }
/// \endcond /// \endcond
/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2, BinaryPredicate p ) /// \fn is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2, BinaryPredicate p )
/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2 /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
/// ///
/// \param first1 The start of the input sequence /// \param first1 The start of the input sequence
@@ -127,11 +127,11 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
return true; return true;
} }
/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 ) /// \fn is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2 )
/// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2 /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2
/// ///
/// \param first1 The start of the input sequence /// \param first1 The start of the input sequence
/// \param last2 One past the end of the input sequence /// \param last1 One past the end of the input sequence
/// \param first2 The start of the second sequence /// \param first2 The start of the second sequence
/// \note This function is part of the C++2011 standard library. /// \note This function is part of the C++2011 standard library.
template< class ForwardIterator1, class ForwardIterator2 > template< class ForwardIterator1, class ForwardIterator2 >
@@ -10,6 +10,7 @@
#ifndef BOOST_ALGORITHM_BOYER_MOORE_SEARCH_HPP #ifndef BOOST_ALGORITHM_BOYER_MOORE_SEARCH_HPP
#define BOOST_ALGORITHM_BOYER_MOORE_SEARCH_HPP #define BOOST_ALGORITHM_BOYER_MOORE_SEARCH_HPP
#include <algorithm> // for std::reverse_copy
#include <iterator> // for std::iterator_traits #include <iterator> // for std::iterator_traits
#include <boost/config.hpp> #include <boost/config.hpp>
@@ -107,12 +108,11 @@ Requirements:
typename traits::skip_table_t skip_; typename traits::skip_table_t skip_;
std::vector <difference_type> suffix_; std::vector <difference_type> suffix_;
/// \fn operator ( corpusIter corpus_first, corpusIter corpus_last, Pred p ) /// \fn do_search ( corpusIter corpus_first, corpusIter corpus_last )
/// \brief Searches the corpus for the pattern that was passed into the constructor /// \brief Searches the corpus for the pattern that was passed into the constructor
/// ///
/// \param corpus_first The start of the data to search (Random Access Iterator) /// \param corpus_first The start of the data to search (Random Access Iterator)
/// \param corpus_last One past the end of the data to search /// \param corpus_last One past the end of the data to search
/// \param p A predicate used for the search comparisons.
/// ///
template <typename corpusIter> template <typename corpusIter>
std::pair<corpusIter, corpusIter> std::pair<corpusIter, corpusIter>
@@ -107,7 +107,6 @@ http://www-igm.univ-mlv.fr/%7Elecroq/string/node18.html
/// ///
/// \param corpus_first The start of the data to search (Random Access Iterator) /// \param corpus_first The start of the data to search (Random Access Iterator)
/// \param corpus_last One past the end of the data to search /// \param corpus_last One past the end of the data to search
/// \param k_corpus_length The length of the corpus to search
/// ///
template <typename corpusIter> template <typename corpusIter>
std::pair<corpusIter, corpusIter> std::pair<corpusIter, corpusIter>
@@ -62,12 +62,11 @@ namespace boost { namespace algorithm {
~knuth_morris_pratt () {} ~knuth_morris_pratt () {}
/// \fn operator ( corpusIter corpus_first, corpusIter corpus_last, Pred p ) /// \fn operator ( corpusIter corpus_first, corpusIter corpus_last )
/// \brief Searches the corpus for the pattern that was passed into the constructor /// \brief Searches the corpus for the pattern that was passed into the constructor
/// ///
/// \param corpus_first The start of the data to search (Random Access Iterator) /// \param corpus_first The start of the data to search (Random Access Iterator)
/// \param corpus_last One past the end of the data to search /// \param corpus_last One past the end of the data to search
/// \param p A predicate used for the search comparisons.
/// ///
template <typename corpusIter> template <typename corpusIter>
std::pair<corpusIter, corpusIter> std::pair<corpusIter, corpusIter>
@@ -99,16 +98,16 @@ namespace boost { namespace algorithm {
const difference_type k_pattern_length; const difference_type k_pattern_length;
std::vector <difference_type> skip_; std::vector <difference_type> skip_;
/// \fn operator ( corpusIter corpus_first, corpusIter corpus_last, Pred p ) /// \fn do_search ( corpusIter corpus_first, corpusIter corpus_last, difference_type k_corpus_length )
/// \brief Searches the corpus for the pattern that was passed into the constructor /// \brief Searches the corpus for the pattern that was passed into the constructor
/// ///
/// \param corpus_first The start of the data to search (Random Access Iterator) /// \param corpus_first The start of the data to search (Random Access Iterator)
/// \param corpus_last One past the end of the data to search /// \param corpus_last One past the end of the data to search
/// \param p A predicate used for the search comparisons. /// \param k_corpus_length The length of the corpus to search
/// ///
template <typename corpusIter> template <typename corpusIter>
std::pair<corpusIter, corpusIter> std::pair<corpusIter, corpusIter>
do_search ( corpusIter corpus_first, corpusIter corpus_last, do_search ( corpusIter corpus_first, corpusIter corpus_last,
difference_type k_corpus_length ) const { difference_type k_corpus_length ) const {
difference_type match_start = 0; // position in the corpus that we're matching difference_type match_start = 0; // position in the corpus that we're matching
@@ -85,6 +85,22 @@ namespace boost {
return detail::is_classifiedF(std::ctype_base::alpha, Loc); return detail::is_classifiedF(std::ctype_base::alpha, Loc);
} }
#ifndef BOOST_NO_CXX11
//! is_blank predicate
/*!
Construct the \c is_classified predicate for the \c ctype_base::blank category.
\param Loc A locale used for classification
\return An instance of the \c is_classified predicate
\since c++11
*/
inline detail::is_classifiedF
is_blank(const std::locale& Loc=std::locale())
{
return detail::is_classifiedF(std::ctype_base::blank, Loc);
}
#endif
//! is_cntrl predicate //! is_cntrl predicate
/*! /*!
Construct the \c is_classified predicate for the \c ctype_base::cntrl category. Construct the \c is_classified predicate for the \c ctype_base::cntrl category.
@@ -294,6 +310,9 @@ namespace boost {
// pull names to the boost namespace // pull names to the boost namespace
using algorithm::is_classified; using algorithm::is_classified;
using algorithm::is_space; using algorithm::is_space;
#ifndef BOOST_NO_CXX11
using algorithm::is_blank;
#endif
using algorithm::is_alnum; using algorithm::is_alnum;
using algorithm::is_alpha; using algorithm::is_alpha;
using algorithm::is_cntrl; using algorithm::is_cntrl;
+1 -1
View File
@@ -75,7 +75,7 @@ namespace boost {
Constructs an \c empty_formatter. Empty formatter always returns an empty Constructs an \c empty_formatter. Empty formatter always returns an empty
sequence. sequence.
\param Input container used to select a correct value_type for the \param - container used to select a correct value_type for the
resulting empty_container<>. resulting empty_container<>.
\return An instance of the \c empty_formatter object. \return An instance of the \c empty_formatter object.
*/ */
@@ -108,7 +108,6 @@ namespace boost {
\param Input An input sequence \param Input An input sequence
\param Loc A locale used for 'space' classification \param Loc A locale used for 'space' classification
\return A trimmed copy of the input
*/ */
template<typename SequenceT> template<typename SequenceT>
inline void trim_all(SequenceT& Input, const std::locale& Loc =std::locale()) inline void trim_all(SequenceT& Input, const std::locale& Loc =std::locale())
@@ -191,7 +190,6 @@ namespace boost {
\param Input An input sequence \param Input An input sequence
\param Fill A string used to fill the inner spaces \param Fill A string used to fill the inner spaces
\param Loc A locale used for 'space' classification \param Loc A locale used for 'space' classification
\return A trimmed copy of the input
*/ */
template<typename SequenceT, typename RangeT> template<typename SequenceT, typename RangeT>
inline void trim_fill(SequenceT& Input, const RangeT& Fill, const std::locale& Loc =std::locale()) inline void trim_fill(SequenceT& Input, const RangeT& Fill, const std::locale& Loc =std::locale())
+5
View File
@@ -7,6 +7,11 @@
# http://www.boost.org/LICENSE_1_0.txt) # http://www.boost.org/LICENSE_1_0.txt)
# #
project
: requirements
<library>/boost/algorithm//boost_algorithm
<library>/boost/timer//boost_timer ;
exe minmax_ex : minmax_ex.cpp ; exe minmax_ex : minmax_ex.cpp ;
exe minmax_timer : minmax_timer.cpp ; exe minmax_timer : minmax_timer.cpp ;
+18 -19
View File
@@ -15,8 +15,10 @@
// What's the proper BOOST_ flag for <iomanip.h> vs <ios> // What's the proper BOOST_ flag for <iomanip.h> vs <ios>
#include <iomanip> #include <iomanip>
#include <boost/timer.hpp>
#include <boost/algorithm/minmax.hpp> #include <boost/algorithm/minmax.hpp>
#include <boost/algorithm/minmax_element.hpp>
#include <boost/iterator/filter_iterator.hpp>
#include <boost/timer/timer.hpp>
template <class T1, class T2> template <class T1, class T2>
void tie(std::pair<T1, T2> p, T1& min, T2& max) void tie(std::pair<T1, T2> p, T1& min, T2& max)
@@ -56,17 +58,19 @@ inline int opt_boost_minmax_count(int n) {
int repeats = 10; int repeats = 10;
#define TIMER( n, cmd , cmdname ) \ #define TIMER( n, cmd , cmdname ) \
t.restart(); \ t.start(); \
for (int i=0; i<repeats; ++i) { cmd ; } \ for (int i=0; i<n*repeats; ++i) { cmd ; } \
t.stop(); \
std::cout << " " << std::setprecision(4) \ std::cout << " " << std::setprecision(4) \
<< (double)n*repeats/t.elapsed()/1.0E6 \ << 1e3 * (double)(n*repeats) / (double)t.elapsed().wall \
<< "M items/sec " << cmdname << "\n" << "M items/sec " << cmdname << "\n"
#define CTIMER( n, cmd , cmdname, count, opt ) \ #define CTIMER( n, cmd , cmdname, count, opt ) \
t.restart(); lc.reset(); \ t.start(); lc.reset(); \
for (int i=0; i<repeats; ++i) { cmd ; } \ for (int i=0; i<n*repeats; ++i) { cmd ; } \
t.stop(); \
std::cout << " " << std::setprecision(4) \ std::cout << " " << std::setprecision(4) \
<< (double)n*repeats/t.elapsed()/1.0E6 \ << 1e3 * (double)(n*repeats) / (double)t.elapsed().wall \
<< "M items/sec " << cmdname \ << "M items/sec " << cmdname \
<< " ("<< (count)/repeats << " vs " << opt << ")\n" << " ("<< (count)/repeats << " vs " << opt << ")\n"
@@ -74,7 +78,7 @@ template <class CIterator>
void test_minmax_element(CIterator first, CIterator last, int n, char* name) void test_minmax_element(CIterator first, CIterator last, int n, char* name)
{ {
typedef typename std::iterator_traits<CIterator>::value_type vtype; typedef typename std::iterator_traits<CIterator>::value_type vtype;
boost::timer t; boost::timer::cpu_timer t;
std::cout << " ON " << name << " WITH OPERATOR<()\n"; std::cout << " ON " << name << " WITH OPERATOR<()\n";
TIMER( n, std::min_element(first, last), TIMER( n, std::min_element(first, last),
@@ -99,15 +103,11 @@ void test_minmax_element(CIterator first, CIterator last, int n, char* name)
"boost::last_min_last_max_element" << name << " "); "boost::last_min_last_max_element" << name << " ");
#define pred std::bind2nd( std::greater<vtype>(), vtype(10) ) #define pred std::bind2nd( std::greater<vtype>(), vtype(10) )
TIMER( n, boost::min_element_if(first, last, pred), TIMER( n, std::min_element(boost::make_filter_iterator(pred, first, last),
"boost::min_element_if" << name << ""); boost::make_filter_iterator(pred, last, last)),
TIMER( n, boost::max_element_if(first, last, pred),
"boost::max_element_if" << name << "");
TIMER( n, std::min_element(boost::make_filter_iterator(first, last, pred),
boost::make_filter_iterator(last, last, pred)),
"std::min_element_with_filter_iterator" << name << ""); "std::min_element_with_filter_iterator" << name << "");
TIMER( n, std::max_element(boost::make_filter_iterator(first, last, pred), TIMER( n, std::max_element(boost::make_filter_iterator(pred, first, last),
boost::make_filter_iterator(last, last, pred)), boost::make_filter_iterator(pred, last, last)),
"std::max_element_if_with_filter_iterator" << name << ""); "std::max_element_if_with_filter_iterator" << name << "");
#undef pred #undef pred
@@ -199,10 +199,9 @@ void test(int n)
test_range(first, last, n); test_range(first, last, n);
} }
int int main(int argc, char** argv)
main(char argc, char** argv)
{ {
int n = 100; int n = 1000;
if (argc > 1) n = atoi(argv[1]); if (argc > 1) n = atoi(argv[1]);
if (argc > 2) repeats = atoi(argv[2]); if (argc > 2) repeats = atoi(argv[2]);
+5 -3
View File
@@ -9,17 +9,19 @@
import testing ; import testing ;
project : requirements <library>/boost/algorithm//boost_algorithm ;
alias unit_test_framework alias unit_test_framework
: # sources : # sources
/boost//unit_test_framework /boost/test//boost_unit_test_framework
; ;
{ {
test-suite algorithm/minmax test-suite algorithm/minmax
: [ run minmax_element_test.cpp unit_test_framework : [ run minmax_element_test.cpp unit_test_framework
: : : : minmax_element ] : : : : minmax_element ]
[ run minmax_test.cpp unit_test_framework [ run minmax_test.cpp unit_test_framework
: : : : minmax ] : : : : minmax ]
; ;
} }
+28 -28
View File
@@ -10,40 +10,40 @@
import toolset ; import toolset ;
toolset.using doxygen ; toolset.using doxygen ;
boostbook string_algo : string_algo.xml autodoc boostbook string_algo : string_algo.xml autodoc
: :
<xsl:param>boost.root=../../../../.. <xsl:param>boost.root=../../../../..
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
; ;
doxygen autodoc doxygen autodoc
: :
[ glob ../../../../boost/algorithm/string.hpp ] [ glob ../../include/boost/algorithm/string.hpp ]
[ glob ../../../../boost/algorithm/string_regex.hpp ] [ glob ../../include/boost/algorithm/string_regex.hpp ]
[ glob ../../../../boost/algorithm/string/classification.hpp ] [ glob ../../include/boost/algorithm/string/classification.hpp ]
[ glob ../../../../boost/algorithm/string/iterator_range.hpp ] [ glob ../../include/boost/algorithm/string/iterator_range.hpp ]
[ glob ../../../../boost/algorithm/string/sequence_traits.hpp ] [ glob ../../include/boost/algorithm/string/sequence_traits.hpp ]
[ glob ../../../../boost/algorithm/string/std_containers_traits.hpp ] [ glob ../../include/boost/algorithm/string/std_containers_traits.hpp ]
[ glob ../../../../boost/algorithm/string/concept.hpp ] [ glob ../../include/boost/algorithm/string/concept.hpp ]
[ glob ../../../../boost/algorithm/string/compare.hpp ] [ glob ../../include/boost/algorithm/string/compare.hpp ]
[ glob ../../../../boost/algorithm/string/constants.hpp ] [ glob ../../include/boost/algorithm/string/constants.hpp ]
[ glob ../../../../boost/algorithm/string/case_conv.hpp ] [ glob ../../include/boost/algorithm/string/case_conv.hpp ]
[ glob ../../../../boost/algorithm/string/find.hpp ] [ glob ../../include/boost/algorithm/string/find.hpp ]
[ glob ../../../../boost/algorithm/string/finder.hpp ] [ glob ../../include/boost/algorithm/string/finder.hpp ]
[ glob ../../../../boost/algorithm/string/find_iterator.hpp ] [ glob ../../include/boost/algorithm/string/find_iterator.hpp ]
[ glob ../../../../boost/algorithm/string/trim.hpp ] [ glob ../../include/boost/algorithm/string/trim.hpp ]
[ glob ../../../../boost/algorithm/string/predicate.hpp ] [ glob ../../include/boost/algorithm/string/predicate.hpp ]
[ glob ../../../../boost/algorithm/string/split.hpp ] [ glob ../../include/boost/algorithm/string/split.hpp ]
[ glob ../../../../boost/algorithm/string/iter_find.hpp ] [ glob ../../include/boost/algorithm/string/iter_find.hpp ]
[ glob ../../../../boost/algorithm/string/erase.hpp ] [ glob ../../include/boost/algorithm/string/erase.hpp ]
[ glob ../../../../boost/algorithm/string/join.hpp ] [ glob ../../include/boost/algorithm/string/join.hpp ]
[ glob ../../../../boost/algorithm/string/replace.hpp ] [ glob ../../include/boost/algorithm/string/replace.hpp ]
[ glob ../../../../boost/algorithm/string/find_format.hpp ] [ glob ../../include/boost/algorithm/string/find_format.hpp ]
[ glob ../../../../boost/algorithm/string/formatter.hpp ] [ glob ../../include/boost/algorithm/string/formatter.hpp ]
[ glob ../../../../boost/algorithm/string/regex.hpp ] [ glob ../../include/boost/algorithm/string/regex.hpp ]
[ glob ../../../../boost/algorithm/string/regex_find_format.hpp ] [ glob ../../include/boost/algorithm/string/regex_find_format.hpp ]
[ glob ../../../../boost/algorithm/string/trim_all.hpp ] [ glob ../../include/boost/algorithm/string/trim_all.hpp ]
: :
<doxygen:param>HIDE_UNDOC_MEMBERS=YES <doxygen:param>HIDE_UNDOC_MEMBERS=YES
<doxygen:param>EXTRACT_PRIVATE=NO <doxygen:param>EXTRACT_PRIVATE=NO
@@ -53,7 +53,7 @@ doxygen autodoc
<doxygen:param>SEARCH_INCLUDES=YES <doxygen:param>SEARCH_INCLUDES=YES
<doxygen:param>PREDEFINED="BOOST_STRING_TYPENAME=typename \"BOOST_STATIC_CONSTANT(type,var)=static const type var;\"" <doxygen:param>PREDEFINED="BOOST_STRING_TYPENAME=typename \"BOOST_STATIC_CONSTANT(type,var)=static const type var;\""
; ;
+7
View File
@@ -667,6 +667,13 @@
<functionname>is_space()</functionname> <functionname>is_space()</functionname>
</entry> </entry>
</row> </row>
<row>
<entry>is_blank</entry>
<entry>Recognize blanks</entry>
<entry>
<functionname>is_blank()</functionname>
</entry>
</row>
<row> <row>
<entry>is_alnum</entry> <entry>is_alnum</entry>
<entry>Recognize alphanumeric characters</entry> <entry>Recognize alphanumeric characters</entry>
+1
View File
@@ -7,6 +7,7 @@
# #
# See http://www.boost.org for updates, documentation, and revision history. # See http://www.boost.org for updates, documentation, and revision history.
project : requirements <library>/boost/algorithm//boost_algorithm ;
exe conv_example : conv_example.cpp ; exe conv_example : conv_example.cpp ;
exe predicate_example : predicate_example.cpp ; exe predicate_example : predicate_example.cpp ;
+13 -11
View File
@@ -9,31 +9,33 @@
import testing ; import testing ;
project : requirements <library>/boost/algorithm//boost_algorithm ;
alias unit_test_framework alias unit_test_framework
: # sources : # sources
/boost//unit_test_framework /boost/test//boost_unit_test_framework
; ;
test-suite algorithm/string test-suite algorithm/string
: [ run : [ run
trim_test.cpp unit_test_framework trim_test.cpp unit_test_framework
: : : :
: :
: trim : trim
] ]
[ run [ run
conv_test.cpp unit_test_framework conv_test.cpp unit_test_framework
: : : :
: :
: conv : conv
] ]
[ run [ run
predicate_test.cpp unit_test_framework predicate_test.cpp unit_test_framework
: : : :
: :
: predicate : predicate
] ]
[ run [ run
find_test.cpp unit_test_framework find_test.cpp unit_test_framework
: : : :
: :
@@ -51,23 +53,23 @@ test-suite algorithm/string
: :
: join : join
] ]
[ run [ run
replace_test.cpp unit_test_framework replace_test.cpp unit_test_framework
: : : :
: :
: replace : replace
] ]
[ run [ run
regex_test.cpp unit_test_framework regex_test.cpp unit_test_framework
../../../regex/build//boost_regex ../../../regex/build//boost_regex
: : : :
: :
: regex : regex
] ]
[ run [ run
find_format_test.cpp unit_test_framework find_format_test.cpp unit_test_framework
: : : :
: :
: find_format : find_format
] ]
; ;
+6 -1
View File
@@ -138,7 +138,12 @@ void classification_test()
TEST_CLASS( is_any_of( string("abc") ), "aaabbcc", "aaxb" ); TEST_CLASS( is_any_of( string("abc") ), "aaabbcc", "aaxb" );
TEST_CLASS( is_any_of( "abc" ), "aaabbcc", "aaxb" ); TEST_CLASS( is_any_of( "abc" ), "aaabbcc", "aaxb" );
TEST_CLASS( is_from_range( 'a', 'c' ), "aaabbcc", "aaxb" ); TEST_CLASS( is_from_range( 'a', 'c' ), "aaabbcc", "aaxb" );
#ifndef BOOST_NO_CXX11
TEST_CLASS( is_blank(), " \t", "\t \n\r" );
TEST_CLASS( !is_blank(), "abc\n\v\f\r", "a x\t" );
#endif
TEST_CLASS( !is_classified(std::ctype_base::space), "...", "..\n\r\t " ); TEST_CLASS( !is_classified(std::ctype_base::space), "...", "..\n\r\t " );
TEST_CLASS( ( !is_any_of("abc") && is_from_range('a','e') ) || is_space(), "d e", "abcde" ); TEST_CLASS( ( !is_any_of("abc") && is_from_range('a','e') ) || is_space(), "d e", "abcde" );
+4 -2
View File
@@ -9,9 +9,11 @@
import testing ; import testing ;
project : requirements <library>/boost/algorithm//boost_algorithm ;
alias unit_test_framework alias unit_test_framework
: # sources : # sources
/boost//unit_test_framework /boost/test//boost_unit_test_framework
; ;
@@ -85,7 +87,7 @@ alias unit_test_framework
# Is_partitioned_until tests # Is_partitioned_until tests
[ run is_partitioned_until_test.cpp unit_test_framework : : : : is_partitioned_until_test ] [ run is_partitioned_until_test.cpp unit_test_framework : : : : is_partitioned_until_test ]
# Apply_permutation tests # Apply_permutation tests
[ run apply_permutation_test.cpp unit_test_framework : : : : apply_permutation_test ] [ run apply_permutation_test.cpp unit_test_framework : : : : apply_permutation_test ]
# Find tests # Find tests