Merge branch 'fix/stride-view-vector' into 'develop'

Fix/stride view vector See merge request njoy/tools!5
njoy · Oct 16, 2024 · 0133415 · 0133415
2 parents af689a4 + c037a60
commit 0133415
Show file tree

Hide file tree

Showing 15 changed files with 382 additions and 0 deletions.
diff --git a/src/tools/std20/views/test/all.test.cpp b/src/tools/std20/views/test/all.test.cpp
@@ -82,6 +82,16 @@ SCENARIO( "all_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -145,6 +155,16 @@ SCENARIO( "all_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -217,6 +237,16 @@ SCENARIO( "all_view" ) {
         CHECK(  4 == chunk[3] );
         CHECK(  6 == chunk[4] );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/counted.test.cpp b/src/tools/std20/views/test/counted.test.cpp
@@ -201,6 +201,16 @@ SCENARIO( "counted_view" ) {
         CHECK(  0 == chunk[1] );
         CHECK(  2 == chunk[2] );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/drop.test.cpp b/src/tools/std20/views/test/drop.test.cpp
@@ -80,6 +80,16 @@ SCENARIO( "drop_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, original_modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -137,6 +147,16 @@ SCENARIO( "drop_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, original_modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -202,6 +222,16 @@ SCENARIO( "drop_view" ) {
         CHECK( 2 == chunk[1] );
         CHECK( 4 == chunk[2] );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/drop_while.test.cpp b/src/tools/std20/views/test/drop_while.test.cpp
@@ -69,6 +69,16 @@ SCENARIO( "drop_while_view" ) {
         // the following should not compile: no random access iterator
         // CHECK(  2 == chunk.back() );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -116,6 +126,16 @@ SCENARIO( "drop_while_view" ) {
         // the following should not compile: no random access iterator
         // CHECK( -2 == chunk[0] );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -166,6 +186,16 @@ SCENARIO( "drop_while_view" ) {
         CHECK( 0 == chunk.front() );
         CHECK( 2 == chunk.back() );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/filter.test.cpp b/src/tools/std20/views/test/filter.test.cpp
@@ -82,6 +82,16 @@ SCENARIO( "filter_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, original_modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -140,6 +150,16 @@ SCENARIO( "filter_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, original_modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -204,6 +224,16 @@ SCENARIO( "filter_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, original_modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN*/
 } // SCENARIO
diff --git a/src/tools/std20/views/test/iota.test.cpp b/src/tools/std20/views/test/iota.test.cpp
@@ -77,6 +77,16 @@ SCENARIO( "iota_view" ) {
         CHECK( *( begin + 5 ) == 6 );
         CHECK( *( begin + 99 ) == 100 );
       } // THEN
+
+//      THEN( "it can be transformed into a vector using iterators" ) {
+//
+//        std::vector< int > constructed( chunk.begin(), chunk.end() );
+//        CHECK( std20::ranges::equal( constructed, chunk ) );
+//
+//        std::vector< int > inserted;
+//        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+//        CHECK( std20::ranges::equal( inserted, chunk ) );
+//      }
     } // WHEN
   } // GIVEN
 
@@ -139,6 +149,16 @@ SCENARIO( "iota_view" ) {
         CHECK( *( begin + 1 ) == 2 );
         CHECK( *( end - 1 ) == 5 );
       } // THEN
+
+//      THEN( "it can be transformed into a vector using iterators" ) {
+//
+//        std::vector< int > constructed( chunk.begin(), chunk.end() );
+//        CHECK( std20::ranges::equal( constructed, chunk ) );
+//
+//        std::vector< int > inserted;
+//        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+//        CHECK( std20::ranges::equal( inserted, chunk ) );
+//      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/join.test.cpp b/src/tools/std20/views/test/join.test.cpp
@@ -69,6 +69,16 @@ SCENARIO( "join_view" ) {
 
         CHECK( std20::ranges::equal( chunk, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -123,6 +133,16 @@ SCENARIO( "join_view" ) {
 
         CHECK( std20::ranges::equal( chunk, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -177,6 +197,16 @@ SCENARIO( "join_view" ) {
 
         CHECK( std20::ranges::equal( chunk, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/ref.test.cpp b/src/tools/std20/views/test/ref.test.cpp
@@ -82,6 +82,16 @@ SCENARIO( "ref_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -145,6 +155,16 @@ SCENARIO( "ref_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -216,6 +236,16 @@ SCENARIO( "ref_view" ) {
         CHECK(  4 == chunk[3] );
         CHECK(  6 == chunk[4] );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO
diff --git a/src/tools/std20/views/test/reverse.test.cpp b/src/tools/std20/views/test/reverse.test.cpp
@@ -75,6 +75,16 @@ SCENARIO( "reverse_view" ) {
         CHECK( std20::ranges::equal( chunk, modified ) );
         CHECK( std20::ranges::equal( values, modified ) );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 
@@ -144,6 +154,16 @@ SCENARIO( "reverse_view" ) {
         CHECK(  2 == chunk[3] );
         CHECK(  2 == chunk[4] );
       } // THEN
+
+      THEN( "it can be transformed into a vector using iterators" ) {
+
+        std::vector< int > constructed( chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( constructed, chunk ) );
+
+        std::vector< int > inserted;
+        inserted.insert( inserted.end(), chunk.begin(), chunk.end() );
+        CHECK( std20::ranges::equal( inserted, chunk ) );
+      }
     } // WHEN
   } // GIVEN
 } // SCENARIO