diff options
author | Harald Musum <musum@yahoo-inc.com> | 2018-02-21 23:43:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-21 23:43:02 +0100 |
commit | fdff142dab4a75ace0623c2c8bf513a0a4597aca (patch) | |
tree | 0101a275869dd270a1609d1199381e0137e5d1f6 /vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | |
parent | 2238f0d8d3b8a07e5e9d0ce1a01fc7f3e149cece (diff) |
Revert "Bratseth/typecheck all 3"
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java index 17e1c103ea3..7812c985091 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java @@ -95,12 +95,12 @@ public class Join extends PrimitiveTensorFunction { } @Override - public <NAMETYPE extends TypeContext.Name> TensorType type(TypeContext<NAMETYPE> context) { + public TensorType type(TypeContext context) { return new TensorType.Builder(argumentA.type(context), argumentB.type(context)).build(); } @Override - public <NAMETYPE extends TypeContext.Name> Tensor evaluate(EvaluationContext<NAMETYPE> context) { + public Tensor evaluate(EvaluationContext context) { Tensor a = argumentA.evaluate(context); Tensor b = argumentB.evaluate(context); TensorType joinedType = new TensorType.Builder(a.type(), b.type()).build(); |