Author: ragerri
Date: Wed Oct  8 16:22:31 2014
New Revision: 1630163

URL: http://svn.apache.org/r1630163
Log:
OPENNLP-717 bug fixed by giving access to feature generator in 
TokenNameFinderFactory for NameFinder model creation in the NameFinderME train 
method

Modified:
    
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
    
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.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=1630163&r1=1630162&r2=1630163&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
 Wed Oct  8 16:22:31 2014
@@ -355,10 +355,10 @@ public class NameFinderME implements Tok
     }
 
     if (seqModel != null) {
-      return new TokenNameFinderModel(languageCode, seqModel, null,
+      return new TokenNameFinderModel(languageCode, seqModel, 
factory.getFeatureGenerator(),
               factory.getResources(), manifestInfoEntries, 
factory.getSequenceCodec());
     } else {
-      return new TokenNameFinderModel(languageCode, nameFinderModel, beamSize, 
null,
+      return new TokenNameFinderModel(languageCode, nameFinderModel, beamSize, 
factory.getFeatureGenerator(),
               factory.getResources(), manifestInfoEntries, 
factory.getSequenceCodec());
     }
   }

Modified: 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
URL: 
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java?rev=1630163&r1=1630162&r2=1630163&view=diff
==============================================================================
--- 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
 (original)
+++ 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
 Wed Oct  8 16:22:31 2014
@@ -21,20 +21,13 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-import java.util.Properties;
 
-import opennlp.tools.chunker.ChunkerContextGenerator;
-import opennlp.tools.dictionary.Dictionary;
 import 
opennlp.tools.namefind.TokenNameFinderModel.FeatureGeneratorCreationError;
-import opennlp.tools.postag.POSTaggerFactory;
-import opennlp.tools.postag.TagDictionary;
 import opennlp.tools.util.BaseToolFactory;
 import opennlp.tools.util.InvalidFormatException;
 import opennlp.tools.util.SequenceCodec;
-import opennlp.tools.util.SequenceValidator;
 import opennlp.tools.util.ext.ExtensionLoader;
 import opennlp.tools.util.featuregen.AdaptiveFeatureGenerator;
-import opennlp.tools.util.featuregen.AdditionalContextFeatureGenerator;
 import opennlp.tools.util.featuregen.AggregatedFeatureGenerator;
 import opennlp.tools.util.featuregen.FeatureGeneratorResourceProvider;
 import opennlp.tools.util.featuregen.GeneratorFactory;
@@ -75,6 +68,10 @@ public class TokenNameFinderFactory exte
   protected Map<String, Object> getResources() {
     return resources;
   }
+  
+  protected byte[] getFeatureGenerator() {
+    return featureGeneratorBytes;
+  }
 
   public static TokenNameFinderFactory create(String subclassName, byte[] 
featureGeneratorBytes, final Map<String, Object> resources,
       SequenceCodec<String> seqCodec)


Reply via email to