You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by st...@apache.org on 2013/01/29 17:18:44 UTC

svn commit: r1439977 - /incubator/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/eval/RelationExtractorEvaluation.java

Author: stevenbethard
Date: Tue Jan 29 16:18:44 2013
New Revision: 1439977

URL: http://svn.apache.org/viewvc?rev=1439977&view=rev
Log:
Removes more arg1/arg2 hackery now that the reader has been fixed.

Modified:
    incubator/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/eval/RelationExtractorEvaluation.java

Modified: incubator/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/eval/RelationExtractorEvaluation.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/eval/RelationExtractorEvaluation.java?rev=1439977&r1=1439976&r2=1439977&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/eval/RelationExtractorEvaluation.java (original)
+++ incubator/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/eval/RelationExtractorEvaluation.java Tue Jan 29 16:18:44 2013
@@ -908,21 +908,7 @@ public class RelationExtractorEvaluation
     }
 
     public HashableArguments(BinaryTextRelation relation) {
-      this(getArg1(relation), getArg2(relation));
-    }
-
-    // HACK: arg1 is not always arg1 because of bugs in the reader
-    private static Annotation getArg1(BinaryTextRelation rel) {
-      RelationArgument arg1 = rel.getArg1();
-      return arg1.getRole().equals("Argument") ? arg1.getArgument() : rel.getArg2().getArgument();
-    }
-
-    // HACK: arg2 is not always arg2 because of bugs in the reader
-    private static Annotation getArg2(BinaryTextRelation rel) {
-      RelationArgument arg2 = rel.getArg2();
-      return arg2.getRole().equals("Related_to")
-          ? arg2.getArgument()
-          : rel.getArg1().getArgument();
+      this(relation.getArg1().getArgument(), relation.getArg2().getArgument());
     }
 
     @Override