You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2017/03/01 00:22:33 UTC
svn commit: r1784840 [2/2] - in /ctakes/trunk:
ctakes-core-res/src/main/resources/org/apache/ctakes/core/list/
ctakes-core/ ctakes-core/src/main/java/org/apache/ctakes/core/ae/
ctakes-core/src/main/java/org/apache/ctakes/core/cc/
ctakes-core/src/main/j...
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java Wed Mar 1 00:22:32 2017
@@ -18,25 +18,11 @@
*/
package org.apache.ctakes.core.cr;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
+import org.apache.ctakes.core.resource.FileResource;
+import org.apache.ctakes.core.resource.JdbcConnectionResource;
+import org.apache.ctakes.typesystem.type.structured.DocumentID;
import org.apache.log4j.Logger;
-
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CollectionException;
import org.apache.uima.collection.CollectionReader_ImplBase;
@@ -44,15 +30,23 @@ import org.apache.uima.resource.Resource
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
-import org.apache.ctakes.core.resource.FileResource;
-import org.apache.ctakes.core.resource.JdbcConnectionResource;
-import org.apache.ctakes.typesystem.type.structured.DocumentID;
+import java.io.*;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
/**
* Collection Reader that pulls documents to be processed from a database.
*
* @author Mayo Clinic
*/
+@PipeBitInfo(
+ name = "JDBC Collection Reader",
+ description = "Reads document texts from database text fields.",
+ role = PipeBitInfo.Role.READER,
+ output = PipeBitInfo.NEW_JCAS
+)
public class JdbcCollectionReader extends CollectionReader_ImplBase
{
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java Wed Mar 1 00:22:32 2017
@@ -18,27 +18,23 @@
*/
package org.apache.ctakes.core.cr;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
+import org.apache.ctakes.typesystem.type.structured.DocumentID;
import org.apache.log4j.Logger;
-
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
import org.apache.uima.collection.CollectionException;
import org.apache.uima.collection.CollectionReader_ImplBase;
import org.apache.uima.jcas.JCas;
-//import org.apache.uima.jcas.tcas.DocumentAnnotation;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
-import org.apache.ctakes.typesystem.type.structured.DocumentID;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+//import org.apache.uima.jcas.tcas.DocumentAnnotation;
/**
*
@@ -56,6 +52,12 @@ import org.apache.ctakes.typesystem.type
*
*/
+@PipeBitInfo(
+ name = "Lines in File Reader",
+ description = "Reads a document texts from a single text file, treating each line as a document.",
+ role = PipeBitInfo.Role.READER,
+ output = PipeBitInfo.NEW_JCAS
+)
public class LinesFromFileCollectionReader extends CollectionReader_ImplBase {
/**
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LuceneCollectionReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LuceneCollectionReader.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LuceneCollectionReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LuceneCollectionReader.java Wed Mar 1 00:22:32 2017
@@ -1,8 +1,6 @@
package org.apache.ctakes.core.cr;
-import java.io.File;
-import java.io.IOException;
-
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
import org.apache.ctakes.typesystem.type.structured.DocumentID;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
@@ -21,6 +19,15 @@ import org.apache.uima.resource.Resource
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
+import java.io.File;
+import java.io.IOException;
+
+@PipeBitInfo(
+ name = "Lucene Field Reader",
+ description = "Reads document texts from Lucene text fields.",
+ role = PipeBitInfo.Role.READER,
+ output = PipeBitInfo.NEW_JCAS
+)
public class LuceneCollectionReader extends CasCollectionReader_ImplBase {
public static final String PARAM_INDEX_DIR = "IndexDirectory";
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/TextReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/TextReader.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/TextReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/TextReader.java Wed Mar 1 00:22:32 2017
@@ -18,32 +18,31 @@
*/
package org.apache.ctakes.core.cr;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.List;
-
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
import org.apache.ctakes.typesystem.type.structured.DocumentID;
import org.apache.uima.UimaContext;
-import org.apache.uima.cas.impl.XmiCasDeserializer;
import org.apache.uima.collection.CasInitializer;
import org.apache.uima.collection.CollectionException;
+import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
+import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
-import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
-import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.xml.sax.SAXException;
+
+import java.io.*;
+import java.util.Iterator;
+import java.util.List;
/**
- * UIMA CollectionReader that reads in CASes from XMI files.
+ * UIMA CollectionReader that reads in Text from text files.
*/
+@PipeBitInfo(
+ name = "Text Files Reader",
+ description = "Reads document texts from text files specified in a provided list.",
+ role = PipeBitInfo.Role.READER,
+ output = PipeBitInfo.NEW_JCAS
+)
public class TextReader extends JCasCollectionReader_ImplBase {
public static final String PARAM_FILES = "files";
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XMIReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XMIReader.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XMIReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XMIReader.java Wed Mar 1 00:22:32 2017
@@ -18,27 +18,34 @@
*/
package org.apache.ctakes.core.cr;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
import org.apache.uima.UimaContext;
import org.apache.uima.cas.impl.XmiCasDeserializer;
import org.apache.uima.collection.CollectionException;
+import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
+import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
-import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
-import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.xml.sax.SAXException;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
/**
* UIMA CollectionReader that reads in CASes from XMI files.
*/
+@PipeBitInfo(
+ name = "XMI Files Reader",
+ description = "Reads document texts and annotations from XMI files specified in a provided list.",
+ role = PipeBitInfo.Role.READER,
+ output = PipeBitInfo.POPULATED_JCAS
+)
public class XMIReader extends JCasCollectionReader_ImplBase {
public static final String PARAM_FILES = "files";
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java Wed Mar 1 00:22:32 2017
@@ -18,11 +18,7 @@
*/
package org.apache.ctakes.core.cr;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.XmiCasDeserializer;
import org.apache.uima.collection.CollectionException;
@@ -33,9 +29,21 @@ import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
import org.xml.sax.SAXException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+
/**
* A simple collection reader that reads CASes in XMI format from a directory in the filesystem.
*/
+@PipeBitInfo(
+ name = "XMI in Dir Reader",
+ description = "Reads document texts and annotations from XMI files in a directory.",
+ role = PipeBitInfo.Role.READER,
+ output = PipeBitInfo.POPULATED_JCAS
+)
public class XmiCollectionReaderCtakes extends CollectionReader_ImplBase {
/**
* Name of configuration parameter that must be set to the path of a directory containing the XMI
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ArrayListMap.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ArrayListMap.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ArrayListMap.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ArrayListMap.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.*;
@@ -56,8 +56,8 @@ final public class ArrayListMap<K, V> im
* {@inheritDoc}
*/
@Override
- public List<V> obtainCollection( final K key ) {
- return _delegate.obtainCollection( key );
+ public List<V> getOrCreateCollection( final K key ) {
+ return _delegate.getOrCreateCollection( key );
}
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreator.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreator.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.Collection;
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreatorFactory.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreatorFactory.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreatorFactory.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionCreatorFactory.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.ArrayList;
import java.util.HashSet;
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionMap.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionMap.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionMap.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/CollectionMap.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.Collection;
import java.util.Map;
@@ -30,7 +30,7 @@ public interface CollectionMap<K, V, T e
* @param key key for internal collection
* @return (possibly new) collection mapped with key
*/
- public T obtainCollection( K key );
+ public T getOrCreateCollection( K key );
/**
* check the collection map for a key and value combination
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/DefaultCollectionMap.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/DefaultCollectionMap.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/DefaultCollectionMap.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/DefaultCollectionMap.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.*;
@@ -76,7 +76,7 @@ final public class DefaultCollectionMap<
* {@inheritDoc}
*/
@Override
- public T obtainCollection( final K key ) {
+ public T getOrCreateCollection( final K key ) {
T collection = _delegate.get( key );
if ( collection == null ) {
collection = _collectionCreator.createCollection();
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/EnumSetMap.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/EnumSetMap.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/EnumSetMap.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/EnumSetMap.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.*;
@@ -46,8 +46,8 @@ final public class EnumSetMap<K extends
* {@inheritDoc}
*/
@Override
- public Set<V> obtainCollection( final K key ) {
- return _delegate.obtainCollection( key );
+ public Set<V> getOrCreateCollection( final K key ) {
+ return _delegate.getOrCreateCollection( key );
}
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/HashSetMap.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/HashSetMap.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/HashSetMap.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/HashSetMap.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import java.util.*;
@@ -56,8 +56,8 @@ final public class HashSetMap<K, V> impl
* {@inheritDoc}
*/
@Override
- public Set<V> obtainCollection( final K key ) {
- return _delegate.obtainCollection( key );
+ public Set<V> getOrCreateCollection( final K key ) {
+ return _delegate.getOrCreateCollection( key );
}
Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ImmutableCollectionMap.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ImmutableCollectionMap.java?rev=1784840&r1=1784837&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ImmutableCollectionMap.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/collection/ImmutableCollectionMap.java Wed Mar 1 00:22:32 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.dictionary.lookup2.util.collection;
+package org.apache.ctakes.core.util.collection;
import javax.annotation.concurrent.Immutable;
import java.util.*;
@@ -47,7 +47,7 @@ final public class ImmutableCollectionMa
* {@inheritDoc}
*/
@Override
- public T obtainCollection( final K key ) {
+ public T getOrCreateCollection( final K key ) {
return getCollection( key );
}
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=1784840&r1=1784839&r2=1784840&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 Wed Mar 1 00:22:32 2017
@@ -21,6 +21,8 @@ package org.apache.ctakes.dictionary.loo
import org.apache.ctakes.core.fsm.token.NumberToken;
import org.apache.ctakes.core.resource.FileLocator;
import org.apache.ctakes.core.util.JCasUtil;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
import org.apache.ctakes.dictionary.lookup2.concept.Concept;
import org.apache.ctakes.dictionary.lookup2.concept.ConceptFactory;
import org.apache.ctakes.dictionary.lookup2.dictionary.DictionaryDescriptorParser;
@@ -28,8 +30,6 @@ import org.apache.ctakes.dictionary.look
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
import org.apache.ctakes.dictionary.lookup2.util.DictionarySpec;
import org.apache.ctakes.dictionary.lookup2.util.FastLookupToken;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
import org.apache.ctakes.typesystem.type.syntax.*;
import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
@@ -37,6 +37,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.analysis_engine.annotator.AnnotatorContextException;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JFSIndexRepository;
@@ -55,7 +56,7 @@ import java.util.*;
* Affiliation: CHIP-NLP
* Date: 12/6/13
*/
-abstract public class AbstractJCasTermAnnotator extends org.apache.uima.fit.component.JCasAnnotator_ImplBase
+abstract public class AbstractJCasTermAnnotator extends JCasAnnotator_ImplBase
implements JCasTermAnnotator, WindowProcessor {
// LOG4J logger based on interface name
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=1784840&r1=1784839&r2=1784840&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 Wed Mar 1 00:22:32 2017
@@ -18,12 +18,13 @@
*/
package org.apache.ctakes.dictionary.lookup2.ae;
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.term.RareWordTerm;
import org.apache.ctakes.dictionary.lookup2.textspan.DefaultTextSpan;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
import org.apache.ctakes.dictionary.lookup2.util.FastLookupToken;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.resource.ResourceInitializationException;
@@ -37,6 +38,11 @@ import java.util.List;
* Affiliation: CHIP-NLP
* Date: 11/19/13
*/
+@PipeBitInfo(
+ name = "Dictionary Lookup (Default)",
+ description = "Annotates clinically-relevant terms. Terms must match dictionary entries exactly.",
+ output = "Clinically-relevant Terms and their unique concept identifiers."
+)
final public class DefaultJCasTermAnnotator extends AbstractJCasTermAnnotator {
/**
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java Wed Mar 1 00:22:32 2017
@@ -18,10 +18,10 @@
*/
package org.apache.ctakes.dictionary.lookup2.ae;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
import org.apache.ctakes.dictionary.lookup2.util.FastLookupToken;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.uima.analysis_component.AnalysisComponent;
import java.util.Collection;
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=1784840&r1=1784839&r2=1784840&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 Wed Mar 1 00:22:32 2017
@@ -18,13 +18,14 @@
*/
package org.apache.ctakes.dictionary.lookup2.ae;
+import org.apache.ctakes.core.pipeline.PipeBitInfo;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.term.RareWordTerm;
import org.apache.ctakes.dictionary.lookup2.textspan.DefaultTextSpan;
import org.apache.ctakes.dictionary.lookup2.textspan.MultiTextSpan;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
import org.apache.ctakes.dictionary.lookup2.util.FastLookupToken;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
@@ -43,6 +44,11 @@ import java.util.List;
* Affiliation: CHIP-NLP
* Date: 12/6/13
*/
+@PipeBitInfo(
+ name = "Dictionary Lookup (Default)",
+ description = "Annotates clinically-relevant terms. Terms can overlap dictionary entries.",
+ output = "Clinically-relevant Terms and their unique concept identifiers."
+)
final public class OverlapJCasTermAnnotator extends AbstractJCasTermAnnotator {
// LOG4J logger based on interface name
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/WindowProcessor.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/WindowProcessor.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/WindowProcessor.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/WindowProcessor.java Wed Mar 1 00:22:32 2017
@@ -18,9 +18,9 @@
*/
package org.apache.ctakes.dictionary.lookup2.ae;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/BsvConceptFactory.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/BsvConceptFactory.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/BsvConceptFactory.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/BsvConceptFactory.java Wed Mar 1 00:22:32 2017
@@ -1,11 +1,11 @@
package org.apache.ctakes.dictionary.lookup2.concept;
import org.apache.ctakes.core.resource.FileLocator;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
import org.apache.ctakes.dictionary.lookup2.util.CuiCodeUtil;
import org.apache.ctakes.dictionary.lookup2.util.LookupUtil;
import org.apache.ctakes.dictionary.lookup2.util.TuiCodeUtil;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/DefaultConcept.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/DefaultConcept.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/DefaultConcept.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/DefaultConcept.java Wed Mar 1 00:22:32 2017
@@ -1,9 +1,9 @@
package org.apache.ctakes.dictionary.lookup2.concept;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
+import org.apache.ctakes.core.util.collection.ImmutableCollectionMap;
import org.apache.ctakes.dictionary.lookup2.util.SemanticUtil;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.ImmutableCollectionMap;
import org.apache.ctakes.typesystem.type.constants.CONST;
import javax.annotation.concurrent.Immutable;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/JdbcConceptFactory.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/JdbcConceptFactory.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/JdbcConceptFactory.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/concept/JdbcConceptFactory.java Wed Mar 1 00:22:32 2017
@@ -1,10 +1,10 @@
package org.apache.ctakes.dictionary.lookup2.concept;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
import org.apache.ctakes.dictionary.lookup2.util.CuiCodeUtil;
import org.apache.ctakes.dictionary.lookup2.util.JdbcConnectionFactory;
import org.apache.ctakes.dictionary.lookup2.util.TuiCodeUtil;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/AbstractTermConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/AbstractTermConsumer.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/AbstractTermConsumer.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/AbstractTermConsumer.java Wed Mar 1 00:22:32 2017
@@ -18,11 +18,11 @@
*/
package org.apache.ctakes.dictionary.lookup2.consumer;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
import org.apache.ctakes.dictionary.lookup2.concept.Concept;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.jcas.JCas;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/DefaultTermConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/DefaultTermConsumer.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/DefaultTermConsumer.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/DefaultTermConsumer.java Wed Mar 1 00:22:32 2017
@@ -18,11 +18,11 @@
*/
package org.apache.ctakes.dictionary.lookup2.consumer;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.concept.Concept;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
import org.apache.ctakes.dictionary.lookup2.util.CuiCodeUtil;
import org.apache.ctakes.dictionary.lookup2.util.SemanticUtil;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.ctakes.typesystem.type.constants.CONST;
import org.apache.ctakes.typesystem.type.refsem.UmlsConcept;
import org.apache.ctakes.typesystem.type.textsem.*;
@@ -130,15 +130,22 @@ final public class DefaultTermConsumer e
}
final Collection<UmlsConcept> umlsConcepts = new HashSet<>();
for ( Concept concept : concepts ) {
+ final Collection<Integer> allSemantics = concept.getCtakesSemantics();
+ if ( !allSemantics.contains( cTakesSemantic ) ) {
+ continue;
+ }
+ boolean added = false;
final Collection<String> tuis = concept.getCodes( Concept.TUI );
if ( !tuis.isEmpty() ) {
for ( String tui : tuis ) {
// the concept could have tuis outside this cTakes semantic group
if ( SemanticUtil.getTuiSemanticGroupId( tui ) == cTakesSemantic ) {
umlsConcepts.addAll( _umlsConceptCreator.createUmlsConcepts( jcas, codingScheme, tui, concept ) );
+ added = true;
}
}
- } else {
+ }
+ if ( !added ) {
umlsConcepts.addAll( _umlsConceptCreator.createUmlsConcepts( jcas, codingScheme, null, concept ) );
}
}
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/PrecisionTermConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/PrecisionTermConsumer.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/PrecisionTermConsumer.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/PrecisionTermConsumer.java Wed Mar 1 00:22:32 2017
@@ -18,11 +18,11 @@
*/
package org.apache.ctakes.dictionary.lookup2.consumer;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
import org.apache.ctakes.dictionary.lookup2.concept.Concept;
import org.apache.ctakes.dictionary.lookup2.textspan.MultiTextSpan;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.jcas.JCas;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/SemanticCleanupTermConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/SemanticCleanupTermConsumer.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/SemanticCleanupTermConsumer.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/SemanticCleanupTermConsumer.java Wed Mar 1 00:22:32 2017
@@ -1,10 +1,10 @@
package org.apache.ctakes.dictionary.lookup2.consumer;
+import org.apache.ctakes.core.util.collection.CollectionMap;
+import org.apache.ctakes.core.util.collection.HashSetMap;
import org.apache.ctakes.dictionary.lookup2.concept.Concept;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.HashSetMap;
import org.apache.ctakes.typesystem.type.constants.CONST;
import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/TermConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/TermConsumer.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/TermConsumer.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/consumer/TermConsumer.java Wed Mar 1 00:22:32 2017
@@ -18,10 +18,10 @@
*/
package org.apache.ctakes.dictionary.lookup2.consumer;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.concept.Concept;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
import org.apache.ctakes.dictionary.lookup2.textspan.TextSpan;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.jcas.JCas;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/BsvRareWordDictionary.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/BsvRareWordDictionary.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/BsvRareWordDictionary.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/BsvRareWordDictionary.java Wed Mar 1 00:22:32 2017
@@ -19,10 +19,10 @@
package org.apache.ctakes.dictionary.lookup2.dictionary;
import org.apache.ctakes.core.resource.FileLocator;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.term.RareWordTerm;
import org.apache.ctakes.dictionary.lookup2.util.FastLookupToken;
import org.apache.ctakes.dictionary.lookup2.util.LookupUtil;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/MemRareWordDictionary.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/MemRareWordDictionary.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/MemRareWordDictionary.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/MemRareWordDictionary.java Wed Mar 1 00:22:32 2017
@@ -18,8 +18,8 @@
*/
package org.apache.ctakes.dictionary.lookup2.dictionary;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.term.RareWordTerm;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import java.util.Collection;
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/RareWordTermMapCreator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/RareWordTermMapCreator.java?rev=1784840&r1=1784839&r2=1784840&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/RareWordTermMapCreator.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/dictionary/RareWordTermMapCreator.java Wed Mar 1 00:22:32 2017
@@ -18,11 +18,11 @@
*/
package org.apache.ctakes.dictionary.lookup2.dictionary;
+import org.apache.ctakes.core.util.collection.ArrayListMap;
+import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.term.RareWordTerm;
import org.apache.ctakes.dictionary.lookup2.util.CuiCodeUtil;
import org.apache.ctakes.dictionary.lookup2.util.LookupUtil;
-import org.apache.ctakes.dictionary.lookup2.util.collection.ArrayListMap;
-import org.apache.ctakes.dictionary.lookup2.util.collection.CollectionMap;
import org.apache.log4j.Logger;
import java.util.*;