Added support for tensor concatenation as lvalue

1 files changed, 21 insertions, 0 deletions

diff --git a/unsupported/test/cxx11_tensor_concatenation.cpp b/unsupported/test/cxx11_tensor_concatenation.cpp
index 9fdf33c16..cc9dfb769 100644
--- a/unsupported/test/cxx11_tensor_concatenation.cpp
+++ b/unsupported/test/cxx11_tensor_concatenation.cpp
@@ -103,6 +103,25 @@ static void test_simple_concatenation()
 // TODO(phli): Add test once we have a real vectorized implementation.
 // static void test_vectorized_concatenation() {}
 
+static void test_concatenation_as_lvalue()
+{
+  Tensor<int, 2> t1(2, 3);
+  Tensor<int, 2> t2(2, 3);
+  t1.setRandom();
+  t2.setRandom();
+
+  Tensor<int, 2> result(4, 3);
+  result.setRandom();
+  t1.concatenate(t2, 0) = result;
+
+  for (int i = 0; i < 2; ++i) {
+    for (int j = 0; j < 3; ++j) {
+      VERIFY_IS_EQUAL(t1(i, j), result(i, j));
+      VERIFY_IS_EQUAL(t2(i, j), result(i+2, j));
+    }
+  }
+}
+
 
 void test_cxx11_tensor_concatenation()
 {
@@ -113,4 +132,6 @@ void test_cxx11_tensor_concatenation()
    CALL_SUBTEST(test_simple_concatenation<ColMajor>());
    CALL_SUBTEST(test_simple_concatenation<RowMajor>());
    // CALL_SUBTEST(test_vectorized_concatenation());
+   CALL_SUBTEST(test_concatenation_as_lvalue());
+
 }