You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2013/10/01 21:53:49 UTC

svn commit: r1528190 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools: namefind/TokenNameFinderModel.java sentdetect/SentenceModel.java

Author: joern
Date: Tue Oct  1 19:53:49 2013
New Revision: 1528190

URL: http://svn.apache.org/r1528190
Log:
OPENNLP-581 Changed model validation, model should be an instance of MaxentModel and not AbstractModel

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java?rev=1528190&r1=1528189&r2=1528190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java Tue Oct  1 19:53:49 2013
@@ -253,8 +253,8 @@ public class TokenNameFinderModel extend
   protected void validateArtifactMap() throws InvalidFormatException {
     super.validateArtifactMap();
     
-    if (artifactMap.get(MAXENT_MODEL_ENTRY_NAME) instanceof AbstractModel) {
-      AbstractModel model = (AbstractModel) artifactMap.get(MAXENT_MODEL_ENTRY_NAME);
+    if (artifactMap.get(MAXENT_MODEL_ENTRY_NAME) instanceof MaxentModel) {
+      MaxentModel model = (MaxentModel) artifactMap.get(MAXENT_MODEL_ENTRY_NAME);
       isModelValid(model);
     }
     else {

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java?rev=1528190&r1=1528189&r2=1528190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java Tue Oct  1 19:53:49 2013
@@ -108,7 +108,7 @@ public class SentenceModel extends BaseM
   protected void validateArtifactMap() throws InvalidFormatException {
     super.validateArtifactMap();
 
-    if (!(artifactMap.get(MAXENT_MODEL_ENTRY_NAME) instanceof AbstractModel)) {
+    if (!(artifactMap.get(MAXENT_MODEL_ENTRY_NAME) instanceof MaxentModel)) {
       throw new InvalidFormatException("Unable to find " + MAXENT_MODEL_ENTRY_NAME +
           " maxent model!");
     }