diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2018-02-22 16:20:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 16:20:48 +0100 |
commit | 1791ba9fc169c821bee826ed39d9a42ffa03def0 (patch) | |
tree | 4601457cb3cdf0cc2a4b84efc44668748edfd8f3 /vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java | |
parent | 7358ce6a49eedf51b3761a855921c58a5f813321 (diff) |
Revert "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 7812c985091..17e1c103ea3 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 TensorType type(TypeContext context) { + public <NAMETYPE extends TypeContext.Name> TensorType type(TypeContext<NAMETYPE> context) { return new TensorType.Builder(argumentA.type(context), argumentB.type(context)).build(); } @Override - public Tensor evaluate(EvaluationContext context) { + public <NAMETYPE extends TypeContext.Name> Tensor evaluate(EvaluationContext<NAMETYPE> context) { Tensor a = argumentA.evaluate(context); Tensor b = argumentB.evaluate(context); TensorType joinedType = new TensorType.Builder(a.type(), b.type()).build(); |