diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-04-03 21:30:28 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-04-03 21:30:28 +0200 |
| commit | 5792d3a23890edaa5d32b0f6bfc726c3e9956f3a (patch) | |
| tree | 2b65d4f48b92bf7ec846b3efd5d5259244bc234a /searchlib/src/test | |
| parent | 6eb80166172e10255841fd3d3cf70bed09d3d8c1 (diff) | |
Add tensor value type
Diffstat (limited to 'searchlib/src/test')
2 files changed, 3 insertions, 1 deletions
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java index f2122bb5da9..f7e38862883 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java @@ -238,6 +238,8 @@ public class EvaluationTestCase { "{{x:0}:1}", "{}", "{{y:0,z:0}:1}"); tester.assertEvaluates("tensor(x{}):{}", "tensor0 * tensor1", "{ {x:0}:3 }", "tensor(x{}):{ {x:1}:5 }"); + tester.assertEvaluates("tensor<float>(x{}):{}", + "tensor0 * tensor1", "{ {x:0}:3 }", "tensor<float>(x{}):{ {x:1}:5 }"); tester.assertEvaluates("{ {x:0}:15 }", "tensor0 * tensor1", "{ {x:0}:3 }", "{ {x:0}:5 }"); tester.assertEvaluates("{ {x:0,y:0}:15 }", diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java index ba0db4de5e1..488930a8eb9 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java @@ -40,7 +40,7 @@ public class EvaluationTester { int argumentIndex = 0; for (String argumentString : tensorArgumentStrings) { Tensor argument; - if (argumentString.startsWith("tensor(")) // explicitly decided type + if (argumentString.startsWith("tensor")) // explicitly decided type argument = Tensor.from(argumentString); else // use mappedTensors+dimensions in tensor to decide type argument = Tensor.from(typeFrom(argumentString, mappedTensors), argumentString); |