diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-23 16:39:12 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-23 16:39:12 +0200 |
commit | 1add8de05a3307061d171c16be069ed387ef430b (patch) | |
tree | e31149f50c0abdf253aac94a1ca46b1de464cdbe /model-evaluation | |
parent | add33b21c48ee8c34e2ca7cfb2f36ec3620f93f4 (diff) |
Clean up terminology
Diffstat (limited to 'model-evaluation')
3 files changed, 15 insertions, 15 deletions
diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/FunctionEvaluator.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/FunctionEvaluator.java index c0f96dfb161..994f6dd9b64 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/FunctionEvaluator.java +++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/FunctionEvaluator.java @@ -66,10 +66,10 @@ public class FunctionEvaluator { * @param value the default value * @return this for chaining */ - public FunctionEvaluator setUnboundValue(Tensor value) { + public FunctionEvaluator setMissingValue(Tensor value) { if (evaluated) - throw new IllegalStateException("Cannot change the unbound value in a used evaluator"); - context.setUnboundValue(value); + throw new IllegalStateException("Cannot change the missing value in a used evaluator"); + context.setMissingValue(value); return this; } @@ -79,8 +79,8 @@ public class FunctionEvaluator { * @param value the default value * @return this for chaining */ - public FunctionEvaluator setUnboundValue(double value) { - return setUnboundValue(Tensor.Builder.of(TensorType.empty).cell(value).build()); + public FunctionEvaluator setMissingValue(double value) { + return setMissingValue(Tensor.Builder.of(TensorType.empty).cell(value).build()); } public Tensor evaluate() { diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java index 6b821cb95f2..d66315ef457 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java +++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java @@ -50,8 +50,8 @@ public final class LazyArrayContext extends Context implements ContextIndex { * Sets the value to use for lookups to existing values which are not set in this context. * The default value that will be returned is NaN */ - public void setUnboundValue(Tensor value) { - indexedBindings.setUnboundValue(value); + public void setMissingValue(Tensor value) { + indexedBindings.setMissingValue(value); } /** @@ -130,7 +130,7 @@ public final class LazyArrayContext extends Context implements ContextIndex { /** Returns the value which should be used when no value is set */ public Value defaultValue() { - return indexedBindings.defaultValue; + return indexedBindings.missingValue; } /** @@ -156,7 +156,7 @@ public final class LazyArrayContext extends Context implements ContextIndex { private static final Value missing = new DoubleValue(Double.NaN).freeze(); /** The value to return for lookups where no value is set (default: NaN) */ - private Value defaultValue = new DoubleValue(Double.NaN).freeze(); + private Value missingValue = new DoubleValue(Double.NaN).freeze(); private IndexedBindings(ImmutableMap<String, Integer> nameToIndex, Value[] values, @@ -207,8 +207,8 @@ public final class LazyArrayContext extends Context implements ContextIndex { } } - private void setUnboundValue(Tensor value) { - defaultValue = new TensorValue(value).freeze(); + private void setMissingValue(Tensor value) { + missingValue = new TensorValue(value).freeze(); } private void extractBindTargets(ExpressionNode node, @@ -251,7 +251,7 @@ public final class LazyArrayContext extends Context implements ContextIndex { Value get(int index) { Value value = values[index]; - return value == missing ? defaultValue : value; + return value == missing ? missingValue : value; } void set(int index, Value value) { diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java index 4e31dd89e6a..6fcf76d2815 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java @@ -38,7 +38,7 @@ public class ModelsEvaluatorTest { /** Tests a function defined as 4 * (var1 + var2) */ @Test - public void testSettingDefaultVariableValue() { + public void testSettingMissingValue() { ModelsEvaluator models = createModels("src/test/resources/config/rankexpression/"); { @@ -48,13 +48,13 @@ public class ModelsEvaluatorTest { { FunctionEvaluator function = models.evaluatorOf("macros", "secondphase"); - function.setUnboundValue(5); + function.setMissingValue(5); assertEquals(40.0, function.evaluate().asDouble(), delta); } { FunctionEvaluator function = models.evaluatorOf("macros", "secondphase"); - function.setUnboundValue(5); + function.setMissingValue(5); function.bind("match", 3); assertEquals(32.0, function.evaluate().asDouble(), delta); } |