Return-Path: 
 <commits-return-1902-apmail-ctakes-commits-archive=ctakes.apache.org@ctakes.apache.org>
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 B8092FA6A
	for <apmail-ctakes-commits-archive@www.apache.org>;
 Tue, 23 Apr 2013 20:04:31 +0000 (UTC)
Received: (qmail 10264 invoked by uid 500); 23 Apr 2013 20:04:31 -0000
Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org
Received: (qmail 10235 invoked by uid 500); 23 Apr 2013 20:04:31 -0000
Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ctakes.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ctakes.apache.org>
List-Post: <mailto:commits@ctakes.apache.org>
List-Id: <commits.ctakes.apache.org>
Reply-To: dev@ctakes.apache.org
Delivered-To: mailing list commits@ctakes.apache.org
Received: (qmail 10228 invoked by uid 99); 23 Apr 2013 20:04:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Apr 2013 20:04:31 +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; Tue, 23 Apr 2013 20:04:29 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 83CD1238899C;
	Tue, 23 Apr 2013 20:04:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1471126 -
 /ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/BaselineEventTimeRelationAnnotator.java
Date: Tue, 23 Apr 2013 20:04:08 -0000
To: commits@ctakes.apache.org
From: dligach@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130423200408.83CD1238899C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dligach
Date: Tue Apr 23 20:04:08 2013
New Revision: 1471126

URL: http://svn.apache.org/r1471126
Log:
cleanup

Modified:
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/BaselineEventTimeRelationAnnotator.java

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/BaselineEventTimeRelationAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/BaselineEventTimeRelationAnnotator.java?rev=1471126&r1=1471125&r2=1471126&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/BaselineEventTimeRelationAnnotator.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/ae/baselines/BaselineEventTimeRelationAnnotator.java Tue Apr 23 20:04:08 2013
@@ -48,31 +48,27 @@ public class BaselineEventTimeRelationAn
       JCas jCas,
       Annotation sentence) {
   
-    List<IdentifiedAnnotationPair> pairs = Lists.newArrayList();
     List<EventMention> events = JCasUtil.selectCovered(jCas, EventMention.class, sentence);
     List<TimeMention> times = JCasUtil.selectCovered(jCas, TimeMention.class, sentence);
     
     if(times.size() != 1 || events.size() < 1) {
-      return pairs;
+      return Lists.newArrayList();
     }
 
+    // compute token distance for each time-event pair
+    HashMap<IdentifiedAnnotationPair, Integer> distanceLookup = new HashMap<IdentifiedAnnotationPair, Integer>();
     for (EventMention event : events) {
       // ignore subclasses like Procedure and Disease/Disorder
       if (event.getClass().equals(EventMention.class)) {
         for (TimeMention time : times) {
-          pairs.add(new IdentifiedAnnotationPair(time, event));
+          IdentifiedAnnotationPair pair = new IdentifiedAnnotationPair(time, event);
+          List<BaseToken> baseTokens = JCasUtil.selectBetween(jCas, BaseToken.class, pair.getArg1(), pair.getArg2());
+          int distance = baseTokens.size();
+          distanceLookup.put(pair, distance);
         }
       }
     }
 
-    // compute token distance for each time-event pair
-    HashMap<IdentifiedAnnotationPair, Integer> distanceLookup = new HashMap<IdentifiedAnnotationPair, Integer>();
-    for(IdentifiedAnnotationPair pair : pairs) {
-      List<BaseToken> baseTokens = JCasUtil.selectBetween(jCas, BaseToken.class, pair.getArg1(), pair.getArg2());
-      int distance = baseTokens.size();
-      distanceLookup.put(pair, distance);
-    }
-
     // find the pair where the distance between entities is the smallest and return it
     List<IdentifiedAnnotationPair> rankedPairs = new ArrayList<IdentifiedAnnotationPair>(distanceLookup.keySet());
     Function<IdentifiedAnnotationPair, Integer> getValue = Functions.forMap(distanceLookup);