More explanation on type mismatch

4 files changed, 5 insertions, 7 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TensorFlowImporter.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TensorFlowImporter.java
index 4ec23f98fc5..e3c72830095 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TensorFlowImporter.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TensorFlowImporter.java
@@ -255,7 +255,7 @@ public class TensorFlowImporter {
             }
             catch (ParseException e) {
                 throw new RuntimeException("Tensorflow function " + function +
-                        " cannot be parsed as a ranking expression", e);
+                                           " cannot be parsed as a ranking expression", e);
             }
         }
     }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/ConcatV2.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/ConcatV2.java
index a394662800e..4f5d61d75f9 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/ConcatV2.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/ConcatV2.java
@@ -28,12 +28,12 @@ public class ConcatV2 extends TensorFlowOperation {
         TensorFlowOperation concatDimOp = inputs.get(inputs.size() - 1);  // ConcatV2: concat dimension is the last input
         if (!concatDimOp.getConstantValue().isPresent()) {
             throw new IllegalArgumentException("ConcatV2 in " + node.getName() + ": " +
-                    "concat dimension must be a constant.");
+                                               "concat dimension must be a constant.");
         }
         Tensor concatDimTensor = concatDimOp.getConstantValue().get().asTensor();
         if (concatDimTensor.type().rank() != 0) {
             throw new IllegalArgumentException("ConcatV2 in " + node.getName() + ": " +
-                    "concat dimension must be a scalar.");
+                                               "concat dimension must be a scalar.");
         }
 
         OrderedTensorType aType = inputs.get(0).type().get();
@@ -45,7 +45,7 @@ public class ConcatV2 extends TensorFlowOperation {
             OrderedTensorType bType = inputs.get(i).type().get();
             if (bType.rank() != aType.rank()) {
                 throw new IllegalArgumentException("ConcatV2 in " + node.getName() + ": " +
-                        "inputs must have save rank.");
+                                                   "inputs must have save rank.");
             }
             for (int j = 0; j < aType.rank(); ++j) {
                 long dimSizeA = aType.dimensions().get(j).size().orElse(-1L);
@@ -54,7 +54,7 @@ public class ConcatV2 extends TensorFlowOperation {
                     concatDimSize += dimSizeB;
                 } else if (dimSizeA != dimSizeB) {
                     throw new IllegalArgumentException("ConcatV2 in " + node.getName() + ": " +
-                            "input dimension " + j + " differs in input tensors.");
+                                                       "input dimension " + j + " differs in input tensors.");
                 }
             }
         }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/Placeholder.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/Placeholder.java
index eb4b615b434..1619c11427a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/Placeholder.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/Placeholder.java
@@ -53,5 +53,4 @@ public class Placeholder extends TensorFlowOperation {
         return false;
     }
 
-
 }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/PlaceholderWithDefault.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/PlaceholderWithDefault.java
index f74d1d6cb75..65ce7f00e34 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/PlaceholderWithDefault.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/importer/operations/PlaceholderWithDefault.java
@@ -1,7 +1,6 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchlib.rankingexpression.integration.tensorflow.importer.operations;
 
-import com.yahoo.searchlib.rankingexpression.RankingExpression;
 import com.yahoo.searchlib.rankingexpression.integration.tensorflow.importer.OrderedTensorType;
 import com.yahoo.tensor.functions.TensorFunction;
 import org.tensorflow.framework.NodeDef;