improve elements

Author: alfC

test/ranges_zip.cpp

@@ -24,7 +24,7 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-		auto zp = std::views::zip(arr1, arr2);
+		auto&& zp = std::views::zip(arr1, arr2);
 
 		auto [e1, e2] = zp[3];
 
@@ -35,12 +35,12 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-		auto es1 = arr1.elements();
-		auto es2 = arr2.elements();
+		auto&& es1 = arr1.elements();
+		auto&& es2 = arr2.elements();
 
-		auto zp = std::views::zip(arr1, arr2);
+		auto&& zp = std::views::zip(arr1, arr2);
 
-		auto [e1, e2] = zp[3];
+		auto&& [e1, e2] = zp[3];
 
 		BOOST_TEST( e1 == 5 );
 		BOOST_TEST( e2 == 6 );
@@ -49,9 +49,9 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-		auto zp = std::views::zip(arr1.elements(), arr2.elements());
+		auto&& zp = std::views::zip(arr1.elements(), arr2.elements());
 
-		auto [e1, e2] = zp[3];
+		auto&& [e1, e2] = zp[3];
 
 		BOOST_TEST( e1 == 5 );
 		BOOST_TEST( e2 == 6 );
@@ -60,9 +60,9 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-		auto zp = std::views::zip(arr1(), arr2());
+		auto&& zp = std::views::zip(arr1(), arr2());
 
-		auto [e1, e2] = zp[3];
+		auto&& [e1, e2] = zp[3];
 
 		BOOST_TEST( e1 == 5 );
 		BOOST_TEST( e2 == 6 );
@@ -74,9 +74,9 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		auto es1 = arr1().elements();
 		auto es2 = arr2().elements();
 
-		auto zp = std::views::zip(arr1, arr2);
+		auto&& zp = std::views::zip(es1, es2);
 
-		auto [e1, e2] = zp[3];
+		auto&& [e1, e2] = zp[3];
 
 		BOOST_TEST( e1 == 5 );
 		BOOST_TEST( e2 == 6 );
@@ -85,9 +85,45 @@ auto main() -> int {  // NOLINT(bugprone-exception-escape)
 		multi::array<int, 1> arr1({10}, 5);
 		multi::array<int, 1> arr2({10}, 6);
 
-		auto zp = std::views::zip(arr1().elements(), arr2().elements());
+		auto&& zp = std::views::zip(arr1().elements(), arr2().elements());
 
-		auto [e1, e2] = zp[3];
+		auto&& [e1, e2] = zp[3];
+
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
+		multi::array<int, 2> arr1({10, 10}, 5);
+		multi::array<int, 2> arr2({10, 10}, 6);
+
+		auto&& zp = std::views::zip(arr1.elements(), arr2.elements());
+
+		auto&& [e1, e2] = zp[3];
+
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
+		multi::array<int, 2> arr1({10, 10}, 5);
+		multi::array<int, 2> arr2({10, 10}, 6);
+
+		auto&& es1 = arr1().elements();
+		auto&& es2 = arr2().elements();
+
+		auto&& zp = std::views::zip(es1, es2);
+
+		auto&& [e1, e2] = zp[3];
+
+		BOOST_TEST( e1 == 5 );
+		BOOST_TEST( e2 == 6 );
+	}
+	{
+		multi::array<int, 2> arr1({10, 10}, 5);
+		multi::array<int, 2> arr2({10, 10}, 6);
+
+		auto&& zp = std::views::zip(arr1().elements(), arr2().elements());
+
+		auto&& [e1, e2] = zp[3];
 
 		BOOST_TEST( e1 == 5 );
 		BOOST_TEST( e2 == 6 );