Merge pull request xtensor-stack#79 from JohanMabille/tensor_fix

SylvainCorlay · web-flow · commit b97a4b13819c · 2017-04-13T00:28:21.000+02:00
extended copy constructor tests
diff --git a/test/test_pyarray.cpp b/test/test_pyarray.cpp
@@ -9,6 +9,7 @@
 #include "gtest/gtest.h"
 #include "test_common.hpp"
 #include "xtensor-python/pyarray.hpp"
+#include "xtensor/xarray.hpp"
 
 namespace xt
 {
@@ -140,6 +141,17 @@ namespace xt
         }
     }
 
+    TEST(pyarray, extended_constructor)
+    {
+        xt::xarray<int> a1 = { { 1, 2 },{ 3, 4 } };
+        xt::xarray<int> a2 = { { 1, 2 },{ 3, 4 } };
+        pyarray<int> c = a1 + a2;
+        EXPECT_EQ(c(0, 0), a1(0, 0) + a2(0, 0));
+        EXPECT_EQ(c(0, 1), a1(0, 1) + a2(0, 1));
+        EXPECT_EQ(c(1, 0), a1(1, 0) + a2(1, 0));
+        EXPECT_EQ(c(1, 1), a1(1, 1) + a2(1, 1));
+    }
+
     TEST(pyarray, reshape)
     {
         pyarray<int> a;
diff --git a/test/test_pytensor.cpp b/test/test_pytensor.cpp
@@ -9,6 +9,7 @@
 #include "gtest/gtest.h"
 #include "test_common.hpp"
 #include "xtensor-python/pytensor.hpp"
+#include "xtensor/xtensor.hpp"
 
 namespace xt
 {
@@ -139,6 +140,17 @@ namespace xt
         }
     }
 
+    TEST(pytensor, extended_constructor)
+    {
+        xt::xtensor<int, 2> a1 = { {1, 2}, {3, 4} };
+        xt::xtensor<int, 2> a2 = { {1, 2}, {3, 4} };
+        pytensor<int, 2> c = a1 + a2;
+        EXPECT_EQ(c(0, 0), a1(0, 0) + a2(0, 0));
+        EXPECT_EQ(c(0, 1), a1(0, 1) + a2(0, 1));
+        EXPECT_EQ(c(1, 0), a1(1, 0) + a2(1, 0));
+        EXPECT_EQ(c(1, 1), a1(1, 1) + a2(1, 1));
+    }
+
     TEST(pytensor, reshape)
     {
         pytensor<int, 3> a;
@@ -180,4 +192,5 @@ namespace xt
         pytensor<int, 3> a;
         EXPECT_EQ(0, a());
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#include "gtest/gtest.h"`
`10`	`10`	`#include "test_common.hpp"`
`11`	`11`	`#include "xtensor-python/pyarray.hpp"`
	`12`	`+#include "xtensor/xarray.hpp"`
`12`	`13`
`13`	`14`	`namespace xt`
`14`	`15`	`{`
`@@ -140,6 +141,17 @@ namespace xt`
`140`	`141`	`}`
`141`	`142`	`}`
`142`	`143`
	`144`	`+ TEST(pyarray, extended_constructor)`
	`145`	`+ {`
	`146`	`+ xt::xarray<int> a1 = { { 1, 2 },{ 3, 4 } };`
	`147`	`+ xt::xarray<int> a2 = { { 1, 2 },{ 3, 4 } };`
	`148`	`+ pyarray<int> c = a1 + a2;`
	`149`	`+ EXPECT_EQ(c(0, 0), a1(0, 0) + a2(0, 0));`
	`150`	`+ EXPECT_EQ(c(0, 1), a1(0, 1) + a2(0, 1));`
	`151`	`+ EXPECT_EQ(c(1, 0), a1(1, 0) + a2(1, 0));`
	`152`	`+ EXPECT_EQ(c(1, 1), a1(1, 1) + a2(1, 1));`
	`153`	`+ }`
	`154`	`+`
`143`	`155`	`TEST(pyarray, reshape)`
`144`	`156`	`{`
`145`	`157`	`pyarray<int> a;`