ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlig...@apache.org
Subject svn commit: r1487519 - /ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/
Date Wed, 29 May 2013 15:42:30 GMT
Author: dligach
Date: Wed May 29 15:42:29 2013
New Revision: 1487519

URL: http://svn.apache.org/r1487519
Log:
The new baseline requiested by reviewer 2 became baseline2. Old baseline3 became baseline4.

Added:
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java
      - copied, changed from r1487513, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/BaselineEntityMentionPairRelationExtractorAnnotator.java
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4DegreeOfRelationExtractorAnnotator.java
      - copied, changed from r1485198, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3DegreeOfRelationExtractorAnnotator.java
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4EntityMentionPairRelationExtractorAnnotator.java
      - copied, changed from r1485198, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java
Removed:
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3DegreeOfRelationExtractorAnnotator.java
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/BaselineEntityMentionPairRelationExtractorAnnotator.java

Copied: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java
(from r1487513, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/BaselineEntityMentionPairRelationExtractorAnnotator.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java?p2=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java&p1=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/BaselineEntityMentionPairRelationExtractorAnnotator.java&r1=1487513&r2=1487519&rev=1487519&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/BaselineEntityMentionPairRelationExtractorAnnotator.java
(original)
+++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java
Wed May 29 15:42:29 2013
@@ -44,7 +44,7 @@ import com.google.common.collect.Orderin
  * This baseline links each anatomical site with the closest entity of a type  
  * that's suitable for location_of, as long as there is no intervening anatomical site. 
  */
-public class BaselineEntityMentionPairRelationExtractorAnnotator extends RelationExtractorAnnotator
{
+public class Baseline3EntityMentionPairRelationExtractorAnnotator extends RelationExtractorAnnotator
{
 	
 	@Override
 	public Class<? extends Annotation> getCoveringClass(){
@@ -107,7 +107,7 @@ public class BaselineEntityMentionPairRe
   /*
    * Return entity mentions that qualityf to be the arg2 of location_of relation (i.e. 2,
3, or 5)
    */
-  private List<EntityMention> getEntitiesSuitableForLocationOf(List<EntityMention>
entityMentions) {
+  private static List<EntityMention> getEntitiesSuitableForLocationOf(List<EntityMention>
entityMentions) {
     
     HashSet<Integer> okArg2Types = new HashSet<Integer>(Arrays.asList(2, 3, 5));
     List<EntityMention> suitableEntities = new ArrayList<EntityMention>();

Copied: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4DegreeOfRelationExtractorAnnotator.java
(from r1485198, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3DegreeOfRelationExtractorAnnotator.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4DegreeOfRelationExtractorAnnotator.java?p2=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4DegreeOfRelationExtractorAnnotator.java&p1=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3DegreeOfRelationExtractorAnnotator.java&r1=1485198&r2=1487519&rev=1487519&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3DegreeOfRelationExtractorAnnotator.java
(original)
+++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4DegreeOfRelationExtractorAnnotator.java
Wed May 29 15:42:29 2013
@@ -32,7 +32,7 @@ import org.apache.uima.jcas.tcas.Annotat
  * Annotate degree_of relation between two entities whenever 
  * they are enclosed within the same noun phrse.
  */
-public class Baseline3DegreeOfRelationExtractorAnnotator extends DegreeOfRelationExtractorAnnotator
{
+public class Baseline4DegreeOfRelationExtractorAnnotator extends DegreeOfRelationExtractorAnnotator
{
 
 	@Override
 	public List<IdentifiedAnnotationPair> getCandidateRelationArgumentPairs(

Copied: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4EntityMentionPairRelationExtractorAnnotator.java
(from r1485198, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4EntityMentionPairRelationExtractorAnnotator.java?p2=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4EntityMentionPairRelationExtractorAnnotator.java&p1=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java&r1=1485198&r2=1487519&rev=1487519&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline3EntityMentionPairRelationExtractorAnnotator.java
(original)
+++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/ae/baselines/Baseline4EntityMentionPairRelationExtractorAnnotator.java
Wed May 29 15:42:29 2013
@@ -35,7 +35,7 @@ import org.uimafit.util.JCasUtil;
  * Annotate location_of relation between two entities whenever 
  * they are enclosed within the same noun phrse.
  */
-public class Baseline3EntityMentionPairRelationExtractorAnnotator extends RelationExtractorAnnotator
{
+public class Baseline4EntityMentionPairRelationExtractorAnnotator extends RelationExtractorAnnotator
{
 	
 	@Override
 	protected Class<? extends Annotation> getCoveringClass() {



Mime
View raw message