ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tm...@apache.org
Subject svn commit: r1485224 - in /ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk: GenericCleartkAnalysisEngine.java HistoryCleartkAnalysisEngine.java SubjectCleartkAnalysisEngine.java
Date Wed, 22 May 2013 14:27:56 GMT
Author: tmill
Date: Wed May 22 14:27:56 2013
New Revision: 1485224

URL: http://svn.apache.org/r1485224
Log:
Updated analysis engines to use newer cleartk feature type.

Modified:
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/GenericCleartkAnalysisEngine.java
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/HistoryCleartkAnalysisEngine.java
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java

Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/GenericCleartkAnalysisEngine.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/GenericCleartkAnalysisEngine.java?rev=1485224&r1=1485223&r2=1485224&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/GenericCleartkAnalysisEngine.java
(original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/GenericCleartkAnalysisEngine.java
Wed May 22 14:27:56 2013
@@ -27,7 +27,7 @@ import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.cleartk.classifier.Instance;
-import org.cleartk.classifier.feature.extractor.ContextExtractor;
+import org.cleartk.classifier.feature.extractor.CleartkExtractor;
 import org.cleartk.classifier.feature.extractor.simple.SimpleFeatureExtractor;
 
 public class GenericCleartkAnalysisEngine extends
@@ -55,10 +55,10 @@ public class GenericCleartkAnalysisEngin
 	private void initialize_generic_extractor() throws ResourceInitializationException {
 		
 		if (this.contextFeatureExtractors==null) {
-			this.contextFeatureExtractors = new ArrayList<ContextExtractor<IdentifiedAnnotation>>();
+			this.contextFeatureExtractors = new ArrayList<CleartkExtractor>();
 		}
 		this.contextFeatureExtractors.add( 
-				new ContextExtractor<IdentifiedAnnotation>(
+				new CleartkExtractor(
 						IdentifiedAnnotation.class, new GenericFeaturesExtractor()) );
 		if(this.entityFeatureExtractors == null){
 			this.entityFeatureExtractors = new ArrayList<SimpleFeatureExtractor>();

Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/HistoryCleartkAnalysisEngine.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/HistoryCleartkAnalysisEngine.java?rev=1485224&r1=1485223&r2=1485224&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/HistoryCleartkAnalysisEngine.java
(original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/HistoryCleartkAnalysisEngine.java
Wed May 22 14:27:56 2013
@@ -28,7 +28,7 @@ import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.cleartk.classifier.Instance;
-import org.cleartk.classifier.feature.extractor.ContextExtractor;
+import org.cleartk.classifier.feature.extractor.CleartkExtractor;
 import org.cleartk.classifier.feature.extractor.simple.SimpleFeatureExtractor;
 
 public class HistoryCleartkAnalysisEngine extends
@@ -56,10 +56,10 @@ public class HistoryCleartkAnalysisEngin
 	private void initialize_history_extractor() throws ResourceInitializationException {
 		
 		if (this.contextFeatureExtractors==null) {
-			this.contextFeatureExtractors = new ArrayList<ContextExtractor<IdentifiedAnnotation>>();
+			this.contextFeatureExtractors = new ArrayList<CleartkExtractor>();
 		}
 		this.contextFeatureExtractors.add( 
-				new ContextExtractor<IdentifiedAnnotation>(
+				new CleartkExtractor(
 						IdentifiedAnnotation.class, new HistoryFeaturesExtractor()) );
 		
 		if(this.entityFeatureExtractors == null){

Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java?rev=1485224&r1=1485223&r2=1485224&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java
(original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java
Wed May 22 14:27:56 2013
@@ -19,29 +19,16 @@
 package org.apache.ctakes.assertion.medfacts.cleartk;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 
+import org.apache.ctakes.assertion.attributes.features.SubjectFeaturesExtractor;
+import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation;
 import org.apache.log4j.Level;
 import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.cleartk.classifier.Instance;
+import org.cleartk.classifier.feature.extractor.CleartkExtractor;
 import org.cleartk.classifier.feature.extractor.ContextExtractor;
-import org.cleartk.classifier.feature.extractor.ContextExtractor.Covered;
-import org.cleartk.classifier.feature.extractor.ContextExtractor.Following;
-import org.cleartk.classifier.feature.extractor.ContextExtractor.Preceding;
-import org.cleartk.classifier.feature.extractor.simple.CoveredTextExtractor;
-import org.cleartk.classifier.feature.extractor.simple.SpannedTextExtractor;
-import org.cleartk.classifier.feature.extractor.simple.TypePathExtractor;
-import org.cleartk.classifier.feature.proliferate.CapitalTypeProliferator;
-import org.cleartk.classifier.feature.proliferate.CharacterNGramProliferator;
-import org.cleartk.classifier.feature.proliferate.LowerCaseProliferator;
-import org.cleartk.classifier.feature.proliferate.NumericTypeProliferator;
-import org.cleartk.classifier.feature.proliferate.ProliferatingExtractor;
-
-import org.apache.ctakes.assertion.attributes.features.SubjectFeaturesExtractor;
-import org.apache.ctakes.typesystem.type.syntax.BaseToken;
-import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation;
 
 public class SubjectCleartkAnalysisEngine extends
 		AssertionCleartkAnalysisEngine {
@@ -68,10 +55,10 @@ public class SubjectCleartkAnalysisEngin
 	private void initialize_subject_extractor() {
 		
 		if (this.contextFeatureExtractors==null) {
-			this.contextFeatureExtractors = new ArrayList<ContextExtractor<IdentifiedAnnotation>>();
+			this.contextFeatureExtractors = new ArrayList<CleartkExtractor>();
 		}
 		this.contextFeatureExtractors.add( 
-				new ContextExtractor<IdentifiedAnnotation>(
+				new CleartkExtractor(
 						IdentifiedAnnotation.class, new SubjectFeaturesExtractor()) );
 				
 	}



Mime
View raw message