Skip to content

Feature/zip #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whaeck merged 9 commits into from
Jun 19, 2024
Merged

Feature/zip #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cbdb29b
starting work on zip
whaeck May 15, 2024
7295433
Updates
whaeck May 31, 2024
b743448
adding test for forward and bidirectional ranges
whaeck May 31, 2024
38b89a8
removing lambda template arguments
whaeck May 31, 2024
a9f743d
More fixes
whaeck Jun 1, 2024
6c6cac4
More updates
whaeck Jun 1, 2024
ac1b427
Add == and != operators between S,I and I,S. Correct Tests and split
joewpeterson Jun 18, 2024
8fe3b04
Use standard where != returns !(left == right)
joewpeterson Jun 19, 2024
a636923
Fxing friend of friend issue in gcc
whaeck Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More fixes
  • Loading branch information
@whaeck
whaeck committed Jun 1, 2024
commit a9f743d3fe03c2df158789272cbba85339e43a2d
183 changes: 90 additions & 93 deletions src/tools/std23/views/test/zip.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,105 +15,102 @@ using namespace njoy::tools;

SCENARIO( "zip_view" ) {

// GIVEN( "a container with forward iterators" ) {
//
// std::vector< std::tuple< int, char, std::string > > equal = {
//
// { 1, 'a', "ab" },
// { 2, 'b', "cd" },
// { 3, 'c', "ef" },
// { 4, 'd', "gh" },
// { 5, 'e', "ij" },
// { 6, 'f', "kl" },
// { 7, 'g', "mn" }
// };
//
// std::forward_list< int > values1 = { 1, 2, 3, 4, 5, 6, 7 };
// std::forward_list< char > values2 = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' };
// std::forward_list< std::string > values3 = { "ab", "cd", "ef", "gh", "ij", "kl", "mn", "op" };
//
// WHEN( "when iterators are used" ) {
//
// auto chunk = std23::views::zip( values1, values2, values3 );
// using Range = decltype(chunk);
// using Iterator = std20::iterator_t< Range >;
//
// THEN( "the stride_view satisfies the required concepts" ) {
//
// CHECK( std20::ranges::range< Range > );
// CHECK( std20::ranges::view< Range > );
// CHECK( std20::ranges::sized_range< Range > );
// CHECK( std20::ranges::forward_range< Range > );
// CHECK( std20::ranges::bidirectional_range< Range > );
// CHECK( ! std20::ranges::random_access_range< Range > );
// CHECK( ! std20::ranges::contiguous_range< Range > );
// CHECK( std20::ranges::common_range< Range > );
// }
//
// THEN( "a stride_view can be constructed and members can be tested" ) {
//
// CHECK( 7 == chunk.size() );
//
GIVEN( "a container with forward iterators" ) {

std::vector< std::tuple< int, char, std::string > > equal = {

{ 1, 'a', "ab" },
{ 2, 'b', "cd" },
{ 3, 'c', "ef" },
{ 4, 'd', "gh" },
{ 5, 'e', "ij" },
{ 6, 'f', "kl" },
{ 7, 'g', "mn" }
};

std::forward_list< int > values1 = { 1, 2, 3, 4, 5, 6, 7 };
std::forward_list< char > values2 = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' };
std::forward_list< std::string > values3 = { "ab", "cd", "ef", "gh", "ij", "kl", "mn", "op" };

WHEN( "when iterators are used" ) {

auto chunk = std23::views::zip( values1, values2, values3 );
using Range = decltype(chunk);
using Iterator = std20::iterator_t< Range >;

THEN( "the stride_view satisfies the required concepts" ) {

CHECK( std20::ranges::range< Range > );
CHECK( std20::ranges::view< Range > );
CHECK( ! std20::ranges::sized_range< Range > );
CHECK( std20::ranges::forward_range< Range > );
CHECK( ! std20::ranges::bidirectional_range< Range > );
CHECK( ! std20::ranges::random_access_range< Range > );
CHECK( ! std20::ranges::contiguous_range< Range > );
CHECK( std20::ranges::common_range< Range > );
}

THEN( "a stride_view can be constructed and members can be tested" ) {

// CHECK( false == chunk.empty() );
// CHECK( true == bool( chunk ) );
//
// CHECK( std20::ranges::equal( equal, chunk ) );
//

CHECK( std20::ranges::equal( equal, chunk ) );

// CHECK( equal[0] == chunk.front() );
// CHECK( equal[6] == chunk.back() );
// } // THEN
// } // WHEN
// } // GIVEN

// GIVEN( "a container with bidirectional iterators" ) {
//
// std::vector< std::tuple< int, char, std::string > > equal = {
//
// { 1, 'a', "ab" },
// { 2, 'b', "cd" },
// { 3, 'c', "ef" },
// { 4, 'd', "gh" },
// { 5, 'e', "ij" },
// { 6, 'f', "kl" },
// { 7, 'g', "mn" }
// };
//
// std::list< int > values1 = { 1, 2, 3, 4, 5, 6, 7 };
// std::list< char > values2 = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' };
// std::list< std::string > values3 = { "ab", "cd", "ef", "gh", "ij", "kl", "mn", "op" };
//
// WHEN( "when iterators are used" ) {
//
// auto chunk = std23::views::zip( values1, values2, values3 );
// using Range = decltype(chunk);
// using Iterator = std20::iterator_t< Range >;
//
// THEN( "the stride_view satisfies the required concepts" ) {
//
// CHECK( std20::ranges::range< Range > );
// CHECK( std20::ranges::view< Range > );
// CHECK( std20::ranges::sized_range< Range > );
// CHECK( std20::ranges::forward_range< Range > );
// CHECK( std20::ranges::bidirectional_range< Range > );
// CHECK( ! std20::ranges::random_access_range< Range > );
// CHECK( ! std20::ranges::contiguous_range< Range > );
// CHECK( std20::ranges::common_range< Range > );
// }
//
// THEN( "a stride_view can be constructed and members can be tested" ) {
//
// CHECK( 7 == chunk.size() );
//
} // THEN
} // WHEN
} // GIVEN

GIVEN( "a container with bidirectional iterators" ) {

std::vector< std::tuple< int, char, std::string > > equal = {

{ 1, 'a', "ab" },
{ 2, 'b', "cd" },
{ 3, 'c', "ef" },
{ 4, 'd', "gh" },
{ 5, 'e', "ij" },
{ 6, 'f', "kl" },
{ 7, 'g', "mn" }
};

std::list< int > values1 = { 1, 2, 3, 4, 5, 6, 7 };
std::list< char > values2 = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' };
std::list< std::string > values3 = { "ab", "cd", "ef", "gh", "ij", "kl", "mn", "op" };

WHEN( "when iterators are used" ) {

auto chunk = std23::views::zip( values1, values2, values3 );
using Range = decltype(chunk);
using Iterator = std20::iterator_t< Range >;

THEN( "the stride_view satisfies the required concepts" ) {

CHECK( std20::ranges::range< Range > );
CHECK( std20::ranges::view< Range > );
CHECK( std20::ranges::sized_range< Range > );
CHECK( std20::ranges::forward_range< Range > );
CHECK( std20::ranges::bidirectional_range< Range > );
CHECK( ! std20::ranges::random_access_range< Range > );
CHECK( ! std20::ranges::contiguous_range< Range > );
CHECK( std20::ranges::common_range< Range > );
}

THEN( "a stride_view can be constructed and members can be tested" ) {

CHECK( 7 == chunk.size() );

// CHECK( false == chunk.empty() );
// CHECK( true == bool( chunk ) );
//
// CHECK( std20::ranges::equal( equal, chunk ) );
//
// CHECK( equal[0] == chunk.front() );

CHECK( std20::ranges::equal( equal, chunk ) );

CHECK( equal[0] == chunk.front() );
// CHECK( equal[6] == chunk.back() );
// } // THEN
// } // WHEN
// } // GIVEN
} // THEN
} // WHEN
} // GIVEN

GIVEN( "a container with random access iterators" ) {

Expand Down
Loading