svn commit: r1294178 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag: POSSampleEventStream.java POSSampleSequenceStream.java

[co...@apache.org]

Author: colen
Date: Mon Feb 27 15:19:38 2012
New Revision: 1294178

URL: http://svn.apache.org/viewvc?rev=1294178&view=rev
Log:
OPENNLP-450: Added event and sequence streams should pass the additionalContext to POSTagger

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java?rev=1294178&r1=1294177&r2=1294178&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java Mon Feb 27 15:19:38 2012
@@ -65,21 +65,28 @@ public class POSSampleEventStream extend
   protected Iterator<Event> createEvents(POSSample sample) {
     String sentence[] = sample.getSentence();
     String tags[] = sample.getTags();
-    List<Event> events = generateEvents(sentence,tags,cg);
+    Object ac[] = sample.getAddictionalContext();
+    List<Event> events = generateEvents(sentence, tags, ac, cg);
     return events.iterator();
   }
   
-  public static List<Event> generateEvents(String[] sentence, String[] tags, POSContextGenerator cg){
+  public static List<Event> generateEvents(String[] sentence, String[] tags,
+      Object[] additionalContext, POSContextGenerator cg) {
     List<Event> events = new ArrayList<Event>(sentence.length);
 
     for (int i=0; i < sentence.length; i++) {
 
       // it is safe to pass the tags as previous tags because
       // the context generator does not look for non predicted tags
-      String[] context = cg.getContext(i, sentence, tags, null);
+      String[] context = cg.getContext(i, sentence, tags, additionalContext);
 
       events.add(new Event(tags[i], context));
     }
     return events;
   }
+
+  public static List<Event> generateEvents(String[] sentence, String[] tags,
+      POSContextGenerator cg) {
+    return generateEvents(sentence, tags, null, cg);
+  }
 }

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java?rev=1294178&r1=1294177&r2=1294178&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java Mon Feb 27 15:19:38 2012
@@ -55,9 +55,11 @@ public class POSSampleSequenceStream imp
     Sequence<POSSample> pss = sequence;
     POSTagger tagger = new POSTaggerME(new POSModel("x-unspecified", model, null, new POSTaggerFactory()));
     String[] sentence = pss.getSource().getSentence();
+    Object[] ac = pss.getSource().getAddictionalContext();
     String[] tags = tagger.tag(pss.getSource().getSentence());
     Event[] events = new Event[sentence.length];
-    POSSampleEventStream.generateEvents(sentence,tags,pcg).toArray(events);
+    POSSampleEventStream.generateEvents(sentence, tags, ac, pcg)
+        .toArray(events);
     return events;
   }