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/06/06 10:18:02 UTC
svn commit: r1490190 - in /opennlp/trunk/opennlp-tools/src:
main/java/opennlp/tools/chunker/ main/java/opennlp/tools/doccat/
main/java/opennlp/tools/namefind/ main/java/opennlp/tools/parser/
main/java/opennlp/tools/parser/treeinsert/ main/java/opennlp/...
Author: joern
Date: Thu Jun 6 08:18:01 2013
New Revision: 1490190
URL: http://svn.apache.org/r1490190
Log:
OPENNLP-581 Replaced usages of AbstractModel with MaxentModel. This commit breaks backward compatibility for some users who called a method or constructor which used AbstractModel.
Modified:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
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=1490190&r1=1490189&r2=1490190&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 Thu Jun 6 08:18:01 2013
@@ -30,6 +30,7 @@ import java.util.Map;
import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.ml.model.BinaryFileDataReader;
import opennlp.tools.ml.model.GenericModelReader;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.model.BaseModel;
@@ -50,11 +51,11 @@ public class ChunkerModel extends BaseMo
* {@link #ChunkerModel(String, AbstractModel, Map, ChunkerFactory)}
* instead.
*/
- public ChunkerModel(String languageCode, AbstractModel chunkerModel, Map<String, String> manifestInfoEntries) {
+ public ChunkerModel(String languageCode, MaxentModel chunkerModel, Map<String, String> manifestInfoEntries) {
this(languageCode, chunkerModel, manifestInfoEntries, new ChunkerFactory());
}
- public ChunkerModel(String languageCode, AbstractModel chunkerModel,
+ public ChunkerModel(String languageCode, MaxentModel chunkerModel,
Map<String, String> manifestInfoEntries, ChunkerFactory factory) {
super(COMPONENT_NAME, languageCode, manifestInfoEntries, factory);
artifactMap.put(CHUNKER_MODEL_ENTRY_NAME, chunkerModel);
@@ -66,11 +67,11 @@ public class ChunkerModel extends BaseMo
* {@link #ChunkerModel(String, AbstractModel, ChunkerFactory)
* instead.}
*/
- public ChunkerModel(String languageCode, AbstractModel chunkerModel) {
+ public ChunkerModel(String languageCode, MaxentModel chunkerModel) {
this(languageCode, chunkerModel, null, new ChunkerFactory());
}
- public ChunkerModel(String languageCode, AbstractModel chunkerModel, ChunkerFactory factory) {
+ public ChunkerModel(String languageCode, MaxentModel chunkerModel, ChunkerFactory factory) {
this(languageCode, chunkerModel, null, factory);
}
@@ -95,8 +96,8 @@ public class ChunkerModel extends BaseMo
}
}
- public AbstractModel getChunkerModel() {
- return (AbstractModel) artifactMap.get(CHUNKER_MODEL_ENTRY_NAME);
+ public MaxentModel getChunkerModel() {
+ return (MaxentModel) artifactMap.get(CHUNKER_MODEL_ENTRY_NAME);
}
@Override
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java Thu Jun 6 08:18:01 2013
@@ -24,6 +24,7 @@ import java.net.URL;
import java.util.Map;
import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.model.BaseModel;
@@ -32,7 +33,7 @@ public class DoccatModel extends BaseMod
private static final String COMPONENT_NAME = "DocumentCategorizerME";
private static final String DOCCAT_MODEL_ENTRY_NAME = "doccat.model";
- protected DoccatModel(String languageCode, AbstractModel doccatModel,
+ protected DoccatModel(String languageCode, MaxentModel doccatModel,
Map<String, String> manifestInfoEntries) {
super(COMPONENT_NAME, languageCode, manifestInfoEntries);
@@ -40,7 +41,7 @@ public class DoccatModel extends BaseMod
checkArtifactMap();
}
- public DoccatModel(String languageCode, AbstractModel doccatModel) {
+ public DoccatModel(String languageCode, MaxentModel doccatModel) {
this(languageCode, doccatModel, null);
}
@@ -65,7 +66,7 @@ public class DoccatModel extends BaseMod
}
}
- public AbstractModel getChunkerModel() {
- return (AbstractModel) artifactMap.get(DOCCAT_MODEL_ENTRY_NAME);
+ public MaxentModel getChunkerModel() {
+ return (MaxentModel) artifactMap.get(DOCCAT_MODEL_ENTRY_NAME);
}
}
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=1490190&r1=1490189&r2=1490190&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 Thu Jun 6 08:18:01 2013
@@ -72,7 +72,7 @@ public class TokenNameFinderModel extend
private static final String GENERATOR_DESCRIPTOR_ENTRY_NAME = "generator.featuregen";
- public TokenNameFinderModel(String languageCode, AbstractModel nameFinderModel,
+ public TokenNameFinderModel(String languageCode, MaxentModel nameFinderModel,
byte[] generatorDescriptor, Map<String, Object> resources, Map<String, String> manifestInfoEntries) {
super(COMPONENT_NAME, languageCode, manifestInfoEntries);
@@ -101,7 +101,7 @@ public class TokenNameFinderModel extend
checkArtifactMap();
}
- public TokenNameFinderModel(String languageCode, AbstractModel nameFinderModel,
+ public TokenNameFinderModel(String languageCode, MaxentModel nameFinderModel,
Map<String, Object> resources, Map<String, String> manifestInfoEntries) {
this(languageCode, nameFinderModel, null, resources, manifestInfoEntries);
}
@@ -124,8 +124,8 @@ public class TokenNameFinderModel extend
*
* @return the classification model
*/
- public AbstractModel getNameFinderModel() {
- return (AbstractModel) artifactMap.get(MAXENT_MODEL_ENTRY_NAME);
+ public MaxentModel getNameFinderModel() {
+ return (MaxentModel) artifactMap.get(MAXENT_MODEL_ENTRY_NAME);
}
/**
@@ -178,7 +178,7 @@ public class TokenNameFinderModel extend
public TokenNameFinderModel updateFeatureGenerator(byte descriptor[]) {
- TokenNameFinderModel model = new TokenNameFinderModel(getLanguage(), getNameFinderModel(),
+ TokenNameFinderModel model = new TokenNameFinderModel(getLanguage(), (AbstractModel) getNameFinderModel(),
descriptor, Collections.<String, Object>emptyMap(), Collections.<String, String>emptyMap());
// TODO: Not so nice!
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java Thu Jun 6 08:18:01 2013
@@ -29,6 +29,7 @@ import java.net.URL;
import java.util.Map;
import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.chunker.ChunkerModel;
import opennlp.tools.postag.POSModel;
import opennlp.tools.util.InvalidFormatException;
@@ -97,8 +98,8 @@ public class ParserModel extends BaseMod
private static final String PARSER_TYPE = "parser-type";
- public ParserModel(String languageCode, AbstractModel buildModel, AbstractModel checkModel,
- AbstractModel attachModel, POSModel parserTagger,
+ public ParserModel(String languageCode, MaxentModel buildModel, MaxentModel checkModel,
+ MaxentModel attachModel, POSModel parserTagger,
ChunkerModel chunkerTagger, opennlp.tools.parser.lang.en.HeadRules headRules,
ParserType modelType, Map<String, String> manifestInfoEntries) {
@@ -132,8 +133,8 @@ public class ParserModel extends BaseMod
checkArtifactMap();
}
- public ParserModel(String languageCode, AbstractModel buildModel, AbstractModel checkModel,
- AbstractModel attachModel, POSModel parserTagger,
+ public ParserModel(String languageCode, MaxentModel buildModel, MaxentModel checkModel,
+ MaxentModel attachModel, POSModel parserTagger,
ChunkerModel chunkerTagger, opennlp.tools.parser.lang.en.HeadRules headRules,
ParserType modelType) {
this (languageCode, buildModel, checkModel, attachModel, parserTagger,
@@ -176,16 +177,16 @@ public class ParserModel extends BaseMod
return ParserType.parse(getManifestProperty(PARSER_TYPE));
}
- public AbstractModel getBuildModel() {
- return (AbstractModel) artifactMap.get(BUILD_MODEL_ENTRY_NAME);
+ public MaxentModel getBuildModel() {
+ return (MaxentModel) artifactMap.get(BUILD_MODEL_ENTRY_NAME);
}
- public AbstractModel getCheckModel() {
- return (AbstractModel) artifactMap.get(CHECK_MODEL_ENTRY_NAME);
+ public MaxentModel getCheckModel() {
+ return (MaxentModel) artifactMap.get(CHECK_MODEL_ENTRY_NAME);
}
- public AbstractModel getAttachModel() {
- return (AbstractModel) artifactMap.get(ATTACH_MODEL_ENTRY_NAME);
+ public MaxentModel getAttachModel() {
+ return (MaxentModel) artifactMap.get(ATTACH_MODEL_ENTRY_NAME);
}
public POSModel getParserTaggerModel() {
@@ -202,13 +203,13 @@ public class ParserModel extends BaseMod
}
// TODO: Update model methods should make sure properties are copied correctly ...
- public ParserModel updateBuildModel(AbstractModel buildModel) {
+ public ParserModel updateBuildModel(MaxentModel buildModel) {
return new ParserModel(getLanguage(), buildModel, getCheckModel(), getAttachModel(),
getParserTaggerModel(), getParserChunkerModel(),
getHeadRules(), getParserType());
}
- public ParserModel updateCheckModel(AbstractModel checkModel) {
+ public ParserModel updateCheckModel(MaxentModel checkModel) {
return new ParserModel(getLanguage(), getBuildModel(), checkModel,
getAttachModel(), getParserTaggerModel(),
getParserChunkerModel(), getHeadRules(), getParserType());
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java Thu Jun 6 08:18:01 2013
@@ -113,7 +113,7 @@ public class Parser extends AbstractBott
}
@Deprecated
- public Parser(AbstractModel buildModel, AbstractModel attachModel, AbstractModel checkModel, POSTagger tagger, Chunker chunker, HeadRules headRules, int beamSize, double advancePercentage) {
+ public Parser(MaxentModel buildModel, MaxentModel attachModel, MaxentModel checkModel, POSTagger tagger, Chunker chunker, HeadRules headRules, int beamSize, double advancePercentage) {
super(tagger,chunker,headRules,beamSize,advancePercentage);
this.buildModel = buildModel;
this.attachModel = attachModel;
@@ -136,7 +136,7 @@ public class Parser extends AbstractBott
}
@Deprecated
- public Parser(AbstractModel buildModel, AbstractModel attachModel, AbstractModel checkModel, POSTagger tagger, Chunker chunker, HeadRules headRules) {
+ public Parser(MaxentModel buildModel, MaxentModel attachModel, MaxentModel checkModel, POSTagger tagger, Chunker chunker, HeadRules headRules) {
this(buildModel,attachModel,checkModel, tagger,chunker,headRules,defaultBeamSize,defaultAdvancePercentage);
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java Thu Jun 6 08:18:01 2013
@@ -25,6 +25,7 @@ import java.net.URL;
import java.util.Map;
import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
@@ -48,7 +49,7 @@ public final class POSModel extends Base
* {@link #POSModel(String, AbstractModel, Map, POSTaggerFactory)}
* instead.
*/
- public POSModel(String languageCode, AbstractModel posModel,
+ public POSModel(String languageCode, MaxentModel posModel,
POSDictionary tagDictionary, Dictionary ngramDict, Map<String, String> manifestInfoEntries) {
this(languageCode, posModel, manifestInfoEntries, new POSTaggerFactory(
@@ -60,13 +61,13 @@ public final class POSModel extends Base
* {@link #POSModel(String, AbstractModel, Map, POSTaggerFactory)}
* instead.
*/
- public POSModel(String languageCode, AbstractModel posModel,
+ public POSModel(String languageCode, MaxentModel posModel,
POSDictionary tagDictionary, Dictionary ngramDict) {
this(languageCode, posModel, null, new POSTaggerFactory(ngramDict,
tagDictionary));
}
- public POSModel(String languageCode, AbstractModel posModel,
+ public POSModel(String languageCode, MaxentModel posModel,
Map<String, String> manifestInfoEntries, POSTaggerFactory posFactory) {
super(COMPONENT_NAME, languageCode, manifestInfoEntries, posFactory);
@@ -112,8 +113,8 @@ public final class POSModel extends Base
}
}
- public AbstractModel getPosModel() {
- return (AbstractModel) artifactMap.get(POS_MODEL_ENTRY_NAME);
+ public MaxentModel getPosModel() {
+ return (MaxentModel) artifactMap.get(POS_MODEL_ENTRY_NAME);
}
/**
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java Thu Jun 6 08:18:01 2013
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.Atomi
import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.ngram.NGramModel;
@@ -52,7 +53,7 @@ public class POSTaggerME implements POST
/**
* The maximum entropy model to use to evaluate contexts.
*/
- protected AbstractModel posModel;
+ protected MaxentModel posModel;
/**
* The feature context generator.
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=1490190&r1=1490189&r2=1490190&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 Thu Jun 6 08:18:01 2013
@@ -29,6 +29,7 @@ import java.util.Map;
import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.ml.model.GenericModelReader;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
@@ -47,7 +48,7 @@ public class SentenceModel extends BaseM
private static final String MAXENT_MODEL_ENTRY_NAME = "sent.model";
- public SentenceModel(String languageCode, AbstractModel sentModel,
+ public SentenceModel(String languageCode, MaxentModel sentModel,
Map<String, String> manifestInfoEntries, SentenceDetectorFactory sdFactory) {
super(COMPONENT_NAME, languageCode, manifestInfoEntries, sdFactory);
artifactMap.put(MAXENT_MODEL_ENTRY_NAME, sentModel);
@@ -60,7 +61,7 @@ public class SentenceModel extends BaseM
* {@link #SentenceModel(String, AbstractModel, Map, SentenceDetectorFactory)}
* instead and pass in a {@link SentenceDetectorFactory}
*/
- public SentenceModel(String languageCode, AbstractModel sentModel,
+ public SentenceModel(String languageCode, MaxentModel sentModel,
boolean useTokenEnd, Dictionary abbreviations, char[] eosCharacters, Map<String, String> manifestInfoEntries) {
this(languageCode, sentModel, manifestInfoEntries,
new SentenceDetectorFactory(languageCode, useTokenEnd, abbreviations,
@@ -74,19 +75,19 @@ public class SentenceModel extends BaseM
* {@link #SentenceModel(String, AbstractModel, Map, SentenceDetectorFactory)}
* instead and pass in a {@link SentenceDetectorFactory}
*/
- public SentenceModel(String languageCode, AbstractModel sentModel,
+ public SentenceModel(String languageCode, MaxentModel sentModel,
boolean useTokenEnd, Dictionary abbreviations, char[] eosCharacters) {
this(languageCode, sentModel, useTokenEnd, abbreviations, eosCharacters,
null);
}
- public SentenceModel(String languageCode, AbstractModel sentModel,
+ public SentenceModel(String languageCode, MaxentModel sentModel,
boolean useTokenEnd, Dictionary abbreviations, Map<String, String> manifestInfoEntries) {
this(languageCode, sentModel, useTokenEnd, abbreviations, null,
manifestInfoEntries);
}
- public SentenceModel(String languageCode, AbstractModel sentModel,
+ public SentenceModel(String languageCode, MaxentModel sentModel,
boolean useTokenEnd, Dictionary abbreviations) {
this (languageCode, sentModel, useTokenEnd, abbreviations, null, null);
}
@@ -128,8 +129,8 @@ public class SentenceModel extends BaseM
return SentenceDetectorFactory.class;
}
- public AbstractModel getMaxentModel() {
- return (AbstractModel) artifactMap.get(MAXENT_MODEL_ENTRY_NAME);
+ public MaxentModel getMaxentModel() {
+ return (MaxentModel) artifactMap.get(MAXENT_MODEL_ENTRY_NAME);
}
public Dictionary getAbbreviations() {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java Thu Jun 6 08:18:01 2013
@@ -165,8 +165,8 @@ public final class TokenizerModel extend
return TokenizerFactory.class;
}
- public AbstractModel getMaxentModel() {
- return (AbstractModel) artifactMap.get(TOKENIZER_MODEL_ENTRY);
+ public MaxentModel getMaxentModel() {
+ return (MaxentModel) artifactMap.get(TOKENIZER_MODEL_ENTRY);
}
public Dictionary getAbbreviations() {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java Thu Jun 6 08:18:01 2013
@@ -54,7 +54,7 @@ public final class ModelUtil {
* @throws IOException
* @throws {@link IllegalArgumentException} in case one of the parameters is null
*/
- public static void writeModel(AbstractModel model, final OutputStream out) throws IOException {
+ public static void writeModel(MaxentModel model, final OutputStream out) throws IOException {
if (model == null)
throw new IllegalArgumentException("model parameter must not be null!");
@@ -62,7 +62,7 @@ public final class ModelUtil {
if (out == null)
throw new IllegalArgumentException("out parameter must not be null!");
- GenericModelWriter modelWriter = new GenericModelWriter(model, new DataOutputStream(new OutputStream() {
+ GenericModelWriter modelWriter = new GenericModelWriter((AbstractModel) model, new DataOutputStream(new OutputStream() {
@Override
public void write(int b) throws IOException {
out.write(b);
Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java?rev=1490190&r1=1490189&r2=1490190&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java Thu Jun 6 08:18:01 2013
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.util.Collections;
import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.Span;
@@ -262,7 +263,7 @@ public class NameFinderMETest {
}
private boolean hasOtherAsOutcome(TokenNameFinderModel nameFinderModel) {
- AbstractModel model = nameFinderModel.getNameFinderModel();
+ MaxentModel model = nameFinderModel.getNameFinderModel();
for (int i = 0; i < model.getNumOutcomes(); i++) {
String outcome = model.getOutcome(i);
if (outcome.equals(NameFinderME.OTHER)) {