Repository: opennlp Updated Branches: refs/heads/trunk 4f2790853 -> 5f36766c1
Remove deprecated API from the Parser See issue OPENNLP-886 Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/5f36766c Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/5f36766c Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/5f36766c Branch: refs/heads/trunk Commit: 5f36766c1707bdfff7ebff550b172f937787b2d4 Parents: 4f27908 Author: Joern Kottmann <[email protected]> Authored: Mon Dec 19 19:49:31 2016 +0100 Committer: Joern Kottmann <[email protected]> Committed: Tue Dec 20 17:51:09 2016 +0100 ---------------------------------------------------------------------- .../cmdline/parser/BuildModelUpdaterTool.java | 3 +-- .../opennlp/tools/parser/chunking/Parser.java | 23 -------------------- .../tools/parser/chunking/ParserTest.java | 3 ++- 3 files changed, 3 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f36766c/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java index 3d8695b..fe98725 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java +++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java @@ -49,8 +49,7 @@ public final class BuildModelUpdaterTool extends ModelUpdaterTool { System.out.println("Training builder"); ObjectStream<Event> bes = new ParserEventStream(parseSamples, originalModel.getHeadRules(), ParserEventTypeEnum.BUILD, mdict); - AbstractModel buildModel = Parser.train(bes, - 100, 5); + AbstractModel buildModel = Parser.train(bes, 100, 5); parseSamples.close(); http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f36766c/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java index ae20e8a..505f688 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java +++ b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java @@ -318,27 +318,4 @@ public class Parser extends AbstractBottomUpParser { posModel, chunkModel, rules, ParserType.CHUNKING, manifestInfoEntries); } - - /** - * @deprecated use {@link #train(String, ObjectStream, HeadRules, TrainingParameters)} - * instead and pass in a TrainingParameters object. - */ - @Deprecated - public static ParserModel train(String languageCode, ObjectStream<Parse> parseSamples, HeadRules rules, int iterations, int cut) - throws IOException { - - TrainingParameters params = new TrainingParameters(); - params.put("dict", TrainingParameters.CUTOFF_PARAM, Integer.toString(cut)); - - params.put("tagger", TrainingParameters.CUTOFF_PARAM, Integer.toString(cut)); - params.put("tagger", TrainingParameters.ITERATIONS_PARAM, Integer.toString(iterations)); - params.put("chunker", TrainingParameters.CUTOFF_PARAM, Integer.toString(cut)); - params.put("chunker", TrainingParameters.ITERATIONS_PARAM, Integer.toString(iterations)); - params.put("check", TrainingParameters.CUTOFF_PARAM, Integer.toString(cut)); - params.put("check", TrainingParameters.ITERATIONS_PARAM, Integer.toString(iterations)); - params.put("build", TrainingParameters.CUTOFF_PARAM, Integer.toString(cut)); - params.put("build", TrainingParameters.ITERATIONS_PARAM, Integer.toString(iterations)); - - return train(languageCode, parseSamples, rules, params); - } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/5f36766c/opennlp-tools/src/test/java/opennlp/tools/parser/chunking/ParserTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/parser/chunking/ParserTest.java b/opennlp-tools/src/test/java/opennlp/tools/parser/chunking/ParserTest.java index 60f80a3..e9c6006 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/parser/chunking/ParserTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/parser/chunking/ParserTest.java @@ -27,6 +27,7 @@ import opennlp.tools.parser.ParserModel; import opennlp.tools.parser.ParserTestUtil; import opennlp.tools.util.ObjectStream; +import opennlp.tools.util.TrainingParameters; import org.junit.Test; /** @@ -44,7 +45,7 @@ public class ParserTest { ObjectStream<Parse> parseSamples = ParserTestUtil.openTestTrainingData(); HeadRules headRules = ParserTestUtil.createTestHeadRules(); - ParserModel model = Parser.train("en", parseSamples, headRules, 100, 0); + ParserModel model = Parser.train("en", parseSamples, headRules, TrainingParameters.defaultParams()); opennlp.tools.parser.Parser parser = ParserFactory.create(model);
