You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by to...@apache.org on 2017/12/15 09:49:09 UTC
[opennlp] branch master updated: OPENNLP-1167 - Remove
WV#toDouble/FloatArray (#295)
This is an automated email from the ASF dual-hosted git repository.
tommaso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/opennlp.git
The following commit(s) were added to refs/heads/master by this push:
new 30b6759 OPENNLP-1167 - Remove WV#toDouble/FloatArray (#295)
30b6759 is described below
commit 30b6759387b4402987f6f4a6100fdc78e8bf755f
Author: Tommaso Teofili <to...@gmail.com>
AuthorDate: Fri Dec 15 10:49:07 2017 +0100
OPENNLP-1167 - Remove WV#toDouble/FloatArray (#295)
---
.../tools/util/wordvector/DoubleArrayVector.java | 16 +++-------------
.../tools/util/wordvector/FloatArrayVector.java | 18 ++++--------------
.../java/opennlp/tools/util/wordvector/WordVector.java | 3 ---
.../opennlp/tools/util/wordvector/WordVectorTable.java | 1 +
4 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/DoubleArrayVector.java b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/DoubleArrayVector.java
index dcbee86..79d03a3 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/DoubleArrayVector.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/DoubleArrayVector.java
@@ -44,27 +44,17 @@ class DoubleArrayVector implements WordVector {
}
@Override
- public float[] toFloatArray() {
+ public FloatBuffer toFloatBuffer() {
float[] floatVector = new float[vector.length];
for (int i = 0; i < floatVector.length ; i++) {
floatVector[i] = (float) vector[i];
}
- return floatVector;
- }
-
- @Override
- public double[] toDoubleArray() {
- return toDoubleBuffer().array();
- }
-
- @Override
- public FloatBuffer toFloatBuffer() {
- return FloatBuffer.wrap(toFloatArray()).asReadOnlyBuffer();
+ return FloatBuffer.wrap(floatVector).asReadOnlyBuffer();
}
@Override
public DoubleBuffer toDoubleBuffer() {
- return DoubleBuffer.wrap(vector);
+ return DoubleBuffer.wrap(vector).asReadOnlyBuffer();
}
@Override
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/FloatArrayVector.java b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/FloatArrayVector.java
index c6be1f1..0ee7287 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/FloatArrayVector.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/FloatArrayVector.java
@@ -44,27 +44,17 @@ class FloatArrayVector implements WordVector {
}
@Override
- public float[] toFloatArray() {
- return toFloatBuffer().array();
+ public FloatBuffer toFloatBuffer() {
+ return FloatBuffer.wrap(vector).asReadOnlyBuffer();
}
@Override
- public double[] toDoubleArray() {
+ public DoubleBuffer toDoubleBuffer() {
double[] doubleVector = new double[vector.length];
for (int i = 0; i < doubleVector.length ; i++) {
doubleVector[i] = vector[i];
}
- return doubleVector;
- }
-
- @Override
- public FloatBuffer toFloatBuffer() {
- return FloatBuffer.wrap(vector).asReadOnlyBuffer();
- }
-
- @Override
- public DoubleBuffer toDoubleBuffer() {
- return DoubleBuffer.wrap(toDoubleArray());
+ return DoubleBuffer.wrap(doubleVector).asReadOnlyBuffer();
}
@Override
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVector.java b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVector.java
index 94acb54..fea95b1 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVector.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVector.java
@@ -35,9 +35,6 @@ public interface WordVector {
float getAsFloat(int index);
double getAsDouble(int index);
- float[] toFloatArray();
- double[] toDoubleArray();
-
FloatBuffer toFloatBuffer();
DoubleBuffer toDoubleBuffer();
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVectorTable.java b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVectorTable.java
index bf00858..17c347a 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVectorTable.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/wordvector/WordVectorTable.java
@@ -27,6 +27,7 @@ import opennlp.tools.util.java.Experimental;
*/
@Experimental
public interface WordVectorTable {
+
WordVector get(CharSequence token);
int size();
--
To stop receiving notification emails like this one, please contact
['"commits@opennlp.apache.org" <co...@opennlp.apache.org>'].