From cee1c3a3804d5d3c25407b3c4ac64228e9d194e3 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 12 Jun 2019 18:49:11 +0200 Subject: Require constant() for large constants and fix a type resolving bug (#9769) * Require constant() for large constants and fix a type resolving bug * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise * Remove noise --- .../ai/vespa/rankingexpression/importer/vespa/VespaImportTestCase.java | 2 +- model-integration/src/test/models/vespa/example.model | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'model-integration') 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 25a24792432..c7210e6710a 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) * constant1asLarge, max, x) * constant2", + assertEquals("reduce(reduce(input1 * input2, sum, name) * constant(constant1asLarge), max, x) * constant2", model.expressions().get("foo2").getRoot().toString()); List functions = model.outputExpressions(); diff --git a/model-integration/src/test/models/vespa/example.model b/model-integration/src/test/models/vespa/example.model index 6d660732db9..269ed83b695 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) * constant1asLarge, max, x) * constant2 + expression: reduce(sum(input1 * input2, name) * constant(constant1asLarge), max, x) * constant2 } } \ No newline at end of file -- cgit v1.2.3