ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seanfi...@apache.org
Subject svn commit: r1628539 - in /ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae: AbstractJCasTermAnnotator.java DefaultJCasTermAnnotator.java OverlapJCasTermAnnotator.java
Date Tue, 30 Sep 2014 20:06:53 GMT
Author: seanfinan
Date: Tue Sep 30 20:06:53 2014
New Revision: 1628539

URL: http://svn.apache.org/r1628539
Log:
Added check for metadata tag in AbstractJCasTermAnnotator
Switched using LookupToken length to RareWordHit length for minimum textspan in implementations

Modified:
    ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/AbstractJCasTermAnnotator.java
    ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
    ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/AbstractJCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/AbstractJCasTermAnnotator.java?rev=1628539&r1=1628538&r2=1628539&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/AbstractJCasTermAnnotator.java
(original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/AbstractJCasTermAnnotator.java
Tue Sep 30 20:06:53 2014
@@ -124,7 +124,7 @@ abstract public class AbstractJCasTermAn
          if ( minimumSpan != null ) {
             _minimumLookupSpan = parseInt( minimumSpan, MIN_SPAN_PRP_KEY, _minimumLookupSpan
);
          }
-         LOGGER.info( "Using minimum lookup token span: " + _minimumLookupSpan );
+         LOGGER.info( "Using minimum term text span: " + _minimumLookupSpan );
          final FileResource fileResource = (FileResource)uimaContext.getResourceObject( DICTIONARY_DESCRIPTOR_KEY
);
          final File descriptorFile = fileResource.getFile();
          _dictionarySpec = DictionaryDescriptorParser.parseDescriptor( descriptorFile, uimaContext
);
@@ -202,7 +202,8 @@ abstract public class AbstractJCasTermAn
       final String coveredText = window.getCoveredText();
       return !coveredText.equals( "section id" )
              && !coveredText.startsWith( "[start section id" )
-             && !coveredText.startsWith( "[end section id" );
+             && !coveredText.startsWith( "[end section id" )
+             && !coveredText.startsWith( "[meta rev_" );
    }
 
 

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java?rev=1628539&r1=1628538&r2=1628539&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
(original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
Tue Sep 30 20:06:53 2014
@@ -53,7 +53,7 @@ final public class DefaultJCasTermAnnota
             continue;
          }
          for ( RareWordTerm rareWordHit : rareWordHits ) {
-            if ( lookupToken.getLength() < _minimumLookupSpan ) {
+            if ( rareWordHit.getText().length() < _minimumLookupSpan ) {
                continue;
             }
             if ( rareWordHit.getTokenCount() == 1 ) {

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java?rev=1628539&r1=1628538&r2=1628539&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java
(original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java
Tue Sep 30 20:06:53 2014
@@ -94,7 +94,7 @@ final public class OverlapJCasTermAnnota
             continue;
          }
          for ( RareWordTerm rareWordHit : rareWordHits ) {
-            if ( lookupToken.getLength() < _minimumLookupSpan ) {
+            if ( rareWordHit.getText().length() < _minimumLookupSpan ) {
                continue;
             }
             if ( rareWordHit.getTokenCount() == 1 ) {



Mime
View raw message