Merge pull request #8 from njoy/feature/ranges-part2

Feature/ranges part2

cmake/unit_testing.cmake

@@ -33,6 +33,7 @@ add_subdirectory( src/tools/concepts/IsRange/test )
 add_subdirectory( src/tools/concepts/IsIterator/test )
 
 add_subdirectory( src/tools/ranges/IteratorView/test )
-add_subdirectory( src/tools/ranges/TransformIterator/test )
+add_subdirectory( src/tools/ranges/TransformView/test )
+add_subdirectory( src/tools/ranges/TransformView/Iterator/test )
 add_subdirectory( src/tools/ranges/make_view/test )
 add_subdirectory( src/tools/ranges/make_transform_view/test )

src/tools.hpp

@@ -1,4 +1,5 @@
 #include "tools/overload.hpp"
+#include "tools/concepts.hpp"
 #include "tools/ranges.hpp"
 
 #include "tools/Log.hpp"

src/tools/ranges/IteratorView.hpp

@@ -3,7 +3,6 @@
 
 // system includes
 #include <iterator>
-#include <stdexcept>
 
 // other includes
 #include "tools/ranges/ViewBase.hpp"
@@ -16,7 +15,7 @@ namespace ranges {
  *
  *  @brief A simple iterator based view class
  *
- *  Currently only defined for random access iterators.
+ *  It works on all types of iterators (input, forward, bidirectional and random).
  */
 template < typename Iterator >
 class IteratorView : public ViewBase< IteratorView< Iterator > > {
@@ -30,6 +29,7 @@ class IteratorView : public ViewBase< IteratorView< Iterator > > {
   using reference = typename std::iterator_traits< Iterator >::reference;
   using const_reference = const reference;
   using iterator = Iterator;
+  using const_iterator = const Iterator;
 
 private:
 
@@ -66,6 +66,16 @@ class IteratorView : public ViewBase< IteratorView< Iterator > > {
    *  @brief Return the end iterator to the view
    */
   constexpr iterator end() const noexcept { return end_; }
+
+  /**
+   *  @brief Return the begin iterator to the view
+   */
+  constexpr const_iterator cbegin() const noexcept { return this->begin(); }
+
+  /**
+   *  @brief Return the end iterator to the view
+   */
+  constexpr const_iterator cend() const noexcept { return this->end(); }
 };
 
 /**

src/tools/ranges/IteratorView/test/IteratorView.test.cpp

@@ -31,6 +31,13 @@ SCENARIO( "IteratorView" ) {
         CHECK( false == chunk.empty() );
         CHECK( false == bool( chunk ) );
 
+        unsigned int counter = 0;
+        for ( auto value : chunk ) {
+
+          ++counter;
+        }
+        CHECK( 5 == counter );
+
         // the following should not compile: no random access iterator
         // CHECK( -2 == chunk[0] );
         // CHECK( -2 == chunk.at(0) );
@@ -60,6 +67,13 @@ SCENARIO( "IteratorView" ) {
         CHECK( false == chunk.empty() );
         CHECK( false == bool( chunk ) );
 
+        unsigned int counter = 0;
+        for ( auto value : chunk ) {
+
+          ++counter;
+        }
+        CHECK( 5 == counter );
+
         // the following should not compile: no random access iterator
         // CHECK( -2 == chunk[0] );
         // CHECK( -2 == chunk.at(0) );
@@ -87,6 +101,13 @@ SCENARIO( "IteratorView" ) {
         CHECK( false == chunk.empty() );
         CHECK( false == bool( chunk ) );
 
+        unsigned int counter = 0;
+        for ( auto value : chunk ) {
+
+          ++counter;
+        }
+        CHECK( 5 == counter );
+
         CHECK( -2 == chunk[0] );
         CHECK( -1 == chunk[1] );
         CHECK(  0 == chunk[2] );