diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2019-02-15 13:42:08 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@verizonmedia.com> | 2019-02-15 13:42:08 +0000 |
| commit | ba34279931a2400be5485aebd3cd719909c5b3db (patch) | |
| tree | 4c0d58ae9f65f106467000d0908b5f5d3822b5e7 | |
| parent | 28cf7e4bc167b000d83f4511930261f35fd7159e (diff) | |
Rename MUL -> MULTIPLY to align with Java code.
| -rw-r--r-- | document/src/tests/documentupdatetestcase.cpp | 4 | ||||
| -rw-r--r-- | document/src/vespa/document/update/tensor_modify_update.cpp | 4 | ||||
| -rw-r--r-- | document/src/vespa/document/update/tensor_modify_update.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp index 1087c319765..e28869578fd 100644 --- a/document/src/tests/documentupdatetestcase.cpp +++ b/document/src/tests/documentupdatetestcase.cpp @@ -1060,7 +1060,7 @@ DocumentUpdateTest::tensor_modify_update_can_be_applied() .add({{"x", "b"}}, 8)); f.assertApplyUpdate(baseLine, - TensorModifyUpdate(TensorModifyUpdate::Operation::MUL, + TensorModifyUpdate(TensorModifyUpdate::Operation::MULTIPLY, f.makeTensor(f.spec().add({{"x", "b"}}, 5))), f.spec().add({{"x", "a"}}, 2) .add({{"x", "b"}}, 15)); @@ -1093,7 +1093,7 @@ DocumentUpdateTest::tensor_modify_update_can_be_roundtrip_serialized() TensorUpdateFixture f; f.assertRoundtripSerialize(TensorModifyUpdate(TensorModifyUpdate::Operation::REPLACE, f.makeBaselineTensor())); f.assertRoundtripSerialize(TensorModifyUpdate(TensorModifyUpdate::Operation::ADD, f.makeBaselineTensor())); - f.assertRoundtripSerialize(TensorModifyUpdate(TensorModifyUpdate::Operation::MUL, f.makeBaselineTensor())); + f.assertRoundtripSerialize(TensorModifyUpdate(TensorModifyUpdate::Operation::MULTIPLY, f.makeBaselineTensor())); } diff --git a/document/src/vespa/document/update/tensor_modify_update.cpp b/document/src/vespa/document/update/tensor_modify_update.cpp index 962543984d2..b75b2ceec60 100644 --- a/document/src/vespa/document/update/tensor_modify_update.cpp +++ b/document/src/vespa/document/update/tensor_modify_update.cpp @@ -44,7 +44,7 @@ getJoinFunction(TensorModifyUpdate::Operation operation) return replace; case Operation::ADD: return vespalib::eval::operation::Add::f; - case Operation::MUL: + case Operation::MULTIPLY: return vespalib::eval::operation::Mul::f; default: throw IllegalArgumentException("Bad operation", VESPA_STRLOC); @@ -61,7 +61,7 @@ getJoinFunctionName(TensorModifyUpdate::Operation operation) return "replace"; case Operation::ADD: return "add"; - case Operation::MUL: + case Operation::MULTIPLY: return "multiply"; default: throw IllegalArgumentException("Bad operation", VESPA_STRLOC); diff --git a/document/src/vespa/document/update/tensor_modify_update.h b/document/src/vespa/document/update/tensor_modify_update.h index dcb9bcf0470..c937e356ce4 100644 --- a/document/src/vespa/document/update/tensor_modify_update.h +++ b/document/src/vespa/document/update/tensor_modify_update.h @@ -18,9 +18,9 @@ class TensorModifyUpdate : public ValueUpdate { public: /** Declare all types of tensor modify updates. */ enum class Operation { // Operation to be applied to matching tensor cells - REPLACE = 0, - ADD = 1, - MUL = 2, + REPLACE = 0, + ADD = 1, + MULTIPLY = 2, MAX_NUM_OPERATIONS = 3 }; private: |