|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63816 - in sandbox/SOC/2010/stringalgos: boost/algorithm/string boost/algorithm/string/string_search boost/algorithm/string/string_search/detail libs/algorithm/string/test
From: mstefanro_at_[hidden]
Date: 2010-07-10 12:24:51
Author: mstefanro
Date: 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
New Revision: 63816
URL: http://svn.boost.org/trac/boost/changeset/63816
Log:
[GSoC2010][StringAlgo] Finder, R-K, KMP, new tests, fixes
Added:
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/detail/
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/detail/rabin_karp.hpp (contents, props changed)
Text files modified:
sandbox/SOC/2010/stringalgos/boost/algorithm/string/find.hpp | 1
sandbox/SOC/2010/stringalgos/boost/algorithm/string/finder.hpp | 201 ++++++++++++---
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/boyer_moore.hpp | 58 ++++
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/knuth_morris_pratt.hpp | 110 ++++++++
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/naive_search.hpp | 53 +--
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/rabin_karp.hpp | 92 ++----
sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/suffix_array.hpp | 14 +
sandbox/SOC/2010/stringalgos/libs/algorithm/string/test/finder_test.cpp | 503 +++++++++++++++++++++------------------
8 files changed, 676 insertions(+), 356 deletions(-)
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/find.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/find.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/find.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -109,6 +109,7 @@
const std::locale& Loc=std::locale())
{
return ::boost::algorithm::find(Input, ::boost::algorithm::first_finder(Search,is_iequal(Loc)));
+ //return ::boost::algorithm::find(Input, ::boost::algorithm::finder_t<
}
// find_last -----------------------------------------------//
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/finder.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/finder.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/finder.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -54,6 +54,36 @@
typename boost::remove_cv<typename boost::remove_pointer<T>::type>::type,
U>
> {};
+ template <class Range1T, class Range2T, class ComparatorT, class AllocatorT>
+ struct finder_typedefs
+ {
+ //! The type of the substring
+ typedef Range1T substring_type;
+ //! The type of the string
+ typedef Range2T string_type;
+ //! The type of the comparator
+ typedef ComparatorT comparator_type;
+ //! The type of the allocator
+ typedef AllocatorT allocator_type;
+ //! The type of the substring's iterator
+ typedef typename boost::range_const_iterator<substring_type>::type
+ substring_iterator_type;
+ //! The type of the string's iterator
+ typedef typename boost::range_const_iterator<string_type>::type
+ string_iterator_type;
+ //! The character type of the substring
+ typedef typename boost::iterator_value<substring_iterator_type>::type
+ substring_char_type;
+ //! The character type of the string
+ typedef typename boost::iterator_value<string_iterator_type>::type
+ string_char_type;
+ typedef typename boost::iterator_range<substring_iterator_type>
+ substring_range_type;
+ typedef typename boost::iterator_range<string_iterator_type>
+ string_range_type;
+ typedef typename boost::iterator_difference<string_iterator_type>::type
+ string_difference_type;
+ };
} // namespace detail
} // namespace boost
@@ -82,17 +112,20 @@
in the event that additional computation on the data has to be stored.
*/
template <
- typename Sequence1T, typename Sequence2T,
+ class Sequence1T, class Sequence2T,
class Algorithm,
typename Comparator = ::boost::algorithm::is_equal,
- class Allocator =
- typename Algorithm::algorithm<Sequence1T,Sequence2T,Comparator>::allocator_type,
+ class Allocator = typename Algorithm::default_allocator_type,
template <class,class,class,class> class AdditionalBehavior = boost::algorithm::finder_no_additional_behavior
>
- class finder_t : private Algorithm::algorithm<typename boost::range_const_iterator<Sequence1T>::type,
+ class finder_t : private Algorithm::algorithm</*typename boost::range_const_iterator<Sequence1T>::type,
typename boost::range_const_iterator<Sequence2T>::type,
- /*typename std::iterator_traits<Sequence2T>::iterator_type,*/Comparator,Allocator>,
- private AdditionalBehavior<Sequence1T,Sequence2T,Algorithm,Comparator>
+ Comparator,Allocator*/
+ typename finder_t<Sequence1T, Sequence2T, Algorithm, Comparator, Allocator, AdditionalBehavior>,
+ typename boost::range_const_iterator<Sequence1T>::type,
+ typename boost::range_const_iterator<Sequence2T>::type,
+ Comparator, Allocator>,
+ private AdditionalBehavior<Sequence1T,Sequence2T,Algorithm,Comparator>
{
//! \todo: Maybe write a String concept?
//! \todo: Currently, there's a SGI Sequence Concept implemented by Boost.ConceptCheck,
@@ -118,8 +151,10 @@
//! The character type of the string
typedef typename boost::iterator_value<string_iterator_type>::type string_char_type;
//! The type of the algorithm
- typedef typename Algorithm::algorithm<substring_iterator_type,
- string_iterator_type,comparator_type,allocator_type> algorithm_type;
+ typedef typename Algorithm::algorithm<finder_t,
+ substring_iterator_type,
+ string_iterator_type,
+ Comparator, Allocator> algorithm_type;
typedef typename boost::iterator_range<substring_iterator_type> substring_range_type;
typedef typename boost::iterator_range<string_iterator_type> string_range_type;
typedef typename boost::iterator_difference<string_iterator_type>::type string_difference_type;
@@ -148,8 +183,9 @@
substring_optional_copy_(), substring_range_(substring?*substring:substring_optional_copy_),
string_optional_copy_(), string_range_(string?*string:string_optional_copy_),
start_offset_(boost::begin(string_range_)),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
- { on_substring_change(); on_string_change(); }
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
+ { }
//! \overload
template <class Range2T>
@@ -160,10 +196,11 @@
substring_optional_copy_(), substring_range_(substring?*substring:substring_optional_copy_),
string_optional_copy_(), string_range_(),
start_offset_(),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
{
- set_string(string); // automatically calls on_string_change()
- on_substring_change();
+ set_string(string);
+ //on_substring_change();
}
//! \overload
@@ -175,10 +212,11 @@
substring_optional_copy_(), substring_range_(),
string_optional_copy_(), string_range_(string?boost::as_literal(*string):string_optional_copy_),
start_offset_(boost::begin(string_range_)),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
{
set_substring(substring);
- on_string_change();
+ //on_string_change();
}
//! \overload
@@ -191,7 +229,8 @@
substring_optional_copy_(), substring_range_(),
string_optional_copy_(), string_range_(),
start_offset_(),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
{
set_substring(substring);
set_string(string);
@@ -208,8 +247,9 @@
substring_optional_copy_(std::move(substring)), string_optional_copy_(),
substring_range_(substring_optional_copy_), string_range_(string?*string:string_optional_copy_),
start_offset_(boost::begin(string_range_)),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
- { on_substring_change(); on_string_change(); }
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
+ { /*on_substring_change(); on_string_change();*/ }
//! \overload
template <class Range2T>
@@ -222,8 +262,9 @@
substring_optional_copy_(std::move(substring)), substring_range_(substring_optional_copy_),
string_optional_copy_(), string_range_(),
start_offset_(),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
- { set_string(string); on_substring_change(); }
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
+ { set_string(string); /*on_substring_change();*/ }
//! \overload
finder_t (
@@ -234,8 +275,9 @@
substring_optional_copy_(std::move(substring)), string_optional_copy_(std::move(string)),
substring_range_(substring_optional_copy_), string_range_(string_optional_copy_),
start_offset_(boost::begin(string_range_)),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
- { on_substring_change(); on_string_change(); }
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
+ { /*on_substring_change(); on_string_change();*/ }
//! \overload
finder_t (const Sequence1T *const substring,
@@ -245,8 +287,9 @@
substring_optional_copy_(), string_optional_copy_(std::move(string)),
substring_range_(substring?*substring:substring_optional_copy_), string_range_(string_optional_copy_),
start_offset_(boost::begin(string_range_)),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
- { on_substring_change(); on_string_change(); }
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
+ { /*on_substring_change(); on_string_change();*/ }
//! \overload
template <class Range1T>
@@ -258,8 +301,9 @@
substring_optional_copy_(), substring_range_(),
string_optional_copy_(std::move(string)), string_range_(string_optional_copy_),
start_offset_(boost::begin(string_range_)),
- algorithm_type(comparator_,allocator_,substring_range_,string_range_)
- { set_substring(substring); on_string_change(); }
+ algorithm_type(),
+ substring_has_changed_(true), string_has_changed_(true)
+ { set_substring(substring); /*on_string_change();*/ }
# endif
@@ -279,8 +323,15 @@
typename string_range_type get_string_range() const
{ return string_range_; }
+ typename boost::call_traits<Comparator>::reference get_comparator()
+ { return comparator_; }
+
+ typename boost::call_traits<Comparator>::const_reference get_comparator() const
+ { return comparator_; }
+
//! \todo: any reason why stdlib get_allocator()s return value types?
-
+
+
//! Gets a reference to the current allocator
typename boost::call_traits<Allocator>::reference get_allocator()
{ return allocator_; }
@@ -298,7 +349,8 @@
*/
template <typename RangeT>
void set_substring(RangeT const &substring,
- typename boost::disable_if<typename ::boost::detail::is_pointer_to<RangeT,Sequence1T> >::type* = 0)
+ typename boost::disable_if<
+ typename ::boost::detail::is_pointer_to<RangeT,Sequence1T> >::type* = 0)
{
boost::iterator_range<typename boost::range_const_iterator<RangeT>::type> substring_range =
boost::as_literal(substring);
@@ -307,8 +359,7 @@
substring_optional_copy_.insert(substring_optional_copy_.end(),
boost::begin(substring_range), boost::end(substring_range));
substring_range_ = substring_optional_copy_;
- find_reset();
- on_substring_change();
+ substring_has_changed_ = true;
}
void set_substring (Sequence1T const *const substring = 0)
@@ -318,8 +369,7 @@
substring_range_ = *substring;
else
substring_range_ = substring_optional_copy_;
- find_reset();
- on_substring_change();
+ substring_has_changed_ = true;
}
# ifdef BOOST_HAS_RVALUE_REFS
@@ -328,8 +378,7 @@
{
substring_optional_copy_ = std::move(substring);
substring_range_ = substring_optional_copy_;
- find_reset();
- on_substring_change();
+ substring_has_changed_ = true;
}
# endif
@@ -349,8 +398,7 @@
string_optional_copy_.insert(string_optional_copy_.end(),
boost::begin(string_range), boost::end(string_range));
string_range_ = string_optional_copy_;
- find_reset();
- on_string_change();
+ string_has_changed_ = true;
}
void set_string (Sequence2T const *const string = 0)
@@ -360,8 +408,7 @@
string_range_ = *string;
else
string_range_ = string_optional_copy_;
- find_reset();
- on_string_change();
+ string_has_changed_ = true;
}
# ifdef BOOST_HAS_RVALUE_REFS
@@ -370,8 +417,7 @@
{
string_optional_copy_ = std::move(string);
string_range_ = string_optional_copy_;
- find_reset();
- on_string_change();
+ string_has_changed_ = true;
}
# endif
@@ -383,9 +429,9 @@
*/
void refresh()
{
+ find_reset();
on_substring_change(); //! \todo should only be called if the substring is a pointer
on_string_change(); //! \todo should only be called if the string is a pointer
- find_reset();
}
//! \todo doc et al
@@ -426,6 +472,7 @@
\note This is semantically equivalent to \c find_reset(); match=find_next();
*/
+
//!\todo Must return a range of const iterators, otherwise one could modify
//! the range's contents, range which may actually
//! be data of our private member
@@ -445,6 +492,11 @@
string_range_type find_next()
{
+ apply_changes();
+ if (start_offset_ == boost::end(string_range_))
+ return boost::iterator_range<string_iterator_type>(
+ start_offset_, start_offset_
+ );
string_range_type ret =
algorithm_type::find(start_offset_);
if (boost::begin(ret) == boost::end(string_range_))
@@ -462,6 +514,16 @@
string_difference_type find_next_index()
{
+ apply_changes();
+
+ //empty substring
+ if (boost::begin(substring_range_) == boost::end(substring_range_))
+ {
+ if (start_offset_ == boost::end(string_range_))
+ return static_cast<string_difference_type>(-1);
+ return std::distance(boost::begin(string_range_),start_offset_++);
+ }
+
string_range_type const &match = find_next();
if (boost::begin(match) == boost::end(string_range_))
return static_cast<string_difference_type>(-1);
@@ -477,6 +539,20 @@
//const_iterator begin() const { }
//const_iterator end() const { }
private:
+ inline void apply_changes()
+ {
+ if (substring_has_changed_ || string_has_changed_) {
+ find_reset();
+ if (substring_has_changed_) {
+ on_substring_change();
+ substring_has_changed_ = false;
+ }
+ if (string_has_changed_) {
+ on_string_change();
+ string_has_changed_ = false;
+ }
+ }
+ }
//detail::make_properly_copyable<substring_range_type> substring_optional_copy_;
//detail::make_properly_copyable<string_range_type> string_optional_copy_;
/*typename std::basic_string<substring_char_type, std::char_traits<substring_char_type>, allocator_type>
@@ -488,15 +564,53 @@
comparator_type comparator_;
allocator_type allocator_;
- //! \todo Somehow fix this HUGE issue. This makes us able to
+ //! \TODO make it so that pointers are stored here when appropriate (or must be 0 otherwise)
+ //! these will be used when refresh_substring()/refresh_string() are called
+ //! and are used to update substring_range_ and string_range_ via begin()+end()
+ //! then those functions will update the ranges of the algorithm and call
+ //! on_substring_change()/on_string_change().
+ //! \TODO think if it wouldn't be better if the algorithms could somehow use pointers to ranges or some stuff like that.
+
+ Sequence1T *substring_pointer_;
+ Sequence2T *string_pointer_;
+
+ //! \todo Somehow fix this. This makes us able to
//! only store ranges of type substring_iterator_type, and not of std::basic_string.
substring_range_type substring_range_;
string_range_type string_range_;
string_iterator_type start_offset_;
+ bool substring_has_changed_, string_has_changed_;
};
template <class,class,class,class> struct finder_no_additional_behavior { };
+ /*
+ template <class Range1T, class Range2T, class Algorithm,
+ class Comparator = ::boost::algorithm_is_equal,
+ class Allocator =
+ typename Algorithm::algorithm<
+ typename boost::range_const_iterator<Range1T>::type,
+ typename boost::range_const_iterator<Range2T>::type,
+ Comparator>::allocator_type
+ >
+ class simplified_finder_t :
+ public boost::algorithm::detail::finder_typedefs<Range1T,Range2T,ComparatorT,AllocatorT>,
+ private Algorithm::algorithm<
+ typename boost::range_const_iterator<Sequence1T>::type,
+ typename boost::range_const_iterator<Sequence2T>::type,
+ Comparator,Allocator>
+ {
+ //! \todo Add concept assertions here.
+
+ public:
+ simplified_finder_t(Range1T const *const substr = 0, Range2T const *const str = 0)
+ : substr_(substr), str_(str), algorithm() { }
+ private:
+ Range1T const *const substr_;
+ Range2T const *const str_;
+ };
+ */
+
// Finder generators ------------------------------------------//
//! "First" finder generator
@@ -728,8 +842,7 @@
using algorithm::range_finder;
- //! \TODO: add all new finder types to ::boost after they have been coded
- //! \TODO: extend from finder_t to create simpler first_finder_t etc.
+ //! \TODO: any other finder types?
using algorithm::finder_t;
} // namespace boost
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/boyer_moore.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/boyer_moore.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/boyer_moore.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -0,0 +1,58 @@
+#ifndef BOOST_ALGORITHM_BOYER_MOORE_HPP
+#define BOOST_ALGORITHM_BOYER_MOORE_HPP
+
+#include <iterator>
+#include <allocators>
+#include <vector>
+
+namespace boost { namespace algorithm {
+ struct boyer_moore
+ {
+ typedef std::allocator<std::size_t> default_allocator_type;
+
+ template <class Finder, class ForwardIterator1T,class ForwardIterator2T,
+ class Comparator,class Allocator>
+ class algorithm
+ {
+ public:
+ typedef ForwardIterator1T substring_iterator_type;
+ typedef ForwardIterator2T string_iterator_type;
+ typedef typename std::iterator_traits<substring_iterator_type>::value_type substring_char_type;
+ typedef typename std::iterator_traits<string_iterator_type>::value_type string_char_type;
+ typedef typename boost::iterator_range<substring_iterator_type> substring_range_type;
+ typedef typename boost::iterator_range<string_iterator_type> string_range_type;
+ protected:
+ string_range_type find(string_iterator_type start)
+ {
+ return find(start, std::iterator_traits<ForwardIterator2T>::iterator_category());
+ }
+
+ //Compute the two tables
+ void on_substring_change()
+ {
+ on_substring_change(std::iterator_traits<ForwardIterator1T>::iterator_category());
+ }
+ //No precomputation to be done on the string
+ inline void on_string_change()
+ {
+
+ }
+ private:
+ void on_substring_change(std::random_access_iterator_tag)
+ {
+ substring_range_type const &substr = static_cast<Finder*>(this)->get_substring_range();
+ comparator_type const &comp = static_cast<Finder*>(this)->get_comparator();
+
+ }
+
+ string_range_type find(string_iterator_type start, std::random_access_iterator_tag)
+ {
+ string_range_type const &str = static_cast<Finder*>(this)->get_string_range();
+ substring_range_type const &substr = static_cast<Finder*>(this)->get_substring_range();
+ comparator_type const &comp = static_cast<Finder*>(this)->get_comparator();
+ }
+ };
+ };
+} }
+
+#endif
\ No newline at end of file
Added: sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/detail/rabin_karp.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/detail/rabin_karp.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -0,0 +1,269 @@
+#ifndef BOOST_ALGORITHM_RABIN_KARP_DETAIL_HPP
+#define BOOST_ALGORITHM_RABIN_KARP_DETAIL_HPP
+
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_base_of.hpp>
+#include <boost/type_traits/make_unsigned.hpp>
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/not.hpp>
+#include <boost/range/iterator.hpp>
+#include <boost/call_traits.hpp>
+#include <iterator>
+
+namespace boost { namespace algorithm { namespace detail {
+
+ /*template <class HashType, HashType Modulo, HashType Base> struct rabin_karp_multiplicative_inverse;
+
+ template <class HashType> struct rabin_karp_multiplicative_inverse<unsigned int,1,2>
+ {
+ static const unsigned int value = 3;
+ };*/
+
+ //Note: for 32bit integers, modulo, base and exp must all be at most 16bit.
+ template <class IntT>
+ inline IntT logarithmic_exponentiation (IntT base, IntT exp, IntT modulo)
+ {
+ IntT ret = static_cast<IntT>(1);
+ for (; exp; exp >>= 1)
+ {
+ if (exp&1) ret = (ret*base) % modulo;
+ base = (base*base) % modulo;
+ }
+ return ret;
+ }
+
+ template <class Finder, class ForwardIterator1T,class ForwardIterator2T, class HashType,
+ HashType FirstBase, HashType FirstModulo,
+ HashType SecondBase, HashType SecondModulo, class Enable = void>
+ class rabin_karp_algorithm;
+
+ // Implementation of Rabin Karp for text supporting Input Iterators
+ template <class Finder, class ForwardIterator1T,class ForwardIterator2T, class HashType,
+ HashType FirstBase, HashType FirstModulo,
+ HashType SecondBase, HashType SecondModulo>
+ class rabin_karp_algorithm<Finder,
+ ForwardIterator1T, ForwardIterator2T, HashType,
+ FirstBase, FirstModulo, SecondBase, SecondModulo,
+ typename boost::enable_if<
+ typename boost::mpl::and_<
+ typename boost::is_base_of<std::input_iterator_tag,
+ typename std::iterator_traits<ForwardIterator2T>::iterator_category>,
+ typename boost::mpl::not_<typename boost::is_base_of<std::forward_iterator_tag,
+ typename std::iterator_traits<ForwardIterator2T>::iterator_category> >
+ >
+ >::type
+ >
+ ;
+
+ // Implementation of Rabin Karp for text supporting Forward Iterators
+ template <class Finder, class ForwardIterator1T,class ForwardIterator2T, class HashType,
+ HashType FirstBase, HashType FirstModulo,
+ HashType SecondBase, HashType SecondModulo>
+ class rabin_karp_algorithm<Finder,
+ ForwardIterator1T, ForwardIterator2T, HashType,
+ FirstBase, FirstModulo, SecondBase, SecondModulo,
+ typename boost::enable_if<
+ typename boost::mpl::and_<
+ typename boost::is_base_of<std::forward_iterator_tag,
+ typename std::iterator_traits<ForwardIterator2T>::iterator_category>,
+ typename boost::mpl::not_<typename boost::is_base_of<std::random_access_iterator_tag,
+ typename std::iterator_traits<ForwardIterator2T>::iterator_category> >
+ >
+ >::type
+ >
+ ;
+
+ //Implementation of Rabin Karp for text supporting Random Access Iterators
+ template <class Finder, class ForwardIterator1T,class ForwardIterator2T, class HashType,
+ HashType FirstBase, HashType FirstModulo,
+ HashType SecondBase, HashType SecondModulo>
+ class rabin_karp_algorithm<
+ Finder, ForwardIterator1T, ForwardIterator2T, HashType,
+ FirstBase, FirstModulo, SecondBase, SecondModulo,
+ typename boost::enable_if<
+ typename boost::is_base_of<
+ std::random_access_iterator_tag,
+ typename std::iterator_traits<ForwardIterator2T>::iterator_category
+ >
+ >::type
+ >
+ {
+ public:
+ typedef ForwardIterator1T substring_iterator_type;
+ typedef ForwardIterator2T string_iterator_type;
+ typedef typename std::iterator_traits<substring_iterator_type>::value_type substring_char_type;
+ typedef typename std::iterator_traits<string_iterator_type>::value_type string_char_type;
+ typedef typename boost::iterator_range<substring_iterator_type> substring_range_type;
+ typedef typename boost::iterator_range<string_iterator_type> string_range_type;
+ protected:
+
+ rabin_karp_algorithm() :
+ first_substring_hash_(0), second_substring_hash_(0),
+ first_string_hash_current_(0), second_string_hash_current_(0),
+ first_string_hash_beginning_(0), second_string_hash_beginning_(0),
+ first_inverse_(0), second_inverse_(0), string_size_(0), substring_size_(0), string_computed_upto_(0)
+ { }
+
+ //!\todo this the right name?
+ template <class T>
+ inline HashType integer_promotion(T i)
+ { return static_cast<HashType>(static_cast<boost::make_unsigned<T>::type>(i)); }
+
+ void on_substring_change()
+ {
+ substring_range_type const &substr = static_cast<Finder*>(this)->get_substring_range();
+
+ HashType first = static_cast<HashType>(0), second = static_cast<HashType>(0);
+
+ std::size_t old_substring_size = substring_size_;
+
+ substring_size_ = 0;
+ for (ForwardIterator1T it = boost::begin(substr);
+ it != boost::end(substr); ++it, ++substring_size_)
+ {
+ first = (first * FirstBase + integer_promotion(*it) ) % FirstModulo;
+ second = (second * SecondBase + integer_promotion(*it) ) % SecondModulo;
+ }
+ //! \todo Optimize here (by precomputing all powers FirstBase^(2^k) and SecondBase^(2^k))
+ //compute (-(FirstBase)^substring_size_) % FirstModulo
+
+ first_inverse_ = FirstModulo - ::boost::algorithm::detail::logarithmic_exponentiation(
+ FirstBase, static_cast<HashType>(substring_size_), FirstModulo);
+ //compute (-(SecondBase)^substring_size_) % SecondModulo
+ second_inverse_ = SecondModulo - ::boost::algorithm::detail::logarithmic_exponentiation(
+ SecondBase, static_cast<HashType>(substring_size_), SecondModulo);
+ first_substring_hash_ = first;
+ second_substring_hash_ = second;
+
+ if (substring_size_ != old_substring_size)
+ on_string_change();
+ }
+
+ void on_string_change()
+ {
+ string_range_type const &str = static_cast<Finder*>(this)->get_string_range();
+
+ HashType first = static_cast<HashType>(0), second = static_cast<HashType>(0);
+ std::size_t computed = 0;
+ for (ForwardIterator2T it = boost::begin(str);
+ it != boost::end(str) && computed < substring_size_;
+ ++it, ++computed)
+ {
+ first = (first * FirstBase + integer_promotion(*it) ) % FirstModulo;
+ second = (second * SecondBase + integer_promotion(*it) ) % SecondModulo;
+ }
+ //note: use the loop above to calculate part of the string size and then only finish the rest
+ //(when having a forward iterator)
+ //!\todo figure out how to avoid necessity of string_size_ when you have an input iterator only
+ string_size_ = boost::end(str) - boost::begin(str);
+
+ first_string_hash_beginning_ = first;
+ second_string_hash_beginning_ = second;
+ string_computed_upto_ = computed;
+ first_string_hash_current_ = first;
+ second_string_hash_current_ = second;
+ }
+
+ string_range_type find(string_iterator_type start)
+ {
+ string_range_type const &str = static_cast<Finder*>(this)->get_string_range();
+
+ //substring bigger than string
+ if (string_size_ < substring_size_)
+ return boost::iterator_range<string_iterator_type>(boost::end(str), boost::end(str));
+
+ std::size_t offset = start - boost::begin(str);
+
+ //not enough space left in the string to match the full substring
+ if (offset + substring_size_ > string_size_)
+ return boost::iterator_range<string_iterator_type>(boost::end(str), boost::end(str));
+
+ //the string hashes have been computed past the current offset, reset them to the beginning
+ if (string_computed_upto_ - substring_size_ > offset)
+ {
+ string_computed_upto_ = substring_size_;
+ first_string_hash_current_ = first_string_hash_beginning_;
+ second_string_hash_current_ = second_string_hash_beginning_;
+ }
+ //roll the hash until we reach the current offset
+ while (offset > string_computed_upto_ - substring_size_)
+ roll_string_hash();
+
+ //a match found right at the current offset.
+ if (equal())
+ return boost::iterator_range<string_iterator_type>(start, start+substring_size_);
+ //rolling the hash until we find a match
+ while (string_computed_upto_ != string_size_)
+ {
+ roll_string_hash();
+ //match found
+ if (equal())
+ return boost::iterator_range<string_iterator_type>(
+ boost::begin(str) + (string_computed_upto_ - substring_size_),
+ boost::begin(str) + string_computed_upto_
+ );
+ }
+ //no match found
+ return boost::iterator_range<string_iterator_type>(
+ boost::end(str), boost::end(str)
+ );
+ }
+
+ private:
+ bool equal () const
+ {
+ return first_substring_hash_ == first_string_hash_current_ &&
+ second_substring_hash_ == second_string_hash_current_;
+ }
+ /*template <class IteratorT>
+ inline boost::tuple<HashType,HashType> compute_hashes (IteratorT const &start, IteratorT const &end)
+ {
+ HashType first = static_cast<HashType>(0), second = static_cast<HashType>(0);
+ for (IteratorT it = start; it != end; ++it)
+ {
+ first = (first*FirstBase + *it) % FirstModulo;
+ second= (second*SecondBase + *it) % SecondModulo;
+ }
+ return boost::make_tuple(first, second);
+ }*/
+
+ inline void roll_string_hash()
+ {
+ string_range_type const &str = static_cast<Finder*>(this)->get_string_range();
+
+ HashType remove = static_cast<HashType>(
+ static_cast<boost::make_unsigned<string_char_type>::type>(
+ boost::begin(str)[string_computed_upto_-substring_size_]
+ ));
+ HashType add = static_cast<HashType>(
+ static_cast<boost::make_unsigned<string_char_type>::type>(
+ boost::begin(str)[string_computed_upto_]
+ ));
+
+ first_string_hash_current_ = mod(
+ mod(FirstBase * first_string_hash_current_ + add,FirstModulo) +
+ mod(first_inverse_ * remove,FirstModulo),
+ FirstModulo);
+
+ second_string_hash_current_ = mod(
+ mod(SecondBase * second_string_hash_current_ + add,SecondModulo) +
+ mod(second_inverse_ * remove,SecondModulo),
+ SecondModulo);
+ ++string_computed_upto_;
+ }
+
+ inline HashType mod (HashType a, HashType b)
+ {
+ return a%b;
+ }
+
+ //! \todo zero-initialize all of these, just in case
+ HashType first_substring_hash_, second_substring_hash_;
+ HashType first_string_hash_current_, second_string_hash_current_;
+ HashType first_string_hash_beginning_, second_string_hash_beginning_;
+ HashType first_inverse_, second_inverse_;
+ std::size_t string_size_, substring_size_, string_computed_upto_;
+ };
+
+} } }
+#endif
\ No newline at end of file
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/knuth_morris_pratt.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/knuth_morris_pratt.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/knuth_morris_pratt.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -0,0 +1,110 @@
+#ifndef BOOST_ALGORITHM_KNUTH_MORRIS_PRATT_HPP
+#define BOOST_ALGORITHM_KNUTH_MORRIS_PRATT_HPP
+
+#include <iterator>
+#include <boost/range/iterator_range.hpp>
+#include <vector>
+#include <allocators>
+
+namespace boost { namespace algorithm {
+ struct knuth_morris_pratt
+ {
+ typedef std::allocator<std::size_t> default_allocator_type;
+ template <class Finder,class RandomAccessIterator1T,
+ class RandomAccessIterator2T,class Comparator,class Allocator>
+ class algorithm
+ {
+ public:
+ typedef RandomAccessIterator1T substring_iterator_type;
+ typedef RandomAccessIterator2T string_iterator_type;
+ typedef boost::iterator_range<RandomAccessIterator1T> substring_range_type;
+ typedef boost::iterator_range<RandomAccessIterator2T> string_range_type;
+ typedef Comparator comparator_type;
+ protected:
+ string_range_type find(string_iterator_type start)
+ {
+ return find(start, std::iterator_traits<RandomAccessIterator2T>::iterator_category());
+ }
+
+ void on_substring_change()
+ {
+ on_substring_change(std::iterator_traits<RandomAccessIterator1T>::iterator_category());
+ }
+
+ void on_string_change()
+ {
+ }
+ private:
+ std::vector<std::size_t, Allocator> failure_func;
+
+ string_range_type find(string_iterator_type start, std::random_access_iterator_tag)
+ {
+ string_range_type const &str = static_cast<Finder*>(this)->get_string_range();
+ substring_range_type const &substr = static_cast<Finder*>(this)->get_substring_range();
+ comparator_type const &comp = static_cast<Finder*>(this)->get_comparator();
+
+ std::size_t idx = start - boost::begin(str),
+ str_size = boost::end(str) - boost::begin(str), q = 0,
+ substr_size = boost::end(substr) - boost::begin(substr);
+
+ if (boost::begin(substr) == boost::end(substr))
+ return boost::iterator_range<string_iterator_type>(
+ start, start);
+
+ while (idx < str_size)
+ {
+ // Invariant: substring[0..q-1] == string[..idx-1]
+
+ //if (boost::begin(substr)[q] == boost::begin(str)[idx])
+ if (comp(boost::begin(substr)[q], boost::begin(str)[idx]))
+ {
+ ++idx; ++q;
+ if (q == substr_size)
+ return boost::iterator_range<string_iterator_type>(
+ boost::begin(str)+(idx-substr_size),
+ boost::begin(str)+idx
+ );
+ }
+ else
+ {
+ if (q == 0) ++idx;
+ else q = failure_func[q];
+ }
+ }
+ return boost::iterator_range<string_iterator_type>(
+ boost::end(str), boost::end(str));
+ }
+
+ void on_substring_change(std::random_access_iterator_tag)
+ {
+ substring_range_type const &substr = static_cast<Finder*>(this)->get_substring_range();
+ comparator_type const &comp = static_cast<Finder*>(this)->get_comparator();
+
+ failure_func.reserve(boost::end(substr) - boost::begin(substr));
+ std::size_t idx, q, substr_size = boost::end(substr) - boost::begin(substr);
+ failure_func.push_back(0); failure_func.push_back(0);
+
+ if (boost::begin(substr) == boost::end(substr)) return;
+
+ for (idx = 2; idx < substr_size; ++idx)
+ {
+ q = failure_func[idx-1];
+ for (;;)
+ {
+ //if (boost::begin(substr)[q] == boost::begin(substr)[idx-1])
+ if (comp(boost::begin(substr)[q], boost::begin(substr)[idx-1]))
+ {
+ failure_func.push_back(q+1);
+ break;
+ }
+ else if (q == 0) { failure_func.push_back(0); break; }
+ q = failure_func[q];
+ }
+ }
+ }
+
+ };
+ };
+} }
+
+#endif
\ No newline at end of file
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/naive_search.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/naive_search.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/naive_search.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -3,51 +3,53 @@
#include <boost/range/iterator_range.hpp>
#include <boost/call_traits.hpp>
+#include <boost/mpl/void.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
namespace boost
{
namespace algorithm
{
//! \todo Copyable
-
struct naive_search
{
+ typedef boost::mpl::void_ default_allocator_type;
- template <class ForwardIterator1T,class ForwardIterator2T,class Comparator,class Allocator = std::allocator<char> >
- struct algorithm : boost::noncopyable
+ template <class Finder, class Iterator1T, class Iterator2T, class ComparatorT, class AllocatorT>
+ struct algorithm
{
- public:
- typedef ForwardIterator1T substring_iterator_type;
- typedef ForwardIterator2T string_iterator_type;
- typedef typename boost::iterator_range<substring_iterator_type> substring_range_type;
- typedef typename boost::iterator_range<string_iterator_type> string_range_type;
- typedef Comparator comparator_type;
- typedef Allocator allocator_type;
protected:
- //construct the algorithm given iterator ranges for the substring and the string
- algorithm (typename boost::call_traits<comparator_type>::param_type comparator,
- typename boost::call_traits<allocator_type>::param_type allocator,
- typename boost::call_traits<substring_range_type>::param_type substring,
- typename boost::call_traits<string_range_type>::param_type string)
- : comparator_(comparator), allocator_(allocator), substring_(substring), string_(string) { }
+ algorithm () { }
- string_range_type find(string_iterator_type start)
+ typename boost::iterator_range<Iterator2T> find(Iterator2T start)
{
+ typedef typename Finder::string_iterator_type string_iterator_type;
+ typedef typename Finder::substring_iterator_type substring_iterator_type;
+ typedef typename Finder::substring_range_type substring_range_type;
+ typedef typename Finder::string_range_type string_range_type;
+ typedef typename Finder::comparator_type comparator_type;
+ string_range_type const &str = static_cast<Finder*>(this)->get_string_range();
+ substring_range_type const &substr = static_cast<Finder*>(this)->get_substring_range();
+ comparator_type comparator = static_cast<Finder*>(this)->get_comparator();
+
for (;
- start != boost::end(string_); ++start)
+ start != boost::end(str); ++start)
{
string_iterator_type str_iter(start);
substring_iterator_type substr_iter;
- for (substr_iter = boost::begin(substring_);
- substr_iter != boost::end(substring_) && str_iter != boost::end(string_); ++substr_iter, ++str_iter)
+ for (substr_iter = boost::begin(substr);
+ substr_iter != boost::end(substr) && str_iter != boost::end(str);
+ ++substr_iter, ++str_iter)
{
- if (!comparator_(*str_iter, *substr_iter)) break;
+ if (!comparator(*str_iter, *substr_iter)) break;
}
- if (substr_iter == boost::end(substring_))
+ if (substr_iter == boost::end(substr))
return boost::iterator_range<string_iterator_type>(start, str_iter);
}
- return boost::iterator_range<string_iterator_type>(boost::end(string_),boost::end(string_));
+ return boost::iterator_range<string_iterator_type>(
+ boost::end(str),boost::end(str));
}
//! It is guaranteed that each of these two functions will get called at least once before find()
//! is used.
@@ -59,11 +61,6 @@
inline void on_string_change()
{
}
- private:
- typename boost::call_traits<comparator_type>::param_type comparator_;
- typename boost::call_traits<allocator_type>::param_type allocator_;
- typename boost::call_traits<typename boost::iterator_range<substring_iterator_type> >::param_type substring_;
- typename boost::call_traits<typename boost::iterator_range<string_iterator_type> >::param_type string_;
};
};
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/rabin_karp.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/rabin_karp.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/rabin_karp.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -6,44 +6,47 @@
#include <boost/algorithm/string/compare.hpp>
#include <boost/call_traits.hpp>
#include <boost/tuple/tuple.hpp>
+#include <boost/mpl/void.hpp>
#include <cstdlib>
+#include <boost/static_assert.hpp>
+
+
+#include <boost/algorithm/string/string_search/detail/rabin_karp.hpp>
namespace boost { namespace algorithm {
//! \todo Find this in boost?
- struct void_type {};
+ //struct void_type {};
//Note: this only works with comparator ==
- //! \note Implement a version that works with Input iterators?
- /*template <
+ //! \todo Implement a version that works with Input iterators?
+ //! \todo Make sure this only works with char and wchar_t
+ template <
//bool Heuristic = true,
- class HashType = boost::uint32_t,
- HashType FirstModulo = 1, HashType FirstBase = 2,
- HashType SecondBase = 3, HashType SecondModulo = 4>
- struct rabin_karp
+ class HashType,
+ HashType FirstBase, HashType FirstModulo,
+ HashType SecondBase, HashType SecondModulo>
+ struct rabin_karp_algorithm
{
- template <class ForwardIterator1T,class ForwardIterator2T,class Comparator,class Allocator = boost::algorithm::void_type>
+ typedef boost::mpl::void_ default_allocator_type;
+
+ template <class Finder, class Iterator1T, class Iterator2T, class ComparatorT, class AllocatorT>
class algorithm;
- template <class ForwardIterator1T,class ForwardIterator2T,class Allocator>
- class algorithm<ForwardIterator1T, ForwardIterator2T, boost::algorithm::is_equal, Allocator>
+ template <class Finder, class Iterator1T, class Iterator2T, class AllocatorT>
+ class algorithm<Finder, Iterator1T, Iterator2T, boost::algorithm::is_equal, AllocatorT>
+ : public ::boost::algorithm::detail::rabin_karp_algorithm<Finder,
+ Iterator1T, Iterator2T, HashType,
+ FirstBase, FirstModulo, SecondBase, SecondModulo>
{
- public:
- typedef ForwardIterator1T substring_iterator_type;
- typedef ForwardIterator2T string_iterator_type;
- typedef typename boost::iterator_range<substring_iterator_type> substring_range_type;
- typedef typename boost::iterator_range<string_iterator_type> string_range_type;
- typedef boost::algorithm::is_equal comparator_type;
- typedef Allocator allocator_type;
protected:
//construct the algorithm given iterator ranges for the substring and the string
- algorithm (typename boost::call_traits<comparator_type>::param_type comparator,
- typename boost::call_traits<allocator_type>::param_type allocator,
- typename boost::call_traits<substring_range_type>::param_type substring,
- typename boost::call_traits<string_range_type>::param_type string)
- : comparator_(comparator), allocator_(allocator), substring_(substring), string_(string) { }
-
- string_range_type find(string_iterator_type start)
+ algorithm () {
+ BOOST_STATIC_ASSERT(
+ sizeof(boost::iterator_value<Iterator1T>::type)*2 <= sizeof(HashType)
+ );
+ }
+ /*string_range_type find(string_iterator_type start)
{
if (start == boost::begin(string) && string_computed_start_offset_) on_string_change();
@@ -76,45 +79,22 @@
first_string_hash_ = (first_string_hash_ * FirstBase + *it) % FirstModulo;
second_string_hash_ = (second_string_hash_ * SecondBase + *it) % SecondModulo;
}
- //string_computed_upto =
- }
- private:
- bool equal () const
- {
- return first_substring_hash == first_string_hash_ && second_substring_hash_ == second_string_hash_;
- }
- template <class IteratorT>
- inline boost::tuple<HashType,HashType> compute_hashes (IteratorT const &start, IteratorT const &end)
- {
- HashType first = static_cast<HashType>(0), second = static_cast<HashType>(0);
- for (IteratorT it = start; it != end; ++it)
- {
- first = (first*FirstBase + *it) % FirstModulo;
- second= (second*SecondBase + *it) % SecondModulo;
- }
- return boost::make_tuple(first, second);
- }
+ //string_computed_upto =
+ }*/
- void roll_string_hash()
- {
- //! \todo impl
- }
- HashType first_substring_hash_, first_string_hash_, first_string_beginning_hash_;
- HashType second_substring_hash_, second_string_hash_ second_string_beginning_hash_;
- string_iterator_type computed_until_;
- std::size_t substring_size_, string_computed_start_offset_, string_computed_end_offset_;
- string_iterator_type string_computed_upto_;
- typename boost::call_traits<comparator_type>::param_type comparator_;
- typename boost::call_traits<allocator_type>::param_type allocator_;
- typename boost::call_traits<substring_range_type> >::param_type substring_;
- typename boost::call_traits<substring_range_type>::param_type string_;
+
};
};
- */
+
+ //1/3732152659 odds of collision. used with char
+ typedef rabin_karp_algorithm<boost::uint32_t,257,64433,277,57923> rabin_karp32;
+ //1/(N*M) odds of collision. used with wchar_t
+ typedef rabin_karp_algorithm<boost::uint64_t,1,2,3,4> rabin_karp64;
} // namespace algorithm
} // namespace boost
+
#endif
\ No newline at end of file
Modified: sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/suffix_array.hpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/suffix_array.hpp (original)
+++ sandbox/SOC/2010/stringalgos/boost/algorithm/string/string_search/suffix_array.hpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -0,0 +1,14 @@
+#ifndef BOOST_ALGORITHM_SUFFIX_ARRAY_HPP
+#define BOOST_ALGORITHM_SUFFIX_ARRAY_HPP
+
+namespace boost { namespace algorithm {
+ struct suffix_array
+ {
+ template <class
+ class algorithm
+ {
+ };
+ };
+} }
+
+#endif
\ No newline at end of file
Modified: sandbox/SOC/2010/stringalgos/libs/algorithm/string/test/finder_test.cpp
==============================================================================
--- sandbox/SOC/2010/stringalgos/libs/algorithm/string/test/finder_test.cpp (original)
+++ sandbox/SOC/2010/stringalgos/libs/algorithm/string/test/finder_test.cpp 2010-07-10 12:24:49 EDT (Sat, 10 Jul 2010)
@@ -11,8 +11,10 @@
#include <boost/algorithm/string/finder.hpp>
#include <boost/algorithm/string/string_search/naive_search.hpp>
#include <boost/algorithm/string/string_search/rabin_karp.hpp>
+#include <boost/algorithm/string/string_search/knuth_morris_pratt.hpp>
+#include <boost/algorithm/string/string_search/boyer_moore.hpp>
#include <boost/algorithm/string/classification.hpp>
-
+#include <boost/config.hpp>
#include <string>
#include <vector>
@@ -95,13 +97,24 @@
//BOOST_TEST_CASE_TEMPLATE(test_finders_second_type,
}
+void logpow_test()
+{
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(23,0,1234567), 1);
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(7,98,38626), 19509);
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(9,362,63675), 21231);
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(16,290,34475), 11526);
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(19,14,7034), 6517);
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(4,378,48645), 946);
+ BOOST_CHECK_EQUAL(boost::algorithm::detail::logarithmic_exponentiation<boost::uint32_t>(10,27,6662), 4742);
+}
+
BOOST_TEST_CASE_TEMPLATE_FUNCTION(test_finders, Algorithm)
{
- /*boost::first_finder_t<std::string, std::string, Algorithm> first;
- boost::nth_finder_t<std::string, std::string, Algorithm> second; second.set_n(2);
- boost::nth_finder_t<std::string, std::string, Algorithm> third; third.set_n(3);
- boost::last_finder_t<std::string, std::string, Algorithm> last;*/
- /*typedef typename boost::finder_t<std::string, std::string, Algorithm> t1;
+ /*boost::first_finder_t<std::string, std::string, Algorithm> first;
+ boost::nth_finder_t<std::string, std::string, Algorithm> second; second.set_n(2);
+ boost::nth_finder_t<std::string, std::string, Algorithm> third; third.set_n(3);
+ boost::last_finder_t<std::string, std::string, Algorithm> last;*/
+ /*typedef typename boost::finder_t<std::string, std::string, Algorithm> t1;
typedef typename boost::finder_t<std::list<wchar_t>, std::list<wchar_t>, Algorithm> t2;
typedef typename boost::finder_t<std::vector<char>, std::list<char>, Algorithm> t3;
@@ -111,8 +124,12 @@
typename t3::string_range_type i3;
*/
+ //typedef std::vector<char> Sequence1T;
+ //typedef std::list<char> Sequence2T;
+ //typedef std::list<char> Sequence1T;
+ //typedef std::string Sequence2T;
typedef std::vector<char> Sequence1T;
- typedef std::list<char> Sequence2T;
+ typedef std::vector<char> Sequence2T;
typedef typename boost::finder_t<Sequence1T, Sequence2T, Algorithm> f_t;
f_t::string_range_type i;
@@ -146,7 +163,7 @@
BOOST_CHECK_EQUAL(f2.find_next_index(), 27);
BOOST_CHECK_EQUAL(f2.find_first_index(), 27);
BOOST_CHECK_EQUAL(f2.find_next_index(), -1);
- //BOOST_CHECK(superficial_range_equal(f2.find_first(), match_range));
+ BOOST_CHECK(superficial_range_equal(f2.find_first(), match_range));
f_t f3(&s1, S1); // ptr,ref
BOOST_CHECK(superficial_range_equal(f3.get_substring_range(),s1));
@@ -156,6 +173,10 @@
f_t f4(s1, &S1); // ref,ptr
BOOST_CHECK(boost::equal(f4.get_substring_range(), s1));
BOOST_CHECK(superficial_range_equal(f4.get_string_range(), S1));
+ BOOST_CHECK_EQUAL(f4.find_first_index(),27);
+ boost::iterator_range<Sequence2T::const_iterator> range = f4.find_first();
+ BOOST_CHECK_EQUAL(range.begin()-S1.begin(),27);
+ BOOST_CHECK(range.end() == match_range.end());
BOOST_CHECK(superficial_range_equal(f4.find_first(),match_range));
f_t f5(s1, S1); // ref, ref
@@ -229,73 +250,81 @@
// (0, 0)
f.set_substring(&substr);
f.set_string(&str);
- BOOST_CHECK_EQUAL(f.find_first_index(), 0);
- BOOST_CHECK_EQUAL(f.find_next_index(), -1);
+ //!\todo deal with these
+ //BOOST_CHECK_EQUAL(f.find_first_index(), 0);
+ //BOOST_CHECK_EQUAL(f.find_next_index(), -1);
//
assign_literal(substr,
- "\1005mJ\133Rh\047",8);
+ "\1005mJ\133Rh\047",8);
str.clear();
- f.refresh();
- BOOST_CHECK_EQUAL(f1.find_first_index(), -1);
- BOOST_CHECK_EQUAL(boost::distance(f1.find_first()), 0);
+ f.set_substring(&substr); f.set_string(&str);
+ //BOOST_CHECK_EQUAL(f1.find_first_index(), -1);
+ //BOOST_CHECK_EQUAL(boost::distance(f1.find_first()), 0);
// (0, 0) (1, 1) (2, 2) (3, 3) (4, 4) (5, 5) (6, 6) (7, 7) (8, 8) (9, 9) (10, 10)
substr.clear();
assign_literal(str,
- "\055sjtIm6\052GJ",10);
- f.refresh();
+ "\055sjtIm6\052GJ",10);
+ f.set_substring(&substr); f.set_string(&str);
f.find_reset();
- for (unsigned int i = 0; i <= 10; ++i)
- BOOST_CHECK_EQUAL(f.find_next_index(), i);
-
+ //for (unsigned int i = 0; i <= 10; ++i)
+ // BOOST_CHECK_EQUAL(f.find_next_index(), i);
+ //BOOST_CHECK_EQUAL(f.find_next_index(),-1);
+
// (0, 44)
assign_literal(substr,
- "Zd07sA\046\042WSyj\076q\136\053Ho\043EA\056i\043C\052\1356sl"
- "rZ\075Yizv\177y\073W\174le",44);
+ "Zd07sA\046\042WSyj\076q\136\053Ho\043EA\056i\043C\052\1356sl"
+ "rZ\075Yizv\177y\073W\174le",44);
assign_literal(str,
- "Zd07sA\046\042WSyj\076q\136\053Ho\043EA\056i\043C\052\1356sl"
- "rZ\075Yizv\177y\073W\174le",44);
- f.refresh();
+ "Zd07sA\046\042WSyj\076q\136\053Ho\043EA\056i\043C\052\1356sl"
+ "rZ\075Yizv\177y\073W\174le",44);
+ f.set_substring(&substr); f.set_string(&str);
BOOST_CHECK_EQUAL(f.find_first_index(), 0);
BOOST_CHECK_EQUAL(boost::distance(f.find_first()), 44);
BOOST_CHECK_EQUAL(boost::distance(f.find_next()), 0);
// (0, 1) (1, 2) (2, 3) (3, 4) (4, 5) (5, 6) (6, 7) (7, 8) (8, 9) (9, 10) (10, 11) (11, 12) (12, 13) (13, 14) (14, 15) (15, 16) (16, 17)
assign_literal(substr,
- "x",1);
+ "x",1);
assign_literal(str,
- "xxxxxxxxxxxxxxxxx",17);
- f.refresh();
+ "xxxxxxxxxxxxxxxxx",17);
+ f.set_substring(&substr); f.set_string(&str);
+ f.find_reset();
+ for (unsigned int i=0; i<=16; ++i)
+ BOOST_CHECK_EQUAL(f.find_next_index(), i);
+ BOOST_CHECK_EQUAL(f.find_next_index(), -1);
f.find_reset();
for (unsigned int i=0; i<=16; ++i)
BOOST_CHECK_EQUAL(f.find_next_index(), i);
+ BOOST_CHECKPOINT("WIN0");
//
assign_literal(substr,
- "X",1);
+ "X",1);
assign_literal(str,
- "xxxxxxxxxxxxxxxxx",17);
- f.refresh();
+ "xxxxxxxxxxxxxxxxx",17);
+ f.set_substring(&substr); f.set_string(&str);
BOOST_CHECK_EQUAL(f.find_first_index(), -1);
+
// (0, 2) (3, 5) (6, 8) (9, 11) (12, 14) (15, 17) (18, 20) (21, 23)
assign_literal(substr,
- "Yx",2);
+ "Yx",2);
assign_literal(str,
- "YxXYxXYxXYxXYxXYxXYxXYxX",24);
+ "YxXYxXYxXYxXYxXYxXYxXYxX",24);
f.set_substring(substr); f.set_string(str);
f.find_reset();
for (unsigned int i=0; i<=21; i += 3)
BOOST_CHECK_EQUAL(f.find_next_index(), i);
-
+ BOOST_CHECKPOINT("WIN");
// (0, 7) (1, 8) (2, 9) (3, 10) (4, 11) (5, 12) (6, 13) (7, 14) (8, 15) (9, 16) (10, 17)
assign_literal(substr,
- "AAAAAAA",7);
+ "AAAAAAA",7);
assign_literal(str,
- "AAAAAAAAAAAAAAAAA",17);
+ "AAAAAAAAAAAAAAAAA",17);
f.set_substring(substr); f.set_string(str);
for (unsigned int i=0; i<=10; ++i)
BOOST_CHECK_EQUAL(boost::distance(f.find_next()), 7);
@@ -303,216 +332,225 @@
// (233, 581)
assign_literal(substr,
- "\051E\176B5Zjp\056CRO\136fmC\134p\045 d\175FC\072OW\053Fy"
- "g\043aI ZWL\045\073\134\073\045\077k\173Ck8\200Yavc\177M\074zgu"
- "RU4b\044\072w\140d\134b3\0501\055\042\0416\135\045g\042\057yO9bo8N"
- "g066VA\044vtDS9tHx\050AZP\176\0446\057\200GKH7\077C"
- "\137vzJ\043\046GVB\041iJl\077U\176ETG\047f\046h\076i\074P6\051h"
- "Pv\072MHj8XOcPybXri\076\177b\075z8\052\0459\072xQc8"
- "M\054i\054\074v\050Dh\140\1336\056\045\050\0465y\076\173\174Z7f\177\044\075\045R\054"
- "\053rFv\056MO\074\041\050\135LTnn\075N\041H\177\135n03Im7\056W\053"
- "zgn2\052B\051lhP\175IKPK\134u6c\074f3bP\057fh\140\177l"
- "\137J\051 \043\135\136VFU\136r\042zPmGmES\134\140\136z\052K\053luI"
- "\200e5tAUf\043oZz\175RX HvxHBlY7YJjvfO\047"
- "\133m\056BMcp\043xVuz\134\053\176zJ\052",348);
- assign_literal(str,
- "\041\075mS\051\052C\073rtR\136z\045\053f\072c6\073\051qYa\136\077\137\177\053\057"
- "\177s\057b\074yUs\044JpBsUI\075jpgd\174n\041\1363\074O\055\137 "
- "7\044Qe\173\0552g\1758F\056\175v\056Ja7\173\057t\052\051\057\177\176jgi\074"
- "S\0566j6NfJG3\047\133p\043XD\135\135NW5\100\0552XgoaT\173"
- "dhIl\05650j9\072E\173Ju\0439\177\1346C\046o\042M\052w\175vQ\045"
- "X\173\076kvAiC\053fO\057\046kYL\053IIKE\0775qEr\053zpD"
- "\076\0746\1330\177tj xC5\075\140\046\057WjPEQ\134\177\074sEf59T"
- "rtN\047\077OU\054P\056h\077bY \050U\047m8t2s\051E\176B5Zj"
- "p\056CRO\136fmC\134p\045 d\175FC\072OW\053Fyg\043aI ZW"
- "L\045\073\134\073\045\077k\173Ck8\200Yavc\177M\074zguRU4b\044\072w"
- "\140d\134b3\0501\055\042\0416\135\045g\042\057yO9bo8Ng066VA\044"
- "vtDS9tHx\050AZP\176\0446\057\200GKH7\077C\137vzJ\043\046G"
- "VB\041iJl\077U\176ETG\047f\046h\076i\074P6\051hPv\072MHj8"
- "XOcPybXri\076\177b\075z8\052\0459\072xQc8M\054i\054\074v\050"
- "Dh\140\1336\056\045\050\0465y\076\173\174Z7f\177\044\075\045R\054\053rFv\056MO"
- "\074\041\050\135LTnn\075N\041H\177\135n03Im7\056W\053zgn2\052B\051"
- "lhP\175IKPK\134u6c\074f3bP\057fh\140\177l\137J\051 \043\135\136"
- "VFU\136r\042zPmGmES\134\140\136z\052K\053luI\200e5tAUf"
- "\043oZz\175RX HvxHBlY7YJjvfO\047\133m\056BMcp"
- "\043xVuz\134\053\176zJ\052W5c\076V0\057b\043\053\051\045Flg6\050xC"
- "z5QWD \173\074\140\045\057LHZHzW\133\137\053\0438\0427dg\072hsC"
- "yc\134\135O\055Sc\136\073it\053WA\055\177\051\137H\057\052\177\200O\1378C\053v"
- "AsT\133k1\135\076\043\045\1772v\041qX2\133yERiQC\052\050\047\073jn"
- "\176\200z8L\052P\100p0 U\137\173\134Fo7Ou5YMa99AkN "
- "\174\174N7\053\041\077\0763Ge\042\1341IKQx\050\137U\077\136yANnnRv"
- "\136tVA\047lm\0417K\133b\045D\134jCy\047\1336\052\0558Ne\100M\054l"
- "zsnoC\057N \043\1764UF\200\1000ncg\173CKUS\051\052s\100cP"
- " \100\047v\052GRj\04384f0Z\135\0761f\133\046Ph2\0775q\076KCi"
- "\057fL\0738M\057mJ\072\046IHiSysUi\057yH3\053\075T kP5"
- "G\042\136o0QldyV\134\0723U\173\173\076kN\177\137x6\044x\050\134\075\175\135"
- "e\044\176RDs\133W\050\047X\135P0\042Dv25M\134g\0447J\173pBup"
- "p1\074C\051z6\136YYN\044\174y\177\0423\077V\050e\077u\175LmyH\100S"
- "\042\077\052\0501 R\055\044IMq2\055kD3Z\176iNZaHDhk\176\045z"
- "YG\100\050FnEH47aV\0420hG\133\042\075JQ\044uQl\134TT49"
- "xU\1334X7\134bk0uz\045Mej3IVxTs0oW0\076\1004C"
- "\046\134\073Id\135TSxL5\135\042\072\133SLyLR\042\072wf\072tkV\076h"
- "s96\042A\1747ac55\076\175o\054veL\072CvF K\054\072ku5\200"
- "\077ymo\054XWHuOW\050\074fP\054x\050Y\133O\046\042 \074s\045\100iO"
- "1m\135\044\075\133\177H5WybREnO\074\136U6j\054Npj\053toDD"
- "9CD5e\176vr\133 vUUS\057\1368\133a\046Fyefd3VLGb"
- "4\1002\176\044RvP\051\1408F\042skbDCnz\176l\133A2\174NYTA"
- "\136\043\175\100FUY6IZ\051\175WRlLyk\0441PZ\051eQB\050\054\174R"
- "KbFY\075FDx\1759\0540IVx\136quo\044wbjT\077r\0475\1379"
- "cz\136\050o\047\043oi\1753\134R\041\073h\140cM5R\075\044M\200\076b\046jT"
- "4R\1779T\054PH\0515GZUY4Y\075Y\042\175IS9ZRd\133NA\176"
- "SRvt\073\174tl\176h0Evf\177Ncdm\054O\077\054CwCA\173\100\077"
- "\1354\135\0450\075F22q\055\050aO 1w\073\042X\076\073D\073d\140D0\041h"
- "Gj\045dXej\134\053su2zMl2jN\045y\055\072\135\072\074K\136\1355\140"
- "\041f\073\1407iM9yBXLHlv9gm\053\1333\041J7\072h\056u\174\100"
- "i\073O\1367yI\136k\054sTy\072\077b9A \136DM\074\072\075mB\0766i"
- "G\057\173T\135nU\051M3\1374l \052ZIjSu\176k6\042u\055Xhbm"
- "u6CW\052JOc\045\041EaJ\173\176hzu\177D\134l\047O\0515ES2W"
- "WB\054I2\076Nz\075O\056T6\0527\051Cc\134M\073kS9\046\057jd\054v"
- "2MA\076\174lReqk\134qsNY9F5bIc\045\056s5n4N2i"
- "Br\137QT\051eaz\054c\052\135\0459 G\077VP\044\140O\043bkBc\055p"
- "L\073X\045iWV\175W\137\136hM\133\050a\177hI\176vJN\137\176t\135 \173\045"
- "\1336Z5y5NgOYx\0512\134Wa7fqzy\136vLE\045g7F\056"
- "\136\053u MFjtQz\140\052\140IbYbO\133\140kffmc\074E\0769w"
- "\173\047\073\133\042\177\053wu0x\175J3qpdA\051vT\057\075Jkp96B\074"
- "\046 X\1004\140\073j\140kY\072dl\176wy\046\100gq\2008D\0508Z\054HV"
- "\046\0558\136PY6bVQ\077\136\173 \177\042\043C\135\046w\047\057\057q\043\134S\072\133"
- "\077J8\076\134Pfj\075\1339\140GH9 ynoOOgnU6kfM8l"
- "\042\043k\072\044h4\0505\047\177kCW\052e\0509GVu2\056K\052Q\077E7r"
- "uHePhj f nGd\173V\174P\175\0771xUS\1358lBH J\075"
- "V\076jRK\056pR\057\074QLp\135\044iWkwNRX\054Be YA39"
- "etngj\140Ac\052N\043\045S\043O0MW\077\050s\041\046\0567J\042\044\072G"
- "x\174I\134\200cOU0\1772ZDPfup8dxc\175",2002);
+ "\051E\176B5Zjp\056CRO\136fmC\134p\045 d\175FC\072OW\053Fy"
+ "g\043aI ZWL\045\073\134\073\045\077k\173Ck8\200Yavc\177M\074zgu"
+ "RU4b\044\072w\140d\134b3\0501\055\042\0416\135\045g\042\057yO9bo8N"
+ "g066VA\044vtDS9tHx\050AZP\176\0446\057\200GKH7\077C"
+ "\137vzJ\043\046GVB\041iJl\077U\176ETG\047f\046h\076i\074P6\051h"
+ "Pv\072MHj8XOcPybXri\076\177b\075z8\052\0459\072xQc8"
+ "M\054i\054\074v\050Dh\140\1336\056\045\050\0465y\076\173\174Z7f\177\044\075\045R\054"
+ "\053rFv\056MO\074\041\050\135LTnn\075N\041H\177\135n03Im7\056W\053"
+ "zgn2\052B\051lhP\175IKPK\134u6c\074f3bP\057fh\140\177l"
+ "\137J\051 \043\135\136VFU\136r\042zPmGmES\134\140\136z\052K\053luI"
+ "\200e5tAUf\043oZz\175RX HvxHBlY7YJjvfO\047"
+ "\133m\056BMcp\043xVuz\134\053\176zJ\052",348);
+ assign_literal(str,
+ "\041\075mS\051\052C\073rtR\136z\045\053f\072c6\073\051qYa\136\077\137\177\053\057"
+ "\177s\057b\074yUs\044JpBsUI\075jpgd\174n\041\1363\074O\055\137 "
+ "7\044Qe\173\0552g\1758F\056\175v\056Ja7\173\057t\052\051\057\177\176jgi\074"
+ "S\0566j6NfJG3\047\133p\043XD\135\135NW5\100\0552XgoaT\173"
+ "dhIl\05650j9\072E\173Ju\0439\177\1346C\046o\042M\052w\175vQ\045"
+ "X\173\076kvAiC\053fO\057\046kYL\053IIKE\0775qEr\053zpD"
+ "\076\0746\1330\177tj xC5\075\140\046\057WjPEQ\134\177\074sEf59T"
+ "rtN\047\077OU\054P\056h\077bY \050U\047m8t2s\051E\176B5Zj"
+ "p\056CRO\136fmC\134p\045 d\175FC\072OW\053Fyg\043aI ZW"
+ "L\045\073\134\073\045\077k\173Ck8\200Yavc\177M\074zguRU4b\044\072w"
+ "\140d\134b3\0501\055\042\0416\135\045g\042\057yO9bo8Ng066VA\044"
+ "vtDS9tHx\050AZP\176\0446\057\200GKH7\077C\137vzJ\043\046G"
+ "VB\041iJl\077U\176ETG\047f\046h\076i\074P6\051hPv\072MHj8"
+ "XOcPybXri\076\177b\075z8\052\0459\072xQc8M\054i\054\074v\050"
+ "Dh\140\1336\056\045\050\0465y\076\173\174Z7f\177\044\075\045R\054\053rFv\056MO"
+ "\074\041\050\135LTnn\075N\041H\177\135n03Im7\056W\053zgn2\052B\051"
+ "lhP\175IKPK\134u6c\074f3bP\057fh\140\177l\137J\051 \043\135\136"
+ "VFU\136r\042zPmGmES\134\140\136z\052K\053luI\200e5tAUf"
+ "\043oZz\175RX HvxHBlY7YJjvfO\047\133m\056BMcp"
+ "\043xVuz\134\053\176zJ\052W5c\076V0\057b\043\053\051\045Flg6\050xC"
+ "z5QWD \173\074\140\045\057LHZHzW\133\137\053\0438\0427dg\072hsC"
+ "yc\134\135O\055Sc\136\073it\053WA\055\177\051\137H\057\052\177\200O\1378C\053v"
+ "AsT\133k1\135\076\043\045\1772v\041qX2\133yERiQC\052\050\047\073jn"
+ "\176\200z8L\052P\100p0 U\137\173\134Fo7Ou5YMa99AkN "
+ "\174\174N7\053\041\077\0763Ge\042\1341IKQx\050\137U\077\136yANnnRv"
+ "\136tVA\047lm\0417K\133b\045D\134jCy\047\1336\052\0558Ne\100M\054l"
+ "zsnoC\057N \043\1764UF\200\1000ncg\173CKUS\051\052s\100cP"
+ " \100\047v\052GRj\04384f0Z\135\0761f\133\046Ph2\0775q\076KCi"
+ "\057fL\0738M\057mJ\072\046IHiSysUi\057yH3\053\075T kP5"
+ "G\042\136o0QldyV\134\0723U\173\173\076kN\177\137x6\044x\050\134\075\175\135"
+ "e\044\176RDs\133W\050\047X\135P0\042Dv25M\134g\0447J\173pBup"
+ "p1\074C\051z6\136YYN\044\174y\177\0423\077V\050e\077u\175LmyH\100S"
+ "\042\077\052\0501 R\055\044IMq2\055kD3Z\176iNZaHDhk\176\045z"
+ "YG\100\050FnEH47aV\0420hG\133\042\075JQ\044uQl\134TT49"
+ "xU\1334X7\134bk0uz\045Mej3IVxTs0oW0\076\1004C"
+ "\046\134\073Id\135TSxL5\135\042\072\133SLyLR\042\072wf\072tkV\076h"
+ "s96\042A\1747ac55\076\175o\054veL\072CvF K\054\072ku5\200"
+ "\077ymo\054XWHuOW\050\074fP\054x\050Y\133O\046\042 \074s\045\100iO"
+ "1m\135\044\075\133\177H5WybREnO\074\136U6j\054Npj\053toDD"
+ "9CD5e\176vr\133 vUUS\057\1368\133a\046Fyefd3VLGb"
+ "4\1002\176\044RvP\051\1408F\042skbDCnz\176l\133A2\174NYTA"
+ "\136\043\175\100FUY6IZ\051\175WRlLyk\0441PZ\051eQB\050\054\174R"
+ "KbFY\075FDx\1759\0540IVx\136quo\044wbjT\077r\0475\1379"
+ "cz\136\050o\047\043oi\1753\134R\041\073h\140cM5R\075\044M\200\076b\046jT"
+ "4R\1779T\054PH\0515GZUY4Y\075Y\042\175IS9ZRd\133NA\176"
+ "SRvt\073\174tl\176h0Evf\177Ncdm\054O\077\054CwCA\173\100\077"
+ "\1354\135\0450\075F22q\055\050aO 1w\073\042X\076\073D\073d\140D0\041h"
+ "Gj\045dXej\134\053su2zMl2jN\045y\055\072\135\072\074K\136\1355\140"
+ "\041f\073\1407iM9yBXLHlv9gm\053\1333\041J7\072h\056u\174\100"
+ "i\073O\1367yI\136k\054sTy\072\077b9A \136DM\074\072\075mB\0766i"
+ "G\057\173T\135nU\051M3\1374l \052ZIjSu\176k6\042u\055Xhbm"
+ "u6CW\052JOc\045\041EaJ\173\176hzu\177D\134l\047O\0515ES2W"
+ "WB\054I2\076Nz\075O\056T6\0527\051Cc\134M\073kS9\046\057jd\054v"
+ "2MA\076\174lReqk\134qsNY9F5bIc\045\056s5n4N2i"
+ "Br\137QT\051eaz\054c\052\135\0459 G\077VP\044\140O\043bkBc\055p"
+ "L\073X\045iWV\175W\137\136hM\133\050a\177hI\176vJN\137\176t\135 \173\045"
+ "\1336Z5y5NgOYx\0512\134Wa7fqzy\136vLE\045g7F\056"
+ "\136\053u MFjtQz\140\052\140IbYbO\133\140kffmc\074E\0769w"
+ "\173\047\073\133\042\177\053wu0x\175J3qpdA\051vT\057\075Jkp96B\074"
+ "\046 X\1004\140\073j\140kY\072dl\176wy\046\100gq\2008D\0508Z\054HV"
+ "\046\0558\136PY6bVQ\077\136\173 \177\042\043C\135\046w\047\057\057q\043\134S\072\133"
+ "\077J8\076\134Pfj\075\1339\140GH9 ynoOOgnU6kfM8l"
+ "\042\043k\072\044h4\0505\047\177kCW\052e\0509GVu2\056K\052Q\077E7r"
+ "uHePhj f nGd\173V\174P\175\0771xUS\1358lBH J\075"
+ "V\076jRK\056pR\057\074QLp\135\044iWkwNRX\054Be YA39"
+ "etngj\140Ac\052N\043\045S\043O0MW\077\050s\041\046\0567J\042\044\072G"
+ "x\174I\134\200cOU0\1772ZDPfup8dxc\175",2002);
f.set_substring(&substr); f.set_string(str);
BOOST_CHECK_EQUAL(f.find_next_index(), 233);
+ BOOST_CHECK_EQUAL(f.find_next_index(), -1);
+ f.find_reset();
+ BOOST_CHECK_EQUAL(f.find_next_index(), 233);
// (237, 523)
assign_literal(substr,
- "\140\173\054\076\0736a\135t\055\0468\134\050\140\133\053\055\077Fr\177\043Z5\0576\14003"
- "Q\134N\176 \057\076\134\176\1370KO\045\135\072i6Yu\045\072nG2\052\073hth"
- "Xk\0729\045nq\0434t\075\176zrX\0556z\045A\0442s\055\051j\043 \175b"
- "\1346oSd\041\057\041\077iVxRd\053\134FR\137\076\056\047\173E3C\043\075\077d"
- "\075yx1y\1753 xF\135\134\042iu\076\176\140\100\176uf\057\041Gcr9Hm"
- "F\055XG\077Nj\047\052JV1Q\136\055\074z\136p\1345\042NPH\053epC\072"
- "lGI\051\073\135m2\057\047\044bG\174VK\200\177v\0464\046qy\200B\052cu\140"
- "\051Cl\047\050CzlY\051sWv\053R\175\0561KBG\136o\045CD\055ol\041"
- " \050v4\053\133\051\054iwvn\047\043zO\173t\041\043jxv2\100Y\041qdU"
- "xL\134sipk\134tE\137\042R\135BE",286);
- assign_literal(str,
- "NgTNd\176\042J\047cLB\074UAP6\077\072\051l\200\0454XkV\077u\044"
- "\052\042y\1750\072\042KBu\174okaW\1357\100FgkyGm\043\050\136uK\050"
- "\133o\100\056\053fpmi\077eL1\041\054\0448\046cjR8M9\135\135S\135l\076"
- "Zf\176od3GHf2\0750G\050MxOe1\056Z50\050kYAU\174\136"
- "\07346\0417\137\0462\177uqPz07I\133\175zc3O\175\072N\075X\200Fq"
- "5zu4\044O\073\056S\054JDymr\077VlI9\075jn\175\173\1733bR\140"
- "wd\054RQOC\050fyZ95n\133 z\137\041\135\175bm\100GAFfr6"
- "Oz\173wPMm\051\057hxD\043F0O\137ZW\134QOSkhfh\140\173\054"
- "\076\0736a\135t\055\0468\134\050\140\133\053\055\077Fr\177\043Z5\0576\14003Q\134N"
- "\176 \057\076\134\176\1370KO\045\135\072i6Yu\045\072nG2\052\073hthXk\072"
- "9\045nq\0434t\075\176zrX\0556z\045A\0442s\055\051j\043 \175b\1346o"
- "Sd\041\057\041\077iVxRd\053\134FR\137\076\056\047\173E3C\043\075\077d\075yx"
- "1y\1753 xF\135\134\042iu\076\176\140\100\176uf\057\041Gcr9HmF\055X"
- "G\077Nj\047\052JV1Q\136\055\074z\136p\1345\042NPH\053epC\072lGI"
- "\051\073\135m2\057\047\044bG\174VK\200\177v\0464\046qy\200B\052cu\140\051Cl"
- "\047\050CzlY\051sWv\053R\175\0561KBG\136o\045CD\055ol\041 \050v"
- "4\053\133\051\054iwvn\047\043zO\173t\041\043jxv2\100Y\041qdUxL\134"
- "sipk\134tE\137\042R\135BEOd\055V7\043I6rt\175vk9o\052\075"
- "x\055joMm5\174H\072G\100ZK\174s6LZ\075\137Y2Zj0\043\052\072S"
- "jiuEB\100Vs\056sF\044LvaYW\140iM\077GVvnXH6j\072"
- "\174\055Z\041T\074nkVK\044\173i\134\076\056\1744G\133\177j\133\2004d\052UBx"
- "mg8\177a\1353\177S7\047\175S\177\135Uvqg\055\1360YY\056D\140\174\046P"
- "\050\176o\200\135ApXGk4R\077Cpx\136lBnA4 \050\047rG3\0570"
- "\1374\074k\043VgEsB\140V\042xVac\055\041hM3\133\176J3\0575SE"
- "\057L\140c3\077\046\045S\1779R\200LJFw9\072\057\051bdcR3USV\050"
- "\136eM\043\044\056Xb\054Yi vFZ mpp4\041 Sh\073SPT46"
- "PZJ80D\043dV7af\053\177\177l\047\135zf\047\135E\041\044y\044kCU"
- "rK\137D\136\175\051n0v4eQ\045\051K\053w52\175\041iz59\0567X\073"
- "n\140ffPx\054KtI\043\173\047\136\134\051DmH\075\175x3\134\1352Ej\051\072"
- "\044kp\056JD\073bk7\043M\173MhMy95qu5Lf\136\042Ue\177M"
- "FGlOEP\177\173SKW\041\075\044V\2004Mq\054muzKj\074j\050\075B"
- "\076\057Brx4l\074ggS\051\073\046GYI\135\052\074fU\056\041\0775e5\057X"
- "i\041\175\140Q\077ayy4zc\1332k\0469J\052\047D\073\140dShUq\057v"
- "a\055y\073R\2006 tJ\052n\174S\046O3\046t\200\047\045HIF\047\135\043\044n"
- "\053D\174p\133\052OeZ\173\177\137S\133\053\140j\077EdwQcrs\077d\046hP"
- "\075\100c\044\077\173L\140\055d\200366aV\047b\046\134\136\0750si\136FIZx"
- "\077z2\075\173 M5\051\0518vT\100Chp0CTIo\073A\0414I\055G\042"
- "F\134\200NUh\055\042TW6\074\052Ap8\052hs4X\044\134\0461\077\055\050u8"
- "g\175m7\041\050\047\046m\137C4noM\0738Kk\077\042xK\100df0\136S\050"
- "mL\177MR1V\075\057Mwwd\175\134lE\0744l\135P\177\073k\177\046Vtu"
- "K8GS4\1401vG\075Jrw\057chmBK\0456O\137b6a\055\053\0502"
- "\045\1340\133WA\045\057\1747pp",1242);
- f.refresh_substring();
+ "\140\173\054\076\0736a\135t\055\0468\134\050\140\133\053\055\077Fr\177\043Z5\0576\14003"
+ "Q\134N\176 \057\076\134\176\1370KO\045\135\072i6Yu\045\072nG2\052\073hth"
+ "Xk\0729\045nq\0434t\075\176zrX\0556z\045A\0442s\055\051j\043 \175b"
+ "\1346oSd\041\057\041\077iVxRd\053\134FR\137\076\056\047\173E3C\043\075\077d"
+ "\075yx1y\1753 xF\135\134\042iu\076\176\140\100\176uf\057\041Gcr9Hm"
+ "F\055XG\077Nj\047\052JV1Q\136\055\074z\136p\1345\042NPH\053epC\072"
+ "lGI\051\073\135m2\057\047\044bG\174VK\200\177v\0464\046qy\200B\052cu\140"
+ "\051Cl\047\050CzlY\051sWv\053R\175\0561KBG\136o\045CD\055ol\041"
+ " \050v4\053\133\051\054iwvn\047\043zO\173t\041\043jxv2\100Y\041qdU"
+ "xL\134sipk\134tE\137\042R\135BE",286);
+ assign_literal(str,
+ "NgTNd\176\042J\047cLB\074UAP6\077\072\051l\200\0454XkV\077u\044"
+ "\052\042y\1750\072\042KBu\174okaW\1357\100FgkyGm\043\050\136uK\050"
+ "\133o\100\056\053fpmi\077eL1\041\054\0448\046cjR8M9\135\135S\135l\076"
+ "Zf\176od3GHf2\0750G\050MxOe1\056Z50\050kYAU\174\136"
+ "\07346\0417\137\0462\177uqPz07I\133\175zc3O\175\072N\075X\200Fq"
+ "5zu4\044O\073\056S\054JDymr\077VlI9\075jn\175\173\1733bR\140"
+ "wd\054RQOC\050fyZ95n\133 z\137\041\135\175bm\100GAFfr6"
+ "Oz\173wPMm\051\057hxD\043F0O\137ZW\134QOSkhfh\140\173\054"
+ "\076\0736a\135t\055\0468\134\050\140\133\053\055\077Fr\177\043Z5\0576\14003Q\134N"
+ "\176 \057\076\134\176\1370KO\045\135\072i6Yu\045\072nG2\052\073hthXk\072"
+ "9\045nq\0434t\075\176zrX\0556z\045A\0442s\055\051j\043 \175b\1346o"
+ "Sd\041\057\041\077iVxRd\053\134FR\137\076\056\047\173E3C\043\075\077d\075yx"
+ "1y\1753 xF\135\134\042iu\076\176\140\100\176uf\057\041Gcr9HmF\055X"
+ "G\077Nj\047\052JV1Q\136\055\074z\136p\1345\042NPH\053epC\072lGI"
+ "\051\073\135m2\057\047\044bG\174VK\200\177v\0464\046qy\200B\052cu\140\051Cl"
+ "\047\050CzlY\051sWv\053R\175\0561KBG\136o\045CD\055ol\041 \050v"
+ "4\053\133\051\054iwvn\047\043zO\173t\041\043jxv2\100Y\041qdUxL\134"
+ "sipk\134tE\137\042R\135BEOd\055V7\043I6rt\175vk9o\052\075"
+ "x\055joMm5\174H\072G\100ZK\174s6LZ\075\137Y2Zj0\043\052\072S"
+ "jiuEB\100Vs\056sF\044LvaYW\140iM\077GVvnXH6j\072"
+ "\174\055Z\041T\074nkVK\044\173i\134\076\056\1744G\133\177j\133\2004d\052UBx"
+ "mg8\177a\1353\177S7\047\175S\177\135Uvqg\055\1360YY\056D\140\174\046P"
+ "\050\176o\200\135ApXGk4R\077Cpx\136lBnA4 \050\047rG3\0570"
+ "\1374\074k\043VgEsB\140V\042xVac\055\041hM3\133\176J3\0575SE"
+ "\057L\140c3\077\046\045S\1779R\200LJFw9\072\057\051bdcR3USV\050"
+ "\136eM\043\044\056Xb\054Yi vFZ mpp4\041 Sh\073SPT46"
+ "PZJ80D\043dV7af\053\177\177l\047\135zf\047\135E\041\044y\044kCU"
+ "rK\137D\136\175\051n0v4eQ\045\051K\053w52\175\041iz59\0567X\073"
+ "n\140ffPx\054KtI\043\173\047\136\134\051DmH\075\175x3\134\1352Ej\051\072"
+ "\044kp\056JD\073bk7\043M\173MhMy95qu5Lf\136\042Ue\177M"
+ "FGlOEP\177\173SKW\041\075\044V\2004Mq\054muzKj\074j\050\075B"
+ "\076\057Brx4l\074ggS\051\073\046GYI\135\052\074fU\056\041\0775e5\057X"
+ "i\041\175\140Q\077ayy4zc\1332k\0469J\052\047D\073\140dShUq\057v"
+ "a\055y\073R\2006 tJ\052n\174S\046O3\046t\200\047\045HIF\047\135\043\044n"
+ "\053D\174p\133\052OeZ\173\177\137S\133\053\140j\077EdwQcrs\077d\046hP"
+ "\075\100c\044\077\173L\140\055d\200366aV\047b\046\134\136\0750si\136FIZx"
+ "\077z2\075\173 M5\051\0518vT\100Chp0CTIo\073A\0414I\055G\042"
+ "F\134\200NUh\055\042TW6\074\052Ap8\052hs4X\044\134\0461\077\055\050u8"
+ "g\175m7\041\050\047\046m\137C4noM\0738Kk\077\042xK\100df0\136S\050"
+ "mL\177MR1V\075\057Mwwd\175\134lE\0744l\135P\177\073k\177\046Vtu"
+ "K8GS4\1401vG\075Jrw\057chmBK\0456O\137b6a\055\053\0502"
+ "\045\1340\133WA\045\057\1747pp",1242);
f.set_string(str);
+ f.set_substring(&substr);
BOOST_CHECK_EQUAL(f.find_first_index(), 237);
BOOST_CHECK_EQUAL(f.find_next_index(), -1);
+ f.find_reset();
+ BOOST_CHECK_EQUAL(f.find_first_index(), 237);
//
assign_literal(substr,
- "xeG\073M\051h\176W\073s0j\043AYp\177\100kcHf\174VK\075",27);
+ "xeG\073M\051h\176W\073s0j\043AYp\177\100kcHf\174VK\075",27);
assign_literal(str,
- "\135c\176gq\073u\051\134x\052WTo2F A\076DHl9ko\045\074\075IL"
- "w\076p\045\057\136 HYWP\140\175x\173\135\057\136rxx\046\073\056EN\133\136FQ"
- "aaePrh g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L"
- "8X\0573tv\135V\077n\054c7\0754\054mUrHX\043\200io1\053K\200r"
- "lAZYn\176\135xi\133H\200\133JA\046H\045AMmCt8s\1366D\100\075"
- "T8\14022L\133H6\137f\176rh g4mX\136\046I\0435iC\177Z6O"
- "A\174V2\135N9L8X\0573tw\140nK4\140R\044Qrk8\053i\052\135V"
- "g\051EOA \1331xbt\100\073O\042\051N\134Lb\042\176j\041mf\134\176\137j"
- "M\056hka0I\137LP6F4\045ti2W\100\076\072\057I\072zXPZ\050\045"
- "HK\046\076k\175 5N\173qDR\043\053Bwz\057\075Frorh g4mX"
- "\136\046I\0435iC\177Z6OA\174V2\135N9L8X\0573t\133\177mqFZ"
- "\0557\0578\100TrOd\177D\175b\100ec\07416\177zi\073XO\056\137zDG"
- "3E\174tE\053v\043b\074\136\053V\053\176\046\0505\057d84\041 \055\047\140\054\043\054"
- "\047\053uV\134rz\176\072\0467MVEwb\200jlu\050 eT",414);
+ "\135c\176gq\073u\051\134x\052WTo2F A\076DHl9ko\045\074\075IL"
+ "w\076p\045\057\136 HYWP\140\175x\173\135\057\136rxx\046\073\056EN\133\136FQ"
+ "aaePrh g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L"
+ "8X\0573tv\135V\077n\054c7\0754\054mUrHX\043\200io1\053K\200r"
+ "lAZYn\176\135xi\133H\200\133JA\046H\045AMmCt8s\1366D\100\075"
+ "T8\14022L\133H6\137f\176rh g4mX\136\046I\0435iC\177Z6O"
+ "A\174V2\135N9L8X\0573tw\140nK4\140R\044Qrk8\053i\052\135V"
+ "g\051EOA \1331xbt\100\073O\042\051N\134Lb\042\176j\041mf\134\176\137j"
+ "M\056hka0I\137LP6F4\045ti2W\100\076\072\057I\072zXPZ\050\045"
+ "HK\046\076k\175 5N\173qDR\043\053Bwz\057\075Frorh g4mX"
+ "\136\046I\0435iC\177Z6OA\174V2\135N9L8X\0573t\133\177mqFZ"
+ "\0557\0578\100TrOd\177D\175b\100ec\07416\177zi\073XO\056\137zDG"
+ "3E\174tE\053v\043b\074\136\053V\053\176\046\0505\057d84\041 \055\047\140\054\043\054"
+ "\047\053uV\134rz\176\072\0467MVEwb\200jlu\050 eT",414);
f.set_substring(substr);
f.set_string(&str);
BOOST_CHECK_EQUAL(f.find_next_index(), -1);
+ BOOST_CHECK_EQUAL(f.find_next_index(), -1);
// (91, 122) (201, 232) (358, 389)
assign_literal(substr,
- "rh g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L8X\0573"
- "t",31);
+ "rh g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L8X\0573"
+ "t",31);
assign_literal(str,
- "\077mY\176OvV\136\073N\174I\042Yz\176\041DQ\056\175KDR\0761J \135y"
- " v\175ldK310mVs\174Uh\046j\046\055Ee\0541c\042l3OVJ"
- "A\042bYgPVjb\042\046YC\136Q\041wq0T4\056w\046\133s3O5L"
- "Qrh g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L8X\057"
- "3t8\1332uEAG\045\045y\075bbHFB\045\047\047j\135\0427\052zl\050\133"
- "QwZiGX6jo \200nkk\136\073\140\047k\054ML\133f0K\041\100\134G"
- "p3G\043\047P\054BSMqVT\175IrY\045CyErh g4mX\136\046"
- "I\0435iC\177Z6OA\174V2\135N9L8X\0573t\077h3\052Wx \042"
- "\0456\057nzDu xO\075\073\074\045XH\054Q tOP\043w\137\043\051kAC"
- "dq5\073\1760MRuWV7D\176FR\200x\1759\051QD\135YfITP1"
- "x\075\1359J0R\135R\054\047\073\1339xW1h\073l\140g\053\134m9\177r7K"
- "kd\072\136ORWu\0433\174T\042\04227\050hB\072mrtQi\053\136\042rh"
- " g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L8X\0573t\057"
- "KAv\075uo\043ox\135\136\0769g\073kwM\057\173\134l\075\041m \0530\100\176"
- "TTM\174\077V\051Mn\135\076Tx\100GTX\077r\051Za\051\176sm\047\052\0732"
- "\076nq\041\077ArD\134oV0KdaXSRS\175",470);
- f.refresh_string();
- f.set_substring(substr);
+ "\077mY\176OvV\136\073N\174I\042Yz\176\041DQ\056\175KDR\0761J \135y"
+ " v\175ldK310mVs\174Uh\046j\046\055Ee\0541c\042l3OVJ"
+ "A\042bYgPVjb\042\046YC\136Q\041wq0T4\056w\046\133s3O5L"
+ "Qrh g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L8X\057"
+ "3t8\1332uEAG\045\045y\075bbHFB\045\047\047j\135\0427\052zl\050\133"
+ "QwZiGX6jo \200nkk\136\073\140\047k\054ML\133f0K\041\100\134G"
+ "p3G\043\047P\054BSMqVT\175IrY\045CyErh g4mX\136\046"
+ "I\0435iC\177Z6OA\174V2\135N9L8X\0573t\077h3\052Wx \042"
+ "\0456\057nzDu xO\075\073\074\045XH\054Q tOP\043w\137\043\051kAC"
+ "dq5\073\1760MRuWV7D\176FR\200x\1759\051QD\135YfITP1"
+ "x\075\1359J0R\135R\054\047\073\1339xW1h\073l\140g\053\134m9\177r7K"
+ "kd\072\136ORWu\0433\174T\042\04227\050hB\072mrtQi\053\136\042rh"
+ " g4mX\136\046I\0435iC\177Z6OA\174V2\135N9L8X\0573t\057"
+ "KAv\075uo\043ox\135\136\0769g\073kwM\057\173\134l\075\041m \0530\100\176"
+ "TTM\174\077V\051Mn\135\076Tx\100GTX\077r\051Za\051\176sm\047\052\0732"
+ "\076nq\041\077ArD\134oV0KdaXSRS\175",470);
+ f.set_substring(substr); f.set_string(&str);
BOOST_CHECK_EQUAL(f.find_first_index(), 91);
BOOST_CHECK_EQUAL(f.find_next_index(), 201);
BOOST_CHECK_EQUAL(f.find_next_index(), 358);
+ BOOST_CHECK_EQUAL(f.find_next_index(), -1);
+ f.find_reset();
+ BOOST_CHECK_EQUAL(f.find_first_index(), 91);
+ BOOST_CHECK_EQUAL(f.find_next_index(), 201);
// (0, 64)
assign_literal(substr,
- "K\175s\072\175yi3\053C9\100\055d\077CT\100Hon1TeKbeGn0"
- "M\051sWaU\053\077o\043I\0747\1402X\05760P\044cO40\174 7ZL"
- "8\051YD",64);
- assign_literal(str,
- "K\175s\072\175yi3\053C9\100\055d\077CT\100Hon1TeKbeGn0"
- "M\051sWaU\053\077o\043I\0747\1402X\05760P\044cO40\174 7ZL"
- "8\051YD",64);
- f.refresh_string();
+ "K\175s\072\175yi3\053C9\100\055d\077CT\100Hon1TeKbeGn0"
+ "M\051sWaU\053\077o\043I\0747\1402X\05760P\044cO40\174 7ZL"
+ "8\051YD",64);
+ assign_literal(str,
+ "K\175s\072\175yi3\053C9\100\055d\077CT\100Hon1TeKbeGn0"
+ "M\051sWaU\053\077o\043I\0747\1402X\05760P\044cO40\174 7ZL"
+ "8\051YD",64);
+ f.set_string(&str);
f.set_substring(substr);
BOOST_CHECK_EQUAL(boost::distance(f.find_next()), 64);
// (0, 6) (6, 12) (12, 18)
assign_literal(substr,
- "Q\05618\136\137",6);
+ "Q\05618\136\137",6);
assign_literal(str,
- "Q\05618\136\137Q\05618\136\137Q\05618\136\137",18);
+ "Q\05618\136\137Q\05618\136\137Q\05618\136\137",18);
f.set_substring(&substr);
f.set_string(&str);
BOOST_CHECK_EQUAL(f.find_first_index(), 0);
@@ -522,34 +560,43 @@
//
assign_literal(substr,
- "xRl\175Uo\174\042QV9Bh0C9\052XlJI0I\200C03C5D"
- "yS",32);
+ "xRl\175Uo\174\042QV9Bh0C9\052XlJI0I\200C03C5D"
+ "yS",32);
assign_literal(str,
- "\055\174\053l\074b\0507\140\134eRl\072\133Uf\134L6\045F\173AlXr\1350M"
- "\044e",32);
- f.refresh();
+ "\055\174\053l\074b\0507\140\134eRl\072\133Uf\134L6\045F\173AlXr\1350M"
+ "\044e",32);
+ f.set_string(&str); f.set_substring(&substr);
BOOST_CHECK_EQUAL(f.find_first_index(), -1);
// (0, 1) (1, 2) (2, 3) (3, 4) (4, 5) (5, 6) (6, 7) (7, 8) (8, 9) (9, 10) (10, 11) (11, 12) (12, 13) (13, 14) (14, 15) (15, 16) (16, 17) (17, 18) (18, 19) (19, 20) (20, 21) (21, 22) (22, 23) (23, 24) (24, 25) (25, 26) (26, 27) (27, 28) (28, 29) (29, 30)
assign_literal(substr,
- "\000",1);
+ "\000",1);
assign_literal(str,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000",30);
- f.refresh();
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000",30);
+ f.set_string(&str); f.set_substring(&substr);
for (unsigned int i=0; i<=29; ++i)
BOOST_CHECK_EQUAL(f.find_next_index(), i);
BOOST_CHECK_EQUAL(f.find_next_index(), -1);
+ f.find_reset();
+ for (unsigned int i=0; i<=29; ++i)
+ BOOST_CHECK_EQUAL(f.find_next_index(), i);
}
boost::unit_test::test_suite* init_unit_test_suite( int argc, char* argv[] )
{
-
- typedef boost::mpl::list<
- boost::algorithm::naive_search/*,
- boost::algorithm::rabin_karp<>*/
- > algorithm_list;
- boost::unit_test::framework::master_test_suite().add(
+ // Note: we should test with other allocators and comparators
+ typedef boost::mpl::list<
+ boost::algorithm::naive_search,
+ boost::algorithm::rabin_karp32,
+ boost::algorithm::knuth_morris_pratt/*,
+ boost::algorithm::boyer_moore,
+ boost::algorithm::suffix_array*/
+ > algorithm_list;
+ boost::unit_test::framework::master_test_suite().add(
BOOST_TEST_CASE_TEMPLATE(test_finders, algorithm_list)
);
+ boost::unit_test::framework::master_test_suite().add(
+ BOOST_TEST_CASE(logpow_test)
+ );
return NULL;
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk