From 4f8254516dfd3316bd5b3b49bb15fca489d28304 Mon Sep 17 00:00:00 2001
From: Daniel Russ
Date: Fri, 23 Dec 2016 14:35:12 -0500
Subject: [PATCH] OPENNLP-870: ContextGenerator is now Generic
---
.../java/opennlp/tools/ml/maxent/BasicContextGenerator.java | 4 ++--
.../main/java/opennlp/tools/ml/maxent/ContextGenerator.java | 4 ++--
.../java/opennlp/tools/ml/maxent/RealBasicEventStream.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
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 8cc39cc66..471fe6327 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 @@
* cp_1 cp_2 ... cp_n
*
*/
-public class BasicContextGenerator implements ContextGenerator {
+public class BasicContextGenerator implements ContextGenerator {
private String separator = " ";
@@ -42,7 +42,7 @@ public BasicContextGenerator (String sep) {
/**
* 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);
}
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 0582323fb..fa9284643 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 @@
/**
* Generate contexts for maxent decisions.
*/
-public interface ContextGenerator {
+public interface ContextGenerator {
/**
* Builds up the list of contextual predicates given an Object.
*/
- public String[] getContext(Object o);
+ public String[] getContext(T o);
}
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 f2c3b82b1..462cf9616 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.util.ObjectStream;
public class RealBasicEventStream implements ObjectStream {
- ContextGenerator cg = new BasicContextGenerator();
+ ContextGenerator cg = new BasicContextGenerator();
private ObjectStream ds;
public RealBasicEventStream(ObjectStream ds) {