svn commit: r1671823 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker: ChunkerME.java ChunkerModel.java

[joern]

Author: joern
Date: Tue Apr  7 12:00:57 2015
New Revision: 1671823

URL: http://svn.apache.org/r1671823
Log:
OPENNLP-751 Corrected default beam size (copy and paste error) and beam size is 
now included in model

Modified:
    
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java
    
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java

Modified: 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java
URL: 
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java?rev=1671823&r1=1671822&r2=1671823&view=diff
==============================================================================
--- 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java 
(original)
+++ 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java 
Tue Apr  7 12:00:57 2015
@@ -31,7 +31,6 @@ import opennlp.tools.ml.model.Event;
 import opennlp.tools.ml.model.MaxentModel;
 import opennlp.tools.ml.model.SequenceClassificationModel;
 import opennlp.tools.ml.model.TrainUtil;
-import opennlp.tools.namefind.NameFinderME;
 import opennlp.tools.postag.POSSampleSequenceStream;
 import opennlp.tools.util.ObjectStream;
 import opennlp.tools.util.Sequence;
@@ -199,7 +198,7 @@ public class ChunkerME implements Chunke
 
     String beamSizeString = 
mlParams.getSettings().get(BeamSearch.BEAM_SIZE_PARAMETER);
 
-    int beamSize = NameFinderME.DEFAULT_BEAM_SIZE;
+    int beamSize = ChunkerME.DEFAULT_BEAM_SIZE;
     if (beamSizeString != null) {
       beamSize = Integer.parseInt(beamSizeString);
     }
@@ -232,7 +231,7 @@ public class ChunkerME implements Chunke
     }
 
     if (chunkerModel != null) {
-      return new ChunkerModel(lang, chunkerModel, manifestInfoEntries, 
factory);
+      return new ChunkerModel(lang, chunkerModel, beamSize, 
manifestInfoEntries, factory);
     }
     else {
       return new ChunkerModel(lang, seqChunkerModel, manifestInfoEntries, 
factory);

Modified: 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java
URL: 
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java?rev=1671823&r1=1671822&r2=1671823&view=diff
==============================================================================
--- 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java
 (original)
+++ 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java
 Tue Apr  7 12:00:57 2015
@@ -34,7 +34,6 @@ import opennlp.tools.ml.model.BinaryFile
 import opennlp.tools.ml.model.GenericModelReader;
 import opennlp.tools.ml.model.MaxentModel;
 import opennlp.tools.ml.model.SequenceClassificationModel;
-import opennlp.tools.namefind.NameFinderME;
 import opennlp.tools.util.BaseToolFactory;
 import opennlp.tools.util.InvalidFormatException;
 import opennlp.tools.util.model.BaseModel;
@@ -136,7 +135,7 @@ public class ChunkerModel extends BaseMo
     if (artifactMap.get(CHUNKER_MODEL_ENTRY_NAME) instanceof MaxentModel) {
       String beamSizeString = 
manifest.getProperty(BeamSearch.BEAM_SIZE_PARAMETER);
 
-      int beamSize = NameFinderME.DEFAULT_BEAM_SIZE;
+      int beamSize = ChunkerME.DEFAULT_BEAM_SIZE;
       if (beamSizeString != null) {
         beamSize = Integer.parseInt(beamSizeString);
       }