Changeset 3238

Timestamp:

May 24, 2014, 12:27:39 PM (9 years ago)

Author:

Peter

Message:

sort_index: add some compile tests, CONCEPT_ASSERTs, and add docs on requirements the compiler tests revealed.

Location:

trunk

Files:

• test/utility.cc (modified) (1 diff)
• yat/utility/sort_index.h (modified) (4 diffs)

trunk/test/utility.cc

@@ -511 +511 @@
   if (false) {
     std::vector<size_t> vec;
-    utility::sort_index(boost::forward_iterator_archetype<double>(),
-                        boost::forward_iterator_archetype<double>(),
-                        vec);
+    // value type must be possible to store in a vector so has to be
+    // default constructible and assignable
+    typedef boost::default_constructible_archetype<
+      boost::sgi_assignable_archetype<
+        boost::less_than_comparable_archetype<> > > value_type;
+    boost::input_iterator_archetype<value_type> iter;
+    utility::sort_index(iter, iter, vec);
+    // try with a random access container as well
+    std::vector<value_type> vec2;
+    utility::sort_index(vec2.begin(), vec2.end(), vec);
+  }
+  // same thing with four argument version
+  if (false) {
+    std::vector<size_t> vec;
+    // value type must be possible to store in a vector so has to be
+    // default constructible and assignable
+    typedef boost::default_constructible_archetype<
+      boost::sgi_assignable_archetype<> > value_type;
+
+    boost::input_iterator_archetype<value_type> iter;
+
+    // Create a binary predicate that is assignable and default constructible
+    boost::default_constructible_archetype<
+      boost::sgi_assignable_archetype<
+        boost::binary_predicate_archetype<
+          value_type, value_type> > > comp;
+
+    utility::sort_index(iter, iter, vec, comp);
+    // try with a random access container as well
+    std::vector<value_type> vec2;
+    utility::sort_index(vec2.begin(), vec2.end(), vec, comp);
   }
 }

trunk/yat/utility/sort_index.h

@@ -49 +49 @@
      <a href=http://www.sgi.com/tech/stl/LessThanComparable.html>
      LessThan Comparable</a>
+     - \c InputIterator::value_type is
+     <a href=http://www.sgi.com/tech/stl/DefaultConstructible.html>
+     Default Constructible</a> and
+     <a href=http://www.sgi.com/tech/stl/Assignable.html>
+     Assignable</a>
 
      \since New in yat 0.5. In versions prior 0.13 function was restricted to
-     \forward_iterator and \c value_type of \c double.
+     \forward_iterator with \c value_type convertible to \c double.
   */
   template<typename InputIterator>
@@ -66 +71 @@
      <a href="http://www.sgi.com/tech/stl/StrictWeakOrdering.html">
      Strict Weak Ordering</a>
+     - \c Compare is
+     <a href="http://www.sgi.com/tech/stl/Assignable.html">
+     Assignable</a>
+     - \c InputIterator::value_type is
+     <a href=http://www.sgi.com/tech/stl/DefaultConstructible.html>
+     Default Constructible</a> and
+     <a href=http://www.sgi.com/tech/stl/Assignable.html>
+     Assignable</a>
      - \c InputIterator::value_type is convertible to \c Compare's
        argument type
@@ -121 +134 @@
     BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator>));
     typedef typename std::iterator_traits<InputIterator>::value_type T;
+    BOOST_CONCEPT_ASSERT((boost::DefaultConstructible<T>));
+    BOOST_CONCEPT_ASSERT((boost::SGIAssignable<T>));
     BOOST_CONCEPT_ASSERT((boost::LessThanComparable<T>));
     sort_index(first, last, idx, std::less<T>());
@@ -131 +146 @@
   {
     BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator>));
-    
     typedef typename std::iterator_traits<InputIterator> traits;
+    typedef typename std::iterator_traits<InputIterator>::value_type T;
+    BOOST_CONCEPT_ASSERT((boost::DefaultConstructible<T>));
+    BOOST_CONCEPT_ASSERT((boost::SGIAssignable<T>));
+    BOOST_CONCEPT_ASSERT((boost::Assignable<Compare>));
+
     typedef typename traits::iterator_category category;
     detail::sort_index(first, last, idx, comp, category());