Return-Path: X-Original-To: apmail-ctakes-commits-archive@www.apache.org Delivered-To: apmail-ctakes-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8EF4B10888 for ; Wed, 4 Mar 2015 20:47:12 +0000 (UTC) Received: (qmail 94059 invoked by uid 500); 4 Mar 2015 20:47:12 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 94023 invoked by uid 500); 4 Mar 2015 20:47:12 -0000 Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ctakes.apache.org Delivered-To: mailing list commits@ctakes.apache.org Received: (qmail 94014 invoked by uid 99); 4 Mar 2015 20:47:12 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 20:47:12 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 4D6CBAC00A8 for ; Wed, 4 Mar 2015 20:47:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1664139 - in /ctakes/trunk: ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/ ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/ ctakes-temporal/src/main/java/org/apache/c... Date: Wed, 04 Mar 2015 20:47:11 -0000 To: commits@ctakes.apache.org From: tmill@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150304204712.4D6CBAC00A8@hades.apache.org> Author: tmill Date: Wed Mar 4 20:47:09 2015 New Revision: 1664139 URL: http://svn.apache.org/r1664139 Log: Made the relation extractor interface generic so it can be applied to other types of relations. Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/RelationExtractorAnnotator.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/ArgumentOrderFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyPathFeaturesExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyTreeFeaturesExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EmbeddingFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EntitySpanFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/FlatTreeFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/NamedEntityFeaturesExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PETFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PartOfSpeechFeaturesExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PhraseChunkingExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PrepositionFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PunctuationFeatureExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/RelationFeaturesExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TokenFeaturesExtractor.java ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TreeFragmentFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventEventRelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventTimeRelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventCoreferenceAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventI2B2RelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventRelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeI2B2RelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeRelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeSelfRelationAnnotator.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/TreeHeightBaseline.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CheckSpecialWordRelationExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ConjunctionRelationFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CoordinateFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyPathFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependingVerbsFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DeterminerRelationFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DocTimeRelFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EmptyFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventArgumentPropertyExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventPositionRelationFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationsFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ListFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/MultiTokenFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearbyVerbTenseRelationExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearestFlagFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventTimeBetweenCandidatesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventsInTheSameSentenceExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ParseFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SRLRelationFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SectionHeaderRelationExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SpecialAnnotationRelationExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SyntacticParentFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeForMixEventTimeExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalPETFlatExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXPropertyRelationFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXRelationFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TokenPropertyFeaturesExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/UmlsFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistSemFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistanceFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/StringMatchingFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/TokenFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/UMLSFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventEventFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventTimeFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationTimeUnitFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/EventTimeFlatTreeFeatureExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalFTExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPETExtractor.java ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPathExtractor.java Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/RelationExtractorAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/RelationExtractorAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/RelationExtractorAnnotator.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/RelationExtractorAnnotator.java Wed Mar 4 20:47:09 2015 @@ -69,7 +69,7 @@ public abstract class RelationExtractorA protected Random coin = new Random(0); - private List featureExtractors = this.getFeatureExtractors(); + private List> featureExtractors = this.getFeatureExtractors(); private Class coveringClass = getCoveringClass(); @@ -79,7 +79,7 @@ public abstract class RelationExtractorA * * @return The list of feature extractors to use. */ - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( new TokenFeaturesExtractor(), new PartOfSpeechFeaturesExtractor(), @@ -171,7 +171,7 @@ public abstract class RelationExtractorA IdentifiedAnnotation arg2 = pair.getArg2(); // apply all the feature extractors to extract the list of features List features = new ArrayList<>(); - for (RelationFeaturesExtractor extractor : this.featureExtractors) { + for (RelationFeaturesExtractor extractor : this.featureExtractors) { List feats = extractor.extract(jCas, arg1, arg2); if (feats != null) features.addAll(feats); } Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/ArgumentOrderFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/ArgumentOrderFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/ArgumentOrderFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/ArgumentOrderFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -29,7 +29,7 @@ import org.cleartk.ml.Feature; /** * Features that indicate the order of the arguments (e.g. before or after). */ -public class ArgumentOrderFeatureExtractor implements RelationFeaturesExtractor { +public class ArgumentOrderFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) throws AnalysisEngineProcessException { Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyPathFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyPathFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyPathFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyPathFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -28,7 +28,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class DependencyPathFeaturesExtractor implements RelationFeaturesExtractor { +public class DependencyPathFeaturesExtractor implements RelationFeaturesExtractor { @Override Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyTreeFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyTreeFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyTreeFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/DependencyTreeFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -27,7 +27,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class DependencyTreeFeaturesExtractor implements RelationFeaturesExtractor{ +public class DependencyTreeFeaturesExtractor implements RelationFeaturesExtractor{ @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EmbeddingFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EmbeddingFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EmbeddingFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EmbeddingFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -37,7 +37,7 @@ import com.google.common.io.Files; /** * */ -public class EmbeddingFeatureExtractor implements RelationFeaturesExtractor { +public class EmbeddingFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) throws AnalysisEngineProcessException { Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EntitySpanFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EntitySpanFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EntitySpanFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/EntitySpanFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -38,7 +38,7 @@ import org.cleartk.ml.Feature; * arg2: "valgus deformity" * */ -public class EntitySpanFeatureExtractor implements RelationFeaturesExtractor { +public class EntitySpanFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) throws AnalysisEngineProcessException { Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/FlatTreeFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/FlatTreeFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/FlatTreeFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/FlatTreeFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -32,7 +32,7 @@ import org.apache.uima.fit.util.JCasUtil import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class FlatTreeFeatureExtractor implements RelationFeaturesExtractor { +public class FlatTreeFeatureExtractor implements RelationFeaturesExtractor { // Returns flat POS-trees a la Hovy et al 2012 (EACL) @Override Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/NamedEntityFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/NamedEntityFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/NamedEntityFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/NamedEntityFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -33,7 +33,7 @@ import org.cleartk.ml.feature.extractor. import org.cleartk.ml.feature.extractor.FeatureExtractor1; import org.cleartk.ml.feature.extractor.NamingExtractor1; -public class NamedEntityFeaturesExtractor implements RelationFeaturesExtractor { +public class NamedEntityFeaturesExtractor implements RelationFeaturesExtractor { private FeatureExtractor1 namedEntityType = new FeatureExtractor1() { @Override Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PETFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PETFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PETFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PETFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -31,7 +31,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class PETFeatureExtractor implements RelationFeaturesExtractor { +public class PETFeatureExtractor implements RelationFeaturesExtractor { // Returns Path-enclosed trees of Moschitti 2004 (ACL) @Override Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PartOfSpeechFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PartOfSpeechFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PartOfSpeechFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PartOfSpeechFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -33,7 +33,7 @@ import org.cleartk.ml.feature.extractor. import org.cleartk.ml.feature.extractor.NamingExtractor1; import org.cleartk.ml.feature.extractor.TypePathExtractor; -public class PartOfSpeechFeaturesExtractor implements RelationFeaturesExtractor { +public class PartOfSpeechFeaturesExtractor implements RelationFeaturesExtractor { private FeatureExtractor1 pos = new TypePathExtractor(BaseToken.class, "partOfSpeech"); Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PhraseChunkingExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PhraseChunkingExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PhraseChunkingExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PhraseChunkingExtractor.java Wed Mar 4 20:47:09 2015 @@ -29,7 +29,7 @@ import org.apache.uima.fit.util.JCasUtil import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class PhraseChunkingExtractor implements RelationFeaturesExtractor { +public class PhraseChunkingExtractor implements RelationFeaturesExtractor { List extractPhraseHeadByTreenode(JCas jCas, List treenodesList) { List rTNodeList = new ArrayList(); Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PrepositionFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PrepositionFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PrepositionFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PrepositionFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.cleartk.ml.Feature; * Uses a predifined list of prepositions rather than POS tags. * */ -public class PrepositionFeatureExtractor implements RelationFeaturesExtractor { +public class PrepositionFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) throws AnalysisEngineProcessException { Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PunctuationFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PunctuationFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PunctuationFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/PunctuationFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -31,7 +31,7 @@ import org.cleartk.ml.Feature; /** * Features that capture punctuation marks between the two arguments. */ -public class PunctuationFeatureExtractor implements RelationFeaturesExtractor { +public class PunctuationFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) throws AnalysisEngineProcessException { Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/RelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/RelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/RelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/RelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -28,7 +28,7 @@ import org.cleartk.ml.Feature; /** * Define an interface for people to implement feature extractors. */ -public interface RelationFeaturesExtractor { +public interface RelationFeaturesExtractor { /** * Extract features for the pair of named entity mentions. @@ -41,6 +41,6 @@ public interface RelationFeaturesExtract * The second identified annotation in the text. * @return A list of features indicative of the relation between the named entities */ - public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) + public List extract(JCas jCas, T1 arg1, T2 arg2) throws AnalysisEngineProcessException; } \ No newline at end of file Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TokenFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TokenFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TokenFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TokenFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -45,7 +45,7 @@ import org.cleartk.ml.feature.extractor. import org.cleartk.ml.feature.extractor.FeatureExtractor1; import org.cleartk.ml.feature.extractor.NamingExtractor1; -public class TokenFeaturesExtractor implements RelationFeaturesExtractor { +public class TokenFeaturesExtractor implements RelationFeaturesExtractor { private FeatureExtractor1 coveredText = new CoveredTextExtractor(); Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TreeFragmentFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TreeFragmentFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TreeFragmentFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/features/TreeFragmentFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -44,7 +44,7 @@ import org.cleartk.ml.Feature; * Model location is hardcoded as of right now. * TODO: Parameterize & unstaticize this so that, e.g., multiple projects could use this feature if necessary. */ -public class TreeFragmentFeatureExtractor implements RelationFeaturesExtractor { +public class TreeFragmentFeatureExtractor implements RelationFeaturesExtractor { static HashSet frags = null; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventEventRelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventEventRelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventEventRelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventEventRelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -79,7 +79,7 @@ public class ConsecutiveSentencesEventEv } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( new UnexpandedTokenFeaturesExtractor() //use unexpanded version for i2b2 data , new OverlappedHeadFeaturesExtractor() Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventTimeRelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventTimeRelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventTimeRelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/ConsecutiveSentencesEventTimeRelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -77,7 +77,7 @@ public class ConsecutiveSentencesEventTi } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( new UnexpandedTokenFeaturesExtractor() //use unexpanded version for i2b2 data // , new OverlappedHeadFeaturesExtractor() Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventCoreferenceAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventCoreferenceAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventCoreferenceAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventCoreferenceAnnotator.java Wed Mar 4 20:47:09 2015 @@ -77,8 +77,8 @@ public class EventCoreferenceAnnotator e } @Override - protected List getFeatureExtractors() { - List featureList = new ArrayList<>(); + protected List> getFeatureExtractors() { + List> featureList = new ArrayList<>(); featureList.addAll(super.getFeatureExtractors()); Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventI2B2RelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventI2B2RelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventI2B2RelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventI2B2RelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -124,7 +124,7 @@ public class EventEventI2B2RelationAnnot } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( // new TokenFeaturesExtractor() new UnexpandedTokenFeaturesExtractor() //use unexpanded version for i2b2 data Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventRelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventRelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventRelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventEventRelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -125,7 +125,7 @@ public class EventEventRelationAnnotator } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( new UnexpandedTokenFeaturesExtractor() //new TokenFeaturesExtractor() , new PartOfSpeechFeaturesExtractor() Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeI2B2RelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeI2B2RelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeI2B2RelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeI2B2RelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -118,7 +118,7 @@ public class EventTimeI2B2RelationAnnota } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( // new TokenFeaturesExtractor() new UnexpandedTokenFeaturesExtractor() //use unexpanded version for i2b2 data Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeRelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeRelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeRelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeRelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -118,7 +118,7 @@ public class EventTimeRelationAnnotator } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( new TokenFeaturesExtractor() // new UnexpandedTokenFeaturesExtractor() //use unexpanded version for i2b2 data Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeSelfRelationAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeSelfRelationAnnotator.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeSelfRelationAnnotator.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/EventTimeSelfRelationAnnotator.java Wed Mar 4 20:47:09 2015 @@ -122,7 +122,7 @@ public class EventTimeSelfRelationAnnota } @Override - protected List getFeatureExtractors() { + protected List> getFeatureExtractors() { return Lists.newArrayList( new UnexpandedTokenFeaturesExtractor()//new TokenFeaturesExtractor() , new NearestFlagFeatureExtractor() Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/TreeHeightBaseline.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/TreeHeightBaseline.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/TreeHeightBaseline.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/TreeHeightBaseline.java Wed Mar 4 20:47:09 2015 @@ -27,16 +27,17 @@ import org.apache.ctakes.relationextract import org.apache.ctakes.relationextractor.ae.features.RelationFeaturesExtractor; import org.apache.ctakes.typesystem.type.syntax.TreebankNode; import org.apache.ctakes.typesystem.type.textsem.EventMention; +import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation; import org.apache.ctakes.typesystem.type.textspan.Sentence; import org.apache.uima.analysis_engine.AnalysisEngineDescription; +import org.apache.uima.fit.factory.AnalysisEngineFactory; +import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; import org.apache.uima.resource.ResourceInitializationException; import org.cleartk.ml.CleartkAnnotator; import org.cleartk.ml.Feature; import org.cleartk.ml.jar.GenericJarClassifierFactory; -import org.apache.uima.fit.factory.AnalysisEngineFactory; -import org.apache.uima.fit.util.JCasUtil; public class TreeHeightBaseline extends RelationExtractorAnnotator { @@ -61,20 +62,20 @@ public class TreeHeightBaseline extends } @Override - protected List getFeatureExtractors() { - return new ArrayList(); + protected List> getFeatureExtractors() { + return new ArrayList<>(); } @Override protected List getCandidateRelationArgumentPairs( JCas jCas, Annotation sentence) { - List results = new ArrayList(); + List results = new ArrayList<>(); // get all event mentions in the sentence List events = JCasUtil.selectCovered(jCas, EventMention.class, sentence); // filter out all the ctakes-generated events with more specific types - List realEvents = new ArrayList(); + List realEvents = new ArrayList<>(); for(EventMention event : events){ if(event.getClass().equals(EventMention.class)){ realEvents.add(event); Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CheckSpecialWordRelationExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CheckSpecialWordRelationExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CheckSpecialWordRelationExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CheckSpecialWordRelationExtractor.java Wed Mar 4 20:47:09 2015 @@ -36,7 +36,7 @@ import com.google.common.collect.ArrayLi import com.google.common.collect.Multimap; import com.google.common.io.Resources; -public class CheckSpecialWordRelationExtractor implements RelationFeaturesExtractor{ +public class CheckSpecialWordRelationExtractor implements RelationFeaturesExtractor{ //final static List specialWd = Arrays.asList("before","prior","previous","previously","ago","soon","earlier","early","after","later","subsequent","follow","following","followed","post","since","back","start","started","by","past","starting"); private static final String LOOKUP_PATH = "/org/apache/ctakes/temporal/TimeLexicon.csv"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ConjunctionRelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ConjunctionRelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ConjunctionRelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ConjunctionRelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -13,7 +13,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class ConjunctionRelationFeaturesExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { private String name = "ConjunctionFeature"; @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CoordinateFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CoordinateFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CoordinateFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/CoordinateFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -13,7 +13,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class CoordinateFeaturesExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @SuppressWarnings("null") @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -34,7 +34,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class DependencyFeatureExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyPathFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyPathFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyPathFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependencyPathFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -29,7 +29,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class DependencyPathFeaturesExtractor implements RelationFeaturesExtractor { +public class DependencyPathFeaturesExtractor implements RelationFeaturesExtractor { @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependingVerbsFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependingVerbsFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependingVerbsFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DependingVerbsFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -12,7 +12,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class DependingVerbsFeatureExtractor implements RelationFeaturesExtractor { +public class DependingVerbsFeatureExtractor implements RelationFeaturesExtractor { private static final String FEAT_NAME = "Depending_Verb"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DeterminerRelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DeterminerRelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DeterminerRelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DeterminerRelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -34,7 +34,7 @@ import com.google.common.collect.Lists; * @author CH151862 * */ -public class DeterminerRelationFeaturesExtractor implements RelationFeaturesExtractor { +public class DeterminerRelationFeaturesExtractor implements RelationFeaturesExtractor { private String name="Determiner"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DocTimeRelFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DocTimeRelFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DocTimeRelFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/DocTimeRelFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -28,7 +28,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class DocTimeRelFeatureExtractor implements RelationFeaturesExtractor { +public class DocTimeRelFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EmptyFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EmptyFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EmptyFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EmptyFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -8,7 +8,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class EmptyFeaturesExtractor implements RelationFeaturesExtractor { +public class EmptyFeaturesExtractor implements RelationFeaturesExtractor { public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) throws AnalysisEngineProcessException { Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventArgumentPropertyExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventArgumentPropertyExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventArgumentPropertyExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventArgumentPropertyExtractor.java Wed Mar 4 20:47:09 2015 @@ -34,7 +34,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class EventArgumentPropertyExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventPositionRelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventPositionRelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventPositionRelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventPositionRelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -40,7 +40,7 @@ import com.google.common.collect.Lists; * @author CH151862 * */ -public class EventPositionRelationFeaturesExtractor implements RelationFeaturesExtractor { +public class EventPositionRelationFeaturesExtractor implements RelationFeaturesExtractor { private String name="EventRelaionPosition"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -44,7 +44,7 @@ import com.google.common.collect.Multima * */ public class EventTimeRelationFeatureExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { private String cachedDocID = null; private Multimap eventSectionTimeRelationLookup; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationsFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationsFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationsFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/EventTimeRelationsFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -33,7 +33,7 @@ import org.apache.uima.fit.util.JCasUtil import com.google.common.collect.Lists; public class EventTimeRelationsFeaturesExtractor implements - RelationFeaturesExtractor { + RelationFeaturesExtractor { /* * (non-Javadoc) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ListFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ListFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ListFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ListFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.apache.uima.fit.util.JCasUtil import com.google.common.collect.Lists; -public class ListFeaturesExtractor implements RelationFeaturesExtractor { +public class ListFeaturesExtractor implements RelationFeaturesExtractor { /* * (non-Javadoc) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/MultiTokenFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/MultiTokenFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/MultiTokenFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/MultiTokenFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -57,7 +57,7 @@ import com.google.common.collect.Multima * @author CH151862 * */ -public class MultiTokenFeaturesExtractor implements RelationFeaturesExtractor { +public class MultiTokenFeaturesExtractor implements RelationFeaturesExtractor { private FeatureExtractor1 coveredText = new CoveredTextExtractor(); Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearbyVerbTenseRelationExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearbyVerbTenseRelationExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearbyVerbTenseRelationExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearbyVerbTenseRelationExtractor.java Wed Mar 4 20:47:09 2015 @@ -33,7 +33,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class NearbyVerbTenseRelationExtractor implements RelationFeaturesExtractor{ +public class NearbyVerbTenseRelationExtractor implements RelationFeaturesExtractor{ @Override public List extract(JCas jcas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearestFlagFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearestFlagFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearestFlagFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NearestFlagFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class NearestFlagFeatureExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventTimeBetweenCandidatesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventTimeBetweenCandidatesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventTimeBetweenCandidatesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventTimeBetweenCandidatesExtractor.java Wed Mar 4 20:47:09 2015 @@ -40,7 +40,7 @@ import org.apache.uima.fit.util.JCasUtil * */ public class NumberOfEventTimeBetweenCandidatesExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @SuppressWarnings("null") @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventsInTheSameSentenceExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventsInTheSameSentenceExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventsInTheSameSentenceExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/NumberOfEventsInTheSameSentenceExtractor.java Wed Mar 4 20:47:09 2015 @@ -39,7 +39,7 @@ import com.google.common.collect.Lists; * */ public class NumberOfEventsInTheSameSentenceExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @SuppressWarnings("null") @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ParseFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ParseFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ParseFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/ParseFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -29,7 +29,7 @@ import org.apache.uima.analysis_engine.A import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; -public class ParseFeatureExtractor implements RelationFeaturesExtractor { +public class ParseFeatureExtractor implements RelationFeaturesExtractor { /* * (non-Javadoc) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SRLRelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SRLRelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SRLRelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SRLRelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.apache.uima.fit.util.JCasUtil import com.google.common.collect.Lists; -public class SRLRelationFeaturesExtractor implements RelationFeaturesExtractor { +public class SRLRelationFeaturesExtractor implements RelationFeaturesExtractor { /* * (non-Javadoc) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SectionHeaderRelationExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SectionHeaderRelationExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SectionHeaderRelationExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SectionHeaderRelationExtractor.java Wed Mar 4 20:47:09 2015 @@ -34,7 +34,7 @@ import org.apache.uima.fit.util.JCasUtil import com.google.common.collect.Lists; -public class SectionHeaderRelationExtractor implements RelationFeaturesExtractor{ +public class SectionHeaderRelationExtractor implements RelationFeaturesExtractor{ @Override public List extract(JCas jcas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SpecialAnnotationRelationExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SpecialAnnotationRelationExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SpecialAnnotationRelationExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SpecialAnnotationRelationExtractor.java Wed Mar 4 20:47:09 2015 @@ -36,7 +36,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class SpecialAnnotationRelationExtractor implements RelationFeaturesExtractor{ +public class SpecialAnnotationRelationExtractor implements RelationFeaturesExtractor{ @Override public List extract(JCas jcas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SyntacticParentFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SyntacticParentFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SyntacticParentFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/SyntacticParentFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -30,7 +30,7 @@ import org.cleartk.ml.Feature; import com.google.common.collect.Lists; -public class SyntacticParentFeatureExtractor implements RelationFeaturesExtractor { +public class SyntacticParentFeatureExtractor implements RelationFeaturesExtractor { /* * (non-Javadoc) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -31,7 +31,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class TemporalAttributeFeatureExtractor implements - RelationFeaturesExtractor { + RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeForMixEventTimeExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeForMixEventTimeExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeForMixEventTimeExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalAttributeForMixEventTimeExtractor.java Wed Mar 4 20:47:09 2015 @@ -31,7 +31,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class TemporalAttributeForMixEventTimeExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @SuppressWarnings("null") @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalPETFlatExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalPETFlatExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalPETFlatExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TemporalPETFlatExtractor.java Wed Mar 4 20:47:09 2015 @@ -17,7 +17,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class TemporalPETFlatExtractor implements RelationFeaturesExtractor { +public class TemporalPETFlatExtractor implements RelationFeaturesExtractor { private static final String FEAT_NAME = "Flat_DPK"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXPropertyRelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXPropertyRelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXPropertyRelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXPropertyRelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -38,7 +38,7 @@ import com.google.common.collect.Lists; * @author CH151862 * */ -public class TimeXPropertyRelationFeaturesExtractor implements RelationFeaturesExtractor { +public class TimeXPropertyRelationFeaturesExtractor implements RelationFeaturesExtractor { private String name="TimeXProperty"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXRelationFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXRelationFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXRelationFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TimeXRelationFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -42,7 +42,7 @@ import com.google.common.collect.Lists; * @author CH151862 * */ -public class TimeXRelationFeaturesExtractor implements RelationFeaturesExtractor { +public class TimeXRelationFeaturesExtractor implements RelationFeaturesExtractor { private String name="TimeXRelatioinFeature"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TokenPropertyFeaturesExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TokenPropertyFeaturesExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TokenPropertyFeaturesExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/TokenPropertyFeaturesExtractor.java Wed Mar 4 20:47:09 2015 @@ -17,7 +17,7 @@ import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; public class TokenPropertyFeaturesExtractor implements -RelationFeaturesExtractor { +RelationFeaturesExtractor { @SuppressWarnings("null") @Override Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/UmlsFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/UmlsFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/UmlsFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/UmlsFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.apache.uima.fit.util.JCasUtil import com.google.common.collect.Lists; -public class UmlsFeatureExtractor implements RelationFeaturesExtractor { +public class UmlsFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistSemFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistSemFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistSemFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistSemFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -21,7 +21,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class DistSemFeatureExtractor implements RelationFeaturesExtractor { +public class DistSemFeatureExtractor implements RelationFeaturesExtractor { // default value is 0.5 (rather than 0.0) because we don't want to assume OOV words are dissimilar public static final double DEFAULT_SIM = 0.5; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistanceFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistanceFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistanceFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/DistanceFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class DistanceFeatureExtractor implements RelationFeaturesExtractor { +public class DistanceFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/StringMatchingFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/StringMatchingFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/StringMatchingFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/StringMatchingFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -9,13 +9,13 @@ import org.apache.ctakes.relationextract import org.apache.ctakes.typesystem.type.syntax.BaseToken; import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation; import org.apache.uima.analysis_engine.AnalysisEngineProcessException; +import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; import org.cleartk.ml.Feature; -import org.apache.uima.fit.util.JCasUtil; public class StringMatchingFeatureExtractor implements - RelationFeaturesExtractor { + RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/TokenFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/TokenFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/TokenFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/TokenFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -11,7 +11,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class TokenFeatureExtractor implements RelationFeaturesExtractor { +public class TokenFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/UMLSFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/UMLSFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/UMLSFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/coreference/UMLSFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -16,7 +16,7 @@ import org.apache.uima.jcas.cas.FSArray; import org.cleartk.ml.Feature; import org.apache.uima.fit.util.JCasUtil; -public class UMLSFeatureExtractor implements RelationFeaturesExtractor { +public class UMLSFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventEventFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventEventFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventEventFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventEventFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -34,7 +34,7 @@ import org.cleartk.ml.Feature; import com.google.common.base.Charsets; import com.google.common.io.Files; -public class DurationEventEventFeatureExtractor implements RelationFeaturesExtractor { +public class DurationEventEventFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventTimeFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventTimeFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventTimeFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationEventTimeFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -38,7 +38,7 @@ import com.google.common.io.Files; /** * Calculate probability that CONTAINS relation can exist between two arguments. */ -public class DurationEventTimeFeatureExtractor implements RelationFeaturesExtractor { +public class DurationEventTimeFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationTimeUnitFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationTimeUnitFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationTimeUnitFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/duration/DurationTimeUnitFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import scala.collection.immutable.Set; /** * Assumes all relations whose argument have no duration data have been deleted. */ -public class DurationTimeUnitFeatureExtractor implements RelationFeaturesExtractor { +public class DurationTimeUnitFeatureExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jCas, IdentifiedAnnotation arg1, IdentifiedAnnotation arg2) Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/EventTimeFlatTreeFeatureExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/EventTimeFlatTreeFeatureExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/EventTimeFlatTreeFeatureExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/EventTimeFlatTreeFeatureExtractor.java Wed Mar 4 20:47:09 2015 @@ -36,7 +36,7 @@ import org.apache.uima.fit.util.JCasUtil import com.google.common.base.Function; -public class EventTimeFlatTreeFeatureExtractor implements RelationFeaturesExtractor{ +public class EventTimeFlatTreeFeatureExtractor implements RelationFeaturesExtractor{ @Override public List extract(JCas jcas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalFTExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalFTExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalFTExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalFTExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.cleartk.ml.TreeFeature; -public class TemporalFTExtractor implements RelationFeaturesExtractor { +public class TemporalFTExtractor implements RelationFeaturesExtractor { public static final String FEAT_NAME = "TK_FT"; Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPETExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPETExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPETExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPETExtractor.java Wed Mar 4 20:47:09 2015 @@ -36,7 +36,7 @@ import org.cleartk.ml.Feature; import org.cleartk.ml.TreeFeature; import org.apache.uima.fit.util.JCasUtil; -public class TemporalPETExtractor implements RelationFeaturesExtractor { +public class TemporalPETExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jcas, IdentifiedAnnotation arg1, Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPathExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPathExtractor.java?rev=1664139&r1=1664138&r2=1664139&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPathExtractor.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/feature/treekernel/TemporalPathExtractor.java Wed Mar 4 20:47:09 2015 @@ -35,7 +35,7 @@ import org.apache.uima.jcas.JCas; import org.cleartk.ml.Feature; import org.cleartk.ml.TreeFeature; -public class TemporalPathExtractor implements RelationFeaturesExtractor { +public class TemporalPathExtractor implements RelationFeaturesExtractor { @Override public List extract(JCas jcas, IdentifiedAnnotation arg1,