Implement add() function on vespalib::tensor::Tensor for adding a set of cells to the tensor.

Currently only supported for sparse tensor.

2 files changed, 54 insertions, 0 deletions

diff --git a/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt b/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt
new file mode 100644
index 00000000000..6c19b13db7e
--- /dev/null
+++ b/eval/src/tests/tensor/tensor_add_operation/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(eval_tensor_add_operation_test_app TEST
+    SOURCES
+    tensor_add_operation_test.cpp
+    DEPENDS
+    vespaeval
+)
+vespa_add_test(NAME eval_tensor_add_operation_test_app COMMAND eval_tensor_add_operation_test_app)
diff --git a/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp b/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp
new file mode 100644
index 00000000000..5d017fdcd5c
--- /dev/null
+++ b/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp
@@ -0,0 +1,46 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/eval/eval/tensor_spec.h>
+#include <vespa/eval/tensor/default_tensor_engine.h>
+#include <vespa/eval/tensor/sparse/sparse_tensor.h>
+#include <vespa/vespalib/testkit/test_kit.h>
+
+using vespalib::eval::Value;
+using vespalib::eval::TensorSpec;
+using namespace vespalib::tensor;
+
+std::unique_ptr<Tensor>
+makeTensor(const TensorSpec &spec)
+{
+    auto value = DefaultTensorEngine::ref().from_spec(spec);
+    const auto *tensor = dynamic_cast<const Tensor *>(value->as_tensor());
+    ASSERT_TRUE(tensor);
+    value.release();
+    return std::unique_ptr<Tensor>(const_cast<Tensor *>(tensor));
+}
+
+void
+assertAdd(const TensorSpec &source, const TensorSpec &arg, const TensorSpec &expected)
+{
+    auto sourceTensor = makeTensor(source);
+    auto argTensor = makeTensor(arg);
+    auto resultTensor = sourceTensor->add(*argTensor);
+    auto actual = resultTensor->toSpec();
+    EXPECT_EQUAL(actual, expected);
+}
+
+TEST("require that cells can be added to a sparse tensor")
+{
+    assertAdd(TensorSpec("tensor(x{},y{})")
+                      .add({{"x","a"},{"y","b"}}, 2)
+                      .add({{"x","c"},{"y","d"}}, 3),
+              TensorSpec("tensor(x{},y{})")
+                      .add({{"x","a"},{"y","b"}}, 5)
+                      .add({{"x","e"},{"y","f"}}, 7),
+              TensorSpec("tensor(x{},y{})")
+                      .add({{"x","a"},{"y","b"}}, 5)
+                      .add({{"x","c"},{"y","d"}}, 3)
+                      .add({{"x","e"},{"y","f"}}, 7));
+}
+
+TEST_MAIN() { TEST_RUN_ALL(); }