diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-06-12 20:33:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-12 20:33:45 +0200 |
commit | 6ad5df4f4a2ceebcfab47f6ae86d30dcf93efd4e (patch) | |
tree | 19bef88a22a7218c5620cc0f044c094d83379d17 /model-integration | |
parent | 9423f1774e10129522a7f2cc9995bc4778ee9da0 (diff) |
Revert "Require constant() for large constants and fix a type resolving bug (#9769)"
This reverts commit cee1c3a3804d5d3c25407b3c4ac64228e9d194e3.
Diffstat (limited to 'model-integration')
-rw-r--r-- | model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java | 2 | ||||
-rw-r--r-- | model-integration/src/test/models/vespa/example.model | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java index c7210e6710a..25a24792432 100644 --- a/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java +++ b/model-integration/src/test/java/ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java @@ -40,7 +40,7 @@ public class VespaImportTestCase { assertEquals(2, model.expressions().size()); assertEquals("reduce(reduce(input1 * input2, sum, name) * constant1, max, x) * constant2", model.expressions().get("foo1").getRoot().toString()); - assertEquals("reduce(reduce(input1 * input2, sum, name) * constant(constant1asLarge), max, x) * constant2", + assertEquals("reduce(reduce(input1 * input2, sum, name) * constant1asLarge, max, x) * constant2", model.expressions().get("foo2").getRoot().toString()); List<ImportedMlFunction> functions = model.outputExpressions(); diff --git a/model-integration/src/test/models/vespa/example.model b/model-integration/src/test/models/vespa/example.model index 269ed83b695..6d660732db9 100644 --- a/model-integration/src/test/models/vespa/example.model +++ b/model-integration/src/test/models/vespa/example.model @@ -19,7 +19,7 @@ model example { } function foo2() { - expression: reduce(sum(input1 * input2, name) * constant(constant1asLarge), max, x) * constant2 + expression: reduce(sum(input1 * input2, name) * constant1asLarge, max, x) * constant2 } }
\ No newline at end of file |