svn commit: r1440394 - /incubator/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/AssertionCleartkAnalysisEngine.java

[ma...@apache.org]

Author: mattcoarr
Date: Wed Jan 30 13:15:36 2013
New Revision: 1440394

URL: http://svn.apache.org/viewvc?rev=1440394&view=rev
Log:
use windows of 10, 5, and 3 for separate features instead of just 10.

fixed bug in zone feature extraction -- was not "returning" empty list (only creating it).

Modified:
    incubator/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/AssertionCleartkAnalysisEngine.java

Modified: incubator/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/AssertionCleartkAnalysisEngine.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/AssertionCleartkAnalysisEngine.java?rev=1440394&r1=1440393&r2=1440394&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/AssertionCleartkAnalysisEngine.java (original)
+++ incubator/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/AssertionCleartkAnalysisEngine.java Wed Jan 30 13:15:36 2013
@@ -179,8 +179,12 @@ public abstract class AssertionCleartkAn
     				new CleartkExtractor.LastCovered(2),
     				new CleartkExtractor.Preceding(5),
     				new CleartkExtractor.Following(4),
-    				new CleartkExtractor.Bag(new CleartkExtractor.Preceding(10)),
-    				new CleartkExtractor.Bag(new CleartkExtractor.Following(10))
+    				new CleartkExtractor.Bag(new CleartkExtractor.Preceding(3)),
+    				new CleartkExtractor.Bag(new CleartkExtractor.Following(3)),
+            new CleartkExtractor.Bag(new CleartkExtractor.Preceding(5)),
+            new CleartkExtractor.Bag(new CleartkExtractor.Following(5)),
+            new CleartkExtractor.Bag(new CleartkExtractor.Preceding(10)),
+            new CleartkExtractor.Bag(new CleartkExtractor.Following(10))
     				);
     
     CleartkExtractor posExtraction1 = 
@@ -218,6 +222,10 @@ public abstract class AssertionCleartkAn
     cuePhraseInWindowExtractor = new CleartkExtractor(
           AssertionCuePhraseAnnotation.class,
           baseExtractorCuePhraseCategory,
+          new CleartkExtractor.Bag(new CleartkExtractor.Preceding(3)),
+          new CleartkExtractor.Bag(new CleartkExtractor.Following(3)),
+          new CleartkExtractor.Bag(new CleartkExtractor.Preceding(5)),
+          new CleartkExtractor.Bag(new CleartkExtractor.Following(5)),
           new CleartkExtractor.Bag(new CleartkExtractor.Preceding(10)),
           new CleartkExtractor.Bag(new CleartkExtractor.Following(10))
           );
@@ -374,8 +382,8 @@ public abstract class AssertionCleartkAn
     if (zoneList == null || zoneList.isEmpty())
     {
       //return null;
-      logger.info("AssertionCleartkAnalysisEngine.extractZoneFeatures() early END (no zones)");
-      new ArrayList<Feature>();
+      //logger.info("AssertionCleartkAnalysisEngine.extractZoneFeatures() early END (no zones)");
+      return new ArrayList<Feature>();
     } else
     {
       logger.info("AssertionCleartkAnalysisEngine.extractZoneFeatures() found zones and adding zone features");