encode -> embed

3 files changed, 64 insertions, 64 deletions

diff --git a/linguistics/abi-spec.json b/linguistics/abi-spec.json
index cfbf2abda1a..d257c451739 100644
--- a/linguistics/abi-spec.json
+++ b/linguistics/abi-spec.json
@@ -328,22 +328,22 @@
     ],
     "fields": []
   },
-  "com.yahoo.language.process.Encoder$FailingEncoder": {
+  "com.yahoo.language.process.Embedder$FailingEmbedder": {
     "superClass": "java.lang.Object",
     "interfaces": [
-      "com.yahoo.language.process.Encoder"
+      "com.yahoo.language.process.Embedder"
     ],
     "attributes": [
       "public"
     ],
     "methods": [
       "public void <init>()",
-      "public java.util.List encode(java.lang.String, com.yahoo.language.Language)",
-      "public com.yahoo.tensor.Tensor encode(java.lang.String, com.yahoo.language.Language, com.yahoo.tensor.TensorType)"
+      "public java.util.List embed(java.lang.String, com.yahoo.language.Language)",
+      "public com.yahoo.tensor.Tensor embed(java.lang.String, com.yahoo.language.Language, com.yahoo.tensor.TensorType)"
     ],
     "fields": []
   },
-  "com.yahoo.language.process.Encoder": {
+  "com.yahoo.language.process.Embedder": {
     "superClass": "java.lang.Object",
     "interfaces": [],
     "attributes": [
@@ -352,11 +352,11 @@
       "abstract"
     ],
     "methods": [
-      "public abstract java.util.List encode(java.lang.String, com.yahoo.language.Language)",
-      "public abstract com.yahoo.tensor.Tensor encode(java.lang.String, com.yahoo.language.Language, com.yahoo.tensor.TensorType)"
+      "public abstract java.util.List embed(java.lang.String, com.yahoo.language.Language)",
+      "public abstract com.yahoo.tensor.Tensor embed(java.lang.String, com.yahoo.language.Language, com.yahoo.tensor.TensorType)"
     ],
     "fields": [
-      "public static final com.yahoo.language.process.Encoder throwsOnUse"
+      "public static final com.yahoo.language.process.Embedder throwsOnUse"
     ]
   },
   "com.yahoo.language.process.GramSplitter$Gram": {
diff --git a/linguistics/src/main/java/com/yahoo/language/process/Embedder.java b/linguistics/src/main/java/com/yahoo/language/process/Embedder.java
new file mode 100644
index 00000000000..56c401a7c61
--- /dev/null
+++ b/linguistics/src/main/java/com/yahoo/language/process/Embedder.java
@@ -0,0 +1,56 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.language.process;
+
+import com.yahoo.language.Language;
+import com.yahoo.tensor.Tensor;
+import com.yahoo.tensor.TensorType;
+
+import java.util.List;
+
+/**
+ * An embedder converts a text string to a tensor
+ *
+ * @author bratseth
+ */
+public interface Embedder {
+
+    /** An instance of this which throws IllegalStateException if attempted used */
+    Embedder throwsOnUse = new FailingEmbedder();
+
+    /**
+     * Converts text into a list of token id's (a vector embedding)
+     *
+     * @param text the text to embed
+     * @param language the language of the text, or UNKNOWN to use language independent embedding
+     * @return the text embedded as a list of token ids
+     * @throws IllegalArgumentException if the language is not supported by this embedder
+     */
+    List<Integer> embed(String text, Language language);
+
+    /**
+     * Converts text into tokens in a tensor.
+     * The information contained in the embedding may depend on the tensor type.
+     *
+     * @param text the text to embed
+     * @param language the language of the text, or UNKNOWN to use language independent embedding
+     * @param tensorType the type of the tensor to be returned
+     * @return the tensor embedding of the text, as the spoecified tensor type
+     * @throws IllegalArgumentException if the language or tensor type is not supported by this embedder
+     */
+    Tensor embed(String text, Language language, TensorType tensorType);
+
+    class FailingEmbedder implements Embedder {
+
+        @Override
+        public List<Integer> embed(String text, Language language) {
+            throw new IllegalStateException("No embedder has been configured");
+        }
+
+        @Override
+        public Tensor embed(String text, Language language, TensorType tensorType) {
+            throw new IllegalStateException("No embedder has been configured");
+        }
+
+    }
+
+}
diff --git a/linguistics/src/main/java/com/yahoo/language/process/Encoder.java b/linguistics/src/main/java/com/yahoo/language/process/Encoder.java
deleted file mode 100644
index 27f73d15e54..00000000000
--- a/linguistics/src/main/java/com/yahoo/language/process/Encoder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.language.process;
-
-import com.yahoo.language.Language;
-import com.yahoo.tensor.Tensor;
-import com.yahoo.tensor.TensorType;
-
-import java.util.List;
-
-/**
- * An encoder converts a text string to a tensor or list of tokens
- *
- * @author bratseth
- */
-public interface Encoder {
-
-    /** An instance of this which throws IllegalStateException if attempted used */
-    Encoder throwsOnUse = new FailingEncoder();
-
-    /**
-     * Encodes text into tokens in a list of ids.
-     *
-     * @param text the text to encode
-     * @param language the language of the text, or UNKNOWN to use language independent encoding
-     * @return the text encoded to a list of segment ids
-     * @throws IllegalArgumentException if the language is not supported by this encoder
-     */
-    List<Integer> encode(String text, Language language);
-
-    /**
-     * Encodes text into tokens in a tensor.
-     * The information contained in the encoding may depend on the tensor type.
-     *
-     * @param text the text to encode
-     * @param language the language of the text, or UNKNOWN to use language independent encoding
-     * @param tensorType the type of the ttensor to be returned
-     * @return the tex encoded into a tensor of the supplied type
-     * @throws IllegalArgumentException if the language or tensor type is not supported by this encoder
-     */
-    Tensor encode(String text, Language language, TensorType tensorType);
-
-    class FailingEncoder implements Encoder {
-
-        @Override
-        public List<Integer> encode(String text, Language language) {
-            throw new IllegalStateException("No encoder has been configured");
-        }
-
-        @Override
-        public Tensor encode(String text, Language language, TensorType tensorType) {
-            throw new IllegalStateException("No encoder has been configured");
-        }
-
-    }
-
-}