You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ja...@apache.org on 2017/03/31 20:42:06 UTC
svn commit: r1789749 [3/3] - in /ctakes/trunk: ctakes-core/desc/analysis_engine/ ctakes-core/src/main/java/org/apache/ctakes/core/ae/ ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/ ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/

Copied: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotatorBIO.java (from r1789748, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotator.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotatorBIO.java?p2=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotatorBIO.java&p1=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotator.java&r1=1789748&r2=1789749&rev=1789749&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SentenceDetectorAnnotatorBIO.java Fri Mar 31 20:42:05 2017
@@ -34,9 +34,9 @@ import org.cleartk.ml.jar.DirectoryDataW
 import org.cleartk.ml.jar.GenericJarClassifierFactory;
 import org.cleartk.util.ViewUriUtil;
 
-public class SentenceDetectorAnnotator extends CleartkAnnotator<String>{
+public class SentenceDetectorAnnotatorBIO extends CleartkAnnotator<String>{
 
-  private Logger logger = Logger.getLogger(SentenceDetectorAnnotator.class);
+  private Logger logger = Logger.getLogger(SentenceDetectorAnnotatorBIO.class);
   private static final int WINDOW_SIZE = 3;
   
   public static enum FEAT_CONFIG {GILLICK, CHAR, SHAPE, LINE_POS, CHAR_SHAPE, CHAR_POS, CHAR_SHAPE_POS }
@@ -361,26 +361,26 @@ public class SentenceDetectorAnnotator e
   
   public static AnalysisEngineDescription getDataWriter(File outputDirectory, Class<? extends DataWriter<?>> class1) throws ResourceInitializationException {
     return AnalysisEngineFactory.createEngineDescription(
-        SentenceDetectorAnnotator.class,
-        SentenceDetectorAnnotator.PARAM_IS_TRAINING,
+        SentenceDetectorAnnotatorBIO.class,
+        SentenceDetectorAnnotatorBIO.PARAM_IS_TRAINING,
         true,
         DirectoryDataWriterFactory.PARAM_OUTPUT_DIRECTORY,
         outputDirectory,
         DefaultDataWriterFactory.PARAM_DATA_WRITER_CLASS_NAME,
         class1,
-        SentenceDetectorAnnotator.PARAM_FEAT_CONFIG,
-        SentenceDetectorAnnotator.FEAT_CONFIG.CHAR);
+        SentenceDetectorAnnotatorBIO.PARAM_FEAT_CONFIG,
+        SentenceDetectorAnnotatorBIO.FEAT_CONFIG.CHAR);
   }
 
   public static AnalysisEngineDescription getDescription(String modelPath) throws ResourceInitializationException {
     return AnalysisEngineFactory.createEngineDescription(
-        SentenceDetectorAnnotator.class,
-        SentenceDetectorAnnotator.PARAM_IS_TRAINING,
+        SentenceDetectorAnnotatorBIO.class,
+        SentenceDetectorAnnotatorBIO.PARAM_IS_TRAINING,
         false,
         GenericJarClassifierFactory.PARAM_CLASSIFIER_JAR_PATH,
         modelPath,
-        SentenceDetectorAnnotator.PARAM_FEAT_CONFIG,
-        SentenceDetectorAnnotator.FEAT_CONFIG.CHAR);
+        SentenceDetectorAnnotatorBIO.PARAM_FEAT_CONFIG,
+        SentenceDetectorAnnotatorBIO.FEAT_CONFIG.CHAR);
   }
   
   public static AnalysisEngineDescription getDescription() throws ResourceInitializationException {

Copied: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceBIODescriptors.java (from r1789748, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceDescriptors.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceBIODescriptors.java?p2=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceBIODescriptors.java&p1=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceDescriptors.java&r1=1789748&r2=1789749&rev=1789749&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceDescriptors.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/GenerateSentenceBIODescriptors.java Fri Mar 31 20:42:05 2017
@@ -3,13 +3,13 @@ package org.apache.ctakes.core.pipeline;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.apache.ctakes.core.ae.SentenceDetectorAnnotator;
+import org.apache.ctakes.core.ae.SentenceDetectorAnnotatorBIO;
 import org.apache.ctakes.core.ae.SimpleSegmentAnnotator;
 import org.apache.uima.fit.factory.AggregateBuilder;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.xml.sax.SAXException;
 
-public class GenerateSentenceDescriptors {
+public class GenerateSentenceBIODescriptors {
 
   public static final String sentModelPath = "/org/apache/ctakes/core/sentdetect/model.jar";
   public static final String segModelPath = "/org/apache/ctakes/core/segdetect/model.jar";
@@ -17,10 +17,10 @@ public class GenerateSentenceDescriptors
   public static void main(String[] args) throws ResourceInitializationException, SAXException, IOException {
     AggregateBuilder aggregateBuilder = new AggregateBuilder();
     aggregateBuilder.add(SimpleSegmentAnnotator.createAnnotatorDescription());
-    aggregateBuilder.add(SentenceDetectorAnnotator.getDescription(sentModelPath));
+    aggregateBuilder.add(SentenceDetectorAnnotatorBIO.getDescription(sentModelPath));
     
-    aggregateBuilder.createAggregateDescription().toXML(new FileWriter("desc/analysis_engine/SentenceAnnotatorAggregate.xml"));
-    SentenceDetectorAnnotator.getDescription(sentModelPath).toXML(new FileWriter("desc/analysis_engine/SentenceAnnotator.xml"));    
+    aggregateBuilder.createAggregateDescription().toXML(new FileWriter("desc/analysis_engine/SentenceAnnotatorBIOAggregate.xml"));
+    SentenceDetectorAnnotatorBIO.getDescription(sentModelPath).toXML(new FileWriter("desc/analysis_engine/SentenceDetectorAnnotatorBIO.xml"));    
   }
 
 }

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java?rev=1789749&r1=1789748&r2=1789749&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java Fri Mar 31 20:42:05 2017
@@ -492,7 +492,7 @@ org.cleartk.eval.Evaluation_ImplBase<Int
 				SentenceDetector.class,
 				SentenceDetector.SD_MODEL_FILE_PARAM,
 				"org/apache/ctakes/core/sentdetect/sd-med-model.zip" ) );
-		//      aggregateBuilder.add(SentenceDetectorAnnotator.getDescription(FileLocator.locateFile("org/apache/ctakes/core/sentdetect/model.jar").getPath()));
+		//      aggregateBuilder.add(SentenceDetectorAnnotatorBIO.getDescription(FileLocator.locateFile("org/apache/ctakes/core/sentdetect/model.jar").getPath()));
 
 		// identify tokens
 		aggregateBuilder.add( AnalysisEngineFactory.createEngineDescription( TokenizerAnnotatorPTB.class ) );