feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Merge changes to master

Browse Source
This commit is contained in:
Marshall Clow
2026-03-03 10:52:34 -08:00
parent 32c5a6327c 175f443ee8
commit af3258157d
18 changed files with 157 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-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
Jamfile
-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 ;
README.md
+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
build.jam
+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
;
doc/Jamfile.v2
+5 -5
View File
@@ -18,11 +18,11 @@ 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\""
example/Jamfile.v2
+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
include/boost/algorithm/searching/boyer_moore.hpp
+1
View File
@@ -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>
include/boost/algorithm/string/classification.hpp
+19
View File
@@ -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;
include/boost/algorithm/string/trim_all.hpp
-2
View File
@@ -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())
minmax/example/Jamfile
+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 ;
minmax/example/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]);
minmax/test/Jamfile.v2
+3 -1
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
; ;
{ {
string/doc/Jamfile.v2
+25 -25
View File
@@ -18,32 +18,32 @@ boostbook string_algo : string_algo.xml autodoc
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
string/doc/quickref.xml
+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>
string/example/Jamfile
+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 ;
string/test/Jamfile.v2
+3 -1
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
; ;
test-suite algorithm/string test-suite algorithm/string
string/test/predicate_test.cpp
+5
View File
@@ -139,6 +139,11 @@ void classification_test()
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" );
test/Jamfile.v2
+3 -1
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
; ;