Return-Path: 
 <commits-return-3351-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 A9E3411BFC
	for <apmail-ctakes-commits-archive@www.apache.org>;
 Fri, 15 Aug 2014 13:13:55 +0000 (UTC)
Received: (qmail 15186 invoked by uid 500); 15 Aug 2014 13:13:55 -0000
Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org
Received: (qmail 15146 invoked by uid 500); 15 Aug 2014 13:13:55 -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 15135 invoked by uid 99); 15 Aug 2014 13:13:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2014 13:13:55 +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, 15 Aug 2014 13:13:33 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E55C12388860;
	Fri, 15 Aug 2014 13:13:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1618170 -
 /ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java
Date: Fri, 15 Aug 2014 13:13:31 -0000
To: commits@ctakes.apache.org
From: tmill@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140815131331.E55C12388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tmill
Date: Fri Aug 15 13:13:31 2014
New Revision: 1618170

URL: http://svn.apache.org/r1618170
Log:
Reverted RemoveNonContainsRelations so that it does what it says it does.

Modified:
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java?rev=1618170&r1=1618169&r2=1618170&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java Fri Aug 15 13:13:31 2014
@@ -137,14 +137,10 @@ Evaluation_ImplBase<AnnotationStatistics
       for (BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select(
           relationView,
           BinaryTextRelation.class))) {
-        String relationType = relation.getCategory();
-        if (relationType.startsWith("BEFORE")|| relationType.startsWith("BEGINS-ON")|| relationType.startsWith("ENDS-ON")) {
-          //        relation.getArg1().removeFromIndexes();
-          //        relation.getArg2().removeFromIndexes();
-          //        relation.removeFromIndexes();
-          relation.setCategory("RARE");
-        }else if(relationType.startsWith("CONTAINS")|| relationType.startsWith("OVERLAP")){
-          relation.setCategory("COMMON");
+        if (!relation.getCategory().startsWith("CONTAINS")) {
+          relation.getArg1().removeFromIndexes();
+          relation.getArg2().removeFromIndexes();
+          relation.removeFromIndexes();
         }
       }
     }