You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ch...@apache.org on 2013/07/09 00:29:14 UTC

svn commit: r1500993 - in /ctakes/trunk: ctakes-pos-tagger-res/src/main/resources/org/apache/ctakes/postagger/models/ ctakes-pos-tagger/desc/test/ ctakes-pos-tagger/src/test/resources/data/ ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/...

Author: chenpei
Date: Mon Jul  8 22:29:14 2013
New Revision: 1500993

URL: http://svn.apache.org/r1500993
Log:
CTAKES-97 - Since OpenNLP 1.5+, there is no need to load up the tag dictionary anymore.
Removing unnecessary/unused bit of code.
Forgot to check in the unused tagdictionary from referencing projects.

Removed:
    ctakes/trunk/ctakes-pos-tagger-res/src/main/resources/org/apache/ctakes/postagger/models/tag.dictionary.txt
    ctakes/trunk/ctakes-pos-tagger/src/test/resources/data/unit-test-tag-dictionary.txt
Modified:
    ctakes/trunk/ctakes-pos-tagger/desc/test/POSTagger.xml
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventAndTimeExtractionPipeline.java
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventExtractionPipeline.java

Modified: ctakes/trunk/ctakes-pos-tagger/desc/test/POSTagger.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-pos-tagger/desc/test/POSTagger.xml?rev=1500993&r1=1500992&r2=1500993&view=diff
==============================================================================
--- ctakes/trunk/ctakes-pos-tagger/desc/test/POSTagger.xml (original)
+++ ctakes/trunk/ctakes-pos-tagger/desc/test/POSTagger.xml Mon Jul  8 22:29:14 2013
@@ -38,23 +38,6 @@
 				<multiValued>false</multiValued>
 				<mandatory>true</mandatory>
 			</configurationParameter>
-			<configurationParameter>
-				<name>TagDictionary</name>
-				<description>The file contains a list of words, and for each word,
-					the set of part of speech tags to be considered for that word. For
-					words in the tag dictionary, only the corresponding tags in the tag
-					dictionary are considered when tagging the word with a part of
-					speech.</description>
-				<type>String</type>
-				<multiValued>false</multiValued>
-				<mandatory>false</mandatory>
-			</configurationParameter>
-			<configurationParameter>
-				<name>CaseSensitive</name>
-				<type>Boolean</type>
-				<multiValued>false</multiValued>
-				<mandatory>false</mandatory>
-			</configurationParameter>
 		</configurationParameters>
 		<configurationParameterSettings>
 			<nameValuePair>
@@ -63,18 +46,6 @@
 					<string>target/test-classes/data/unit-test-model.bin.gz</string>
 				</value>
 			</nameValuePair>
-			<nameValuePair>
-				<name>CaseSensitive</name>
-				<value>
-					<boolean>true</boolean>
-				</value>
-			</nameValuePair>
-			<nameValuePair>
-				<name>TagDictionary</name>
-				<value>
-					<string>data/unit-test-tag-dictionary.txt</string>
-				</value>
-			</nameValuePair>
 		</configurationParameterSettings>
 		<typeSystemDescription>
 			<imports>

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java?rev=1500993&r1=1500992&r2=1500993&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/Evaluation_ImplBase.java Mon Jul  8 22:29:14 2013
@@ -256,11 +256,7 @@ public abstract class Evaluation_ImplBas
         TypeSystemDescriptionFactory.createTypeSystemDescription(),
         TypePrioritiesFactory.createTypePriorities(Segment.class, Sentence.class, BaseToken.class),
         POSTagger.POS_MODEL_FILE_PARAM,
-        "org/apache/ctakes/postagger/models/mayo-pos.zip",
-        POSTagger.TAG_DICTIONARY_PARAM,
-        "org/apache/ctakes/postagger/models/tag.dictionary.txt",
-        POSTagger.CASE_SENSITIVE_PARAM,
-        true));
+        "org/apache/ctakes/postagger/models/mayo-pos.zip"));
 
     // identify chunks
     aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventAndTimeExtractionPipeline.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventAndTimeExtractionPipeline.java?rev=1500993&r1=1500992&r2=1500993&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventAndTimeExtractionPipeline.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventAndTimeExtractionPipeline.java Mon Jul  8 22:29:14 2013
@@ -148,11 +148,7 @@ public class EventAndTimeExtractionPipel
         TypeSystemDescriptionFactory.createTypeSystemDescription(),
         TypePrioritiesFactory.createTypePriorities(Segment.class, Sentence.class, BaseToken.class),
         POSTagger.POS_MODEL_FILE_PARAM,
-        "org/apache/ctakes/postagger/models/mayo-pos.zip",
-        POSTagger.TAG_DICTIONARY_PARAM,
-        "org/apache/ctakes/postagger/models/tag.dictionary.txt",
-        POSTagger.CASE_SENSITIVE_PARAM,
-        true));
+        "org/apache/ctakes/postagger/models/mayo-pos.zip"));
 
     // identify chunks
     aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventExtractionPipeline.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventExtractionPipeline.java?rev=1500993&r1=1500992&r2=1500993&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventExtractionPipeline.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/pipelines/EventExtractionPipeline.java Mon Jul  8 22:29:14 2013
@@ -141,11 +141,7 @@ public class EventExtractionPipeline {
         TypeSystemDescriptionFactory.createTypeSystemDescription(),
         TypePrioritiesFactory.createTypePriorities(Segment.class, Sentence.class, BaseToken.class),
         POSTagger.POS_MODEL_FILE_PARAM,
-        "org/apache/ctakes/postagger/models/mayo-pos.zip",
-        POSTagger.TAG_DICTIONARY_PARAM,
-        "org/apache/ctakes/postagger/models/tag.dictionary.txt",
-        POSTagger.CASE_SENSITIVE_PARAM,
-        true));
+        "org/apache/ctakes/postagger/models/mayo-pos.zip"));
 
     // identify chunks
     aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(