diff options
| author | Lester Solbakken <lesters@users.noreply.github.com> | 2019-09-26 22:14:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 22:14:31 +0200 |
| commit | 29ccb5bd910fcbbf1a874a0855b51eb16b7bab25 (patch) | |
| tree | e0b4482c6640a86c39840832a17024e61bd853d7 /model-integration | |
| parent | 4fadd99eca043ceb8fbc0d796bc6542a69de6ddd (diff) | |
| parent | e44a0e7e2e662a3c82fcd6852a05523321e4ca93 (diff) | |
Merge pull request #10785 from vespa-engine/lesters/avoid-renaming-missing-dimensions
Lesters/avoid renaming missing dimensions
Diffstat (limited to 'model-integration')
4 files changed, 4 insertions, 4 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Argument.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Argument.java index 9f62a27a3b9..dad4508bc61 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Argument.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Argument.java @@ -67,7 +67,7 @@ public class Argument extends IntermediateOperation { @Override public String toFullString() { - return "\t" + lazyGetType() + ":\tArgument(" + standardNamingType + ")"; + return "\t" + type + ":\tArgument(" + standardNamingType + ")"; } } diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java index 3ad5cb1d19f..fc895b07d53 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Const.java @@ -102,7 +102,7 @@ public class Const extends IntermediateOperation { @Override public String toFullString() { - return "\t" + lazyGetType() + ":\tConst(" + type + ")"; + return "\t" + type + ":\tConst(" + getConstantValue().get() + ")"; } } diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Constant.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Constant.java index 1eaaf705220..ad56eefe5f2 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Constant.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Constant.java @@ -74,7 +74,7 @@ public class Constant extends IntermediateOperation { @Override public String toFullString() { - return "\t" + lazyGetType() + ":\tConstant(" + type + ")"; + return "\t" + type + ":\tConstant(" + type + ")"; } } diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java index 9c9fed89585..26b376cce1c 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java @@ -226,7 +226,7 @@ public abstract class IntermediateOperation { } public String toFullString() { - return "\t" + lazyGetType() + ":\t" + operationName() + "(" + + return "\t" + type + ":\t" + operationName() + "(" + inputs().stream().map(input -> input.toFullString()).collect(Collectors.joining(", ")) + ")"; } |