svn commit: r1682381 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind: NameFinderME.java TokenNameFinderModel.java

[joern]

Author: joern
Date: Fri May 29 07:38:37 2015
New Revision: 1682381

URL: http://svn.apache.org/r1682381
Log:
OPENNLP-785 Factory is now included in the model

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

Modified: 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
URL: 
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java?rev=1682381&r1=1682380&r2=1682381&view=diff
==============================================================================
--- 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
 (original)
+++ 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
 Fri May 29 07:38:37 2015
@@ -355,10 +355,10 @@ public class NameFinderME implements Tok
 
     if (seqModel != null) {
       return new TokenNameFinderModel(languageCode, seqModel, 
factory.getFeatureGenerator(),
-              factory.getResources(), manifestInfoEntries, 
factory.getSequenceCodec());
+              factory.getResources(), manifestInfoEntries, 
factory.getSequenceCodec(), factory);
     } else {
       return new TokenNameFinderModel(languageCode, nameFinderModel, beamSize, 
factory.getFeatureGenerator(),
-              factory.getResources(), manifestInfoEntries, 
factory.getSequenceCodec());
+              factory.getResources(), manifestInfoEntries, 
factory.getSequenceCodec(), factory);
     }
   }
 
@@ -439,10 +439,10 @@ public class NameFinderME implements Tok
     // depending on which one is not null!
     if (seqModel != null) {
       return new TokenNameFinderModel(languageCode, seqModel, null,
-              resources, manifestInfoEntries, new BioCodec());
+              resources, manifestInfoEntries, new BioCodec(), new 
TokenNameFinderFactory());
     } else {
       return new TokenNameFinderModel(languageCode, nameFinderModel, beamSize, 
null,
-              resources, manifestInfoEntries, new BioCodec());
+              resources, manifestInfoEntries, new BioCodec(), new 
TokenNameFinderFactory());
     }
   }
 

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=1682381&r1=1682380&r2=1682381&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
 Fri May 29 07:38:37 2015
@@ -78,8 +78,8 @@ public class TokenNameFinderModel extend
 
   public TokenNameFinderModel(String languageCode, 
SequenceClassificationModel<String> nameFinderModel,
       byte[] generatorDescriptor, Map<String, Object> resources, Map<String, 
String> manifestInfoEntries,
-      SequenceCodec<String> seqCodec) {
-    super(COMPONENT_NAME, languageCode, manifestInfoEntries);
+      SequenceCodec<String> seqCodec, TokenNameFinderFactory factory) {
+    super(COMPONENT_NAME, languageCode, manifestInfoEntries, factory);
 
     init(nameFinderModel, generatorDescriptor, resources, manifestInfoEntries, 
seqCodec);
 
@@ -90,8 +90,8 @@ public class TokenNameFinderModel extend
 
   public TokenNameFinderModel(String languageCode, MaxentModel 
nameFinderModel, int beamSize,
       byte[] generatorDescriptor, Map<String, Object> resources, Map<String, 
String> manifestInfoEntries,
-      SequenceCodec<String> seqCodec) {
-    super(COMPONENT_NAME, languageCode, manifestInfoEntries);
+      SequenceCodec<String> seqCodec, TokenNameFinderFactory factory) {
+    super(COMPONENT_NAME, languageCode, manifestInfoEntries, factory);
 
 
     Properties manifest = (Properties) artifactMap.get(MANIFEST_ENTRY);
@@ -108,7 +108,7 @@ public class TokenNameFinderModel extend
   public TokenNameFinderModel(String languageCode, MaxentModel nameFinderModel,
       byte[] generatorDescriptor, Map<String, Object> resources, Map<String, 
String> manifestInfoEntries) {
     this(languageCode, nameFinderModel, NameFinderME.DEFAULT_BEAM_SIZE,
-        generatorDescriptor, resources, manifestInfoEntries, new BioCodec());
+        generatorDescriptor, resources, manifestInfoEntries, new BioCodec(), 
new TokenNameFinderFactory());
   }
 
   public TokenNameFinderModel(String languageCode, MaxentModel nameFinderModel,
@@ -225,12 +225,12 @@ public class TokenNameFinderModel extend
     if (getNameFinderModel() != null) {
       model = new TokenNameFinderModel(getLanguage(), getNameFinderModel(), 1,
           descriptor, Collections.<String, Object>emptyMap(), 
Collections.<String, String>emptyMap(),
-          getFactory().createSequenceCodec());
+          getFactory().createSequenceCodec(), getFactory());
     }
     else {
       model = new TokenNameFinderModel(getLanguage(), 
getNameFinderSequenceModel(),
           descriptor, Collections.<String, Object>emptyMap(), 
Collections.<String, String>emptyMap(),
-          getFactory().createSequenceCodec());
+          getFactory().createSequenceCodec(), getFactory());
     }
 
     model.artifactMap.clear();