diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-06-13 07:12:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 07:12:23 +0200 |
| commit | 0e20abc33aa88066aedadd43b09353d115d5928b (patch) | |
| tree | 159df75408a4eb188b13a532fb42b8896083cfc9 /model-integration/src | |
| parent | 17b6704b20a073a4961baefd1be58dd48012bec4 (diff) | |
Revert "Revert "Require constant() for large constants and fix a type resolving bug""
Diffstat (limited to 'model-integration/src')
| -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 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<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 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 |