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 A66E1F1D4 for ; Fri, 10 May 2013 10:07:17 +0000 (UTC) Received: (qmail 40702 invoked by uid 500); 10 May 2013 10:07:17 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 40651 invoked by uid 500); 10 May 2013 10:07:16 -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 40629 invoked by uid 99); 10 May 2013 10:07:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2013 10:07:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2013 10:07:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8DA1C23888D2; Fri, 10 May 2013 10:06:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1480973 - /ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java Date: Fri, 10 May 2013 10:06:51 -0000 To: commits@ctakes.apache.org From: stevenbethard@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130510100651.8DA1C23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stevenbethard Date: Fri May 10 10:06:51 2013 New Revision: 1480973 URL: http://svn.apache.org/r1480973 Log: Removes unnecessary view parameters. Annotators should only have view parameters if they need to work with more than one view. Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java?rev=1480973&r1=1480972&r2=1480973&view=diff ============================================================================== --- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java (original) +++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java Fri May 10 10:06:51 2013 @@ -155,6 +155,8 @@ public class EvaluationOfTemporalRelatio GOLD_VIEW_NAME); aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription( RemoveCrossSentenceRelations.class, + RemoveCrossSentenceRelations.PARAM_SENTENCE_VIEW, + CAS.NAME_DEFAULT_SOFA, RemoveCrossSentenceRelations.PARAM_RELATION_VIEW, GOLD_VIEW_NAME)); if (this.useClosure) { @@ -163,10 +165,10 @@ public class EvaluationOfTemporalRelatio CAS.NAME_DEFAULT_SOFA, GOLD_VIEW_NAME); } - aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription( - RemoveEventEventRelations.class, - RemoveEventEventRelations.PARAM_RELATION_VIEW, - GOLD_VIEW_NAME)); + aggregateBuilder.add( + AnalysisEngineFactory.createPrimitiveDescription(RemoveEventEventRelations.class), + CAS.NAME_DEFAULT_SOFA, + GOLD_VIEW_NAME); aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(RemoveRelations.class)); aggregateBuilder.add(EventTimeRelationAnnotator.createAnnotatorDescription(directory)); @@ -265,20 +267,9 @@ public class EvaluationOfTemporalRelatio public static class RemoveEventEventRelations extends JCasAnnotator_ImplBase { - public static final String PARAM_RELATION_VIEW = "RelationView"; - - @ConfigurationParameter(name = PARAM_RELATION_VIEW) - private String relationViewName = CAS.NAME_DEFAULT_SOFA; @Override public void process(JCas jCas) throws AnalysisEngineProcessException { - JCas relationView; - try { - relationView = jCas.getView(this.relationViewName); - } catch (CASException e) { - throw new AnalysisEngineProcessException(e); - } - - for(BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select(relationView, BinaryTextRelation.class))){ + for(BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select(jCas, BinaryTextRelation.class))){ if(relation.getCategory().equals("CONTAINS")){ RelationArgument arg1 = relation.getArg1(); RelationArgument arg2 = relation.getArg2(); @@ -312,6 +303,11 @@ public class EvaluationOfTemporalRelatio public static class RemoveCrossSentenceRelations extends JCasAnnotator_ImplBase { + public static final String PARAM_SENTENCE_VIEW = "SentenceView"; + + @ConfigurationParameter(name = PARAM_SENTENCE_VIEW) + private String sentenceViewName = CAS.NAME_DEFAULT_SOFA; + public static final String PARAM_RELATION_VIEW = "RelationView"; @ConfigurationParameter(name = PARAM_RELATION_VIEW) @@ -319,8 +315,9 @@ public class EvaluationOfTemporalRelatio @Override public void process(JCas jCas) throws AnalysisEngineProcessException { - JCas relationView; + JCas sentenceView, relationView; try { + sentenceView = jCas.getView(this.sentenceViewName); relationView = jCas.getView(this.relationViewName); } catch (CASException e) { throw new AnalysisEngineProcessException(e); @@ -329,7 +326,7 @@ public class EvaluationOfTemporalRelatio // map events and times to the sentences that contain them Map sentenceIndex = Maps.newHashMap(); int index = -1; - for (Sentence sentence : JCasUtil.select(jCas, Sentence.class)) { + for (Sentence sentence : JCasUtil.select(sentenceView, Sentence.class)) { ++index; for (EventMention event : JCasUtil.selectCovered(relationView, EventMention.class, sentence)) { sentenceIndex.put(event, index); @@ -355,21 +352,10 @@ public class EvaluationOfTemporalRelatio } public static class RemoveNonContainsRelations extends JCasAnnotator_ImplBase { - public static final String PARAM_RELATION_VIEW = "RelationView"; - - @ConfigurationParameter(name = PARAM_RELATION_VIEW) - private String relationViewName = CAS.NAME_DEFAULT_SOFA; - @Override public void process(JCas jCas) throws AnalysisEngineProcessException { - JCas relationView; - try { - relationView = jCas.getView(this.relationViewName); - } catch (CASException e) { - throw new AnalysisEngineProcessException(e); - } for (BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select( - relationView, + jCas, BinaryTextRelation.class))) { if (!relation.getCategory().startsWith("CONTAINS")) { relation.getArg1().removeFromIndexes();