aboutsummaryrefslogtreecommitdiffstats
path: root/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-11-29 09:39:06 -0800
committerJon Bratseth <bratseth@yahoo-inc.com>2017-11-29 09:39:06 -0800
commite0a9e9978266016823b33e1b4f3a6008b641feac (patch)
treec967f733ed0bf4308ab626891b48375af311630a /vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
parentdcc9ad075c80d207bec47567c8e45dcb775c7f5d (diff)
More functions. Cleanup.
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.java2
1 files changed, 1 insertions, 1 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 c89f63c0395..9a37127e1f0 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java
@@ -47,7 +47,7 @@ public class Join extends PrimitiveTensorFunction {
}
/** Returns the type resulting from applying Join to the two given types */
- public static TensorType resultType(TensorType a, TensorType b) {
+ public static TensorType outputType(TensorType a, TensorType b) {
TensorType.Builder typeBuilder = new TensorType.Builder();
for (int i = 0; i < a.dimensions().size(); ++i) {
TensorType.Dimension aDim = a.dimensions().get(i);