Revert "Bratseth/tensorflow models"

6 files changed, 29 insertions, 26 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
index 1e44a8fa64d..fc1bbace092 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
@@ -1,16 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.fastsearch;
 
-import com.yahoo.container.search.LegacyEmulationConfig;
-import com.yahoo.data.access.Inspector;
-import com.yahoo.log.LogLevel;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
+import com.yahoo.data.access.Inspector;
+import com.yahoo.container.search.LegacyEmulationConfig;
+
+import com.yahoo.log.LogLevel;
 
 /**
  * @author Bjørn Borud
@@ -25,7 +25,7 @@ public abstract class DocsumField {
 
         Map<String, Constructor<? extends DocsumField>> constructors = new HashMap<>();
 
-        void put(String typename, Class<? extends DocsumField> fieldClass)
+        void put(String typename, Class<? extends DocsumField> fieldClass) 
                 throws NoSuchMethodException, SecurityException {
             Constructor<? extends DocsumField> constructor = fieldClass.getConstructor(String.class);
             constructors.put(typename, constructor);
@@ -106,7 +106,7 @@ public abstract class DocsumField {
     public abstract Object decode(ByteBuffer b);
 
     /**
-     * Get the number of bytes this field occupies in the given buffer
+     * Get the number of bytes this field occupies in the given buffer 
      * AND SET(!) the position to the first byte after this field.
      */
     public abstract int getLength(ByteBuffer b);
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 692e93bed7e..1524a4da426 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -109,7 +109,7 @@ public class FastHit extends Hit {
 
     /**
      * Returns the explicitly set uri if available, returns "index:[source]/[partid]/[id]" otherwise
-     *
+     * 
      * @return uri of hit
      */
     public URI getUri() {
@@ -128,9 +128,9 @@ public class FastHit extends Hit {
     }
 
     /**
-     * The uri of the index location of this hit ("index:[source]/[partid]/[id]").
+     * The uri of the index location of this hit ("index:[source]/[partid]/[id]"). 
      * This is the uri if no other uri is assigned
-     *
+     * 
      * @return uri to the index.
      */
     public URI getIndexUri() {
@@ -215,7 +215,7 @@ public class FastHit extends Hit {
      *     The empty string ("") if no value is assigned in the document.
      *
      *     <li><b>Dynamic summary string fields</b>: A Java String before JuniperSearcher and a HitField after.</li>
-     *
+     *     
      *     <li><b>Numerics</b>: The corresponding numeric Java type.<br>
      *     If the field has <i>no value</i> assigned in the document,
      *     the special numeric {@link com.yahoo.search.result.NanNumber#NaN} is returned.
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java
index d8b38667224..e0ca7fbe6e1 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java
@@ -13,7 +13,7 @@ import java.util.Optional;
 /**
  * A tensor field. Tensors are encoded as a data field where the data (following the length)
  * is encoded in a tensor binary format defined by com.yahoo.tensor.serialization.TypedBinaryFormat
- *
+ * 
  * @author bratseth
  */
 public class TensorField extends DocsumField implements VariableLengthField {
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
index 0fd529bf262..0ec15b95b0d 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
@@ -16,7 +16,7 @@ import java.util.Optional;
 public class TensorFieldType extends FieldType {
 
     // TODO: Require tensor type
-
+    
     private final Optional<TensorType> type;
 
     /** Creates a tensor field type with optional information about the kind of tensor this will hold */
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
index 5494d1965f8..15a0fd60511 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
@@ -102,7 +102,7 @@ public class SlimeSummaryTestCase {
     public void testDecoding() {
         Tensor tensor1 = Tensor.from("tensor(x{},y{}):{{x:foo,y:bar}:0.1}");
         Tensor tensor2 = Tensor.from("tensor(x[],y[1]):{{x:0,y:0}:-0.3}");
-
+                
         String summary_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/summary.cfg";
         DocsumDefinitionSet set = createDocsumDefinitionSet(summary_cf);
         byte[] docsum = makeDocsum(tensor1, tensor2);
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index 62eacaa0afe..e59c03b33c3 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -2,6 +2,8 @@
 package com.yahoo.search.test;
 
 import com.yahoo.component.chain.Chain;
+import com.yahoo.language.Language;
+import com.yahoo.language.Linguistics;
 import com.yahoo.language.detect.Detection;
 import com.yahoo.language.detect.Detector;
 import com.yahoo.language.detect.Hint;
@@ -26,6 +28,7 @@ import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
+
 import com.yahoo.yolean.Exceptions;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -42,14 +45,14 @@ import java.util.stream.Collectors;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.fail;
 
 /**
@@ -66,7 +69,7 @@ public class QueryTestCase {
         assertEquals("", q.properties().get("aParameter"));
         assertNull(q.properties().get("notSetParameter"));
     }
-
+    
     // TODO: YQL work in progress (jon)
     @Ignore
     @Test
@@ -690,7 +693,7 @@ public class QueryTestCase {
         List<IndexedItem> l = QueryTree.getPositiveTerms(i);
         assertEquals(3, l.size());
     }
-
+    
     @Test
     public void testHeuristicLanguageDetectionTextExtraction() {
         assertDetectionText("b ", "a:b", "text:a", "text:default");
@@ -717,27 +720,27 @@ public class QueryTestCase {
         q.getModel().getQueryTree(); // cause parsing
         assertEquals(expectedDetectionText, mockLinguistics.detector.lastDetectionText);
     }
-
+    
     /** A linguistics instance which records the last language detection text passed to it */
     private static class MockLinguistics extends SimpleLinguistics {
 
         final MockDetector detector = new MockDetector();
-
+        
         @Override
         public Detector getDetector() { return detector; }
-
+        
     }
-
+    
     private static class MockDetector extends SimpleDetector {
 
         String lastDetectionText = null;
-
+        
         @Override
         public Detection detect(String input, Hint hint) {
             lastDetectionText = input;
             return super.detect(input, hint);
         }
-
+        
     }
 
     protected boolean contains(String lineSubstring,String[] lines) {