You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2016/12/26 13:34:42 UTC
[48/50] [abbrv] opennlp git commit: OPENNLP-870: ContextGenerator is
now Generic
OPENNLP-870: ContextGenerator is now Generic
This closes #19
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/f781fcaf
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/f781fcaf
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/f781fcaf
Branch: refs/heads/889
Commit: f781fcaf0f19766f7c9105911613f86d22b2091a
Parents: 2210868
Author: Daniel Russ <dr...@mail.nih.gov>
Authored: Fri Dec 23 14:35:12 2016 -0500
Committer: Kottmann <jo...@apache.org>
Committed: Sun Dec 25 16:36:49 2016 +0100
----------------------------------------------------------------------
.../main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java | 4 ++--
.../src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java | 4 ++--
.../main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/f781fcaf/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
index 8cc39cc..471fe63 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
@@ -29,7 +29,7 @@ package opennlp.tools.ml.maxent;
* cp_1 cp_2 ... cp_n
* </p>
*/
-public class BasicContextGenerator implements ContextGenerator {
+public class BasicContextGenerator implements ContextGenerator<String> {
private String separator = " ";
@@ -42,7 +42,7 @@ public class BasicContextGenerator implements ContextGenerator {
/**
* Builds up the list of contextual predicates given a String.
*/
- public String[] getContext(Object o) {
+ public String[] getContext(String o) {
String s = (String) o;
return s.split(separator);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/f781fcaf/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java
index 0582323..fa92846 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java
@@ -22,11 +22,11 @@ package opennlp.tools.ml.maxent;
/**
* Generate contexts for maxent decisions.
*/
-public interface ContextGenerator {
+public interface ContextGenerator<T> {
/**
* Builds up the list of contextual predicates given an Object.
*/
- public String[] getContext(Object o);
+ public String[] getContext(T o);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/f781fcaf/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java
index f2c3b82..462cf96 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java
@@ -26,7 +26,7 @@ import opennlp.tools.ml.model.RealValueFileEventStream;
import opennlp.tools.util.ObjectStream;
public class RealBasicEventStream implements ObjectStream<Event> {
- ContextGenerator cg = new BasicContextGenerator();
+ ContextGenerator<String> cg = new BasicContextGenerator();
private ObjectStream<String> ds;
public RealBasicEventStream(ObjectStream<String> ds) {