Repository: opennlp Updated Branches: refs/heads/master 580e0d1e2 -> 45ea3f773
OPENNLP-1031: Use getIntParameter when getting beam size. This closes apache/opennlp#169 Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/45ea3f77 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/45ea3f77 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/45ea3f77 Branch: refs/heads/master Commit: 45ea3f77397ee833bf6370769fce38f339f7ca2f Parents: 580e0d1 Author: koji <[email protected]> Authored: Wed Apr 19 17:54:58 2017 +0900 Committer: koji <[email protected]> Committed: Wed Apr 19 17:54:58 2017 +0900 ---------------------------------------------------------------------- .../src/main/java/opennlp/tools/chunker/ChunkerME.java | 7 +------ .../src/main/java/opennlp/tools/lemmatizer/LemmatizerME.java | 8 ++------ .../src/main/java/opennlp/tools/namefind/NameFinderME.java | 8 ++------ .../src/main/java/opennlp/tools/postag/POSTaggerME.java | 7 +------ 4 files changed, 6 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/45ea3f77/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java b/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java index 71917fb..8be0cca 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java @@ -162,12 +162,7 @@ public class ChunkerME implements Chunker { public static ChunkerModel train(String lang, ObjectStream<ChunkSample> in, TrainingParameters mlParams, ChunkerFactory factory) throws IOException { - String beamSizeString = mlParams.getSettings().get(BeamSearch.BEAM_SIZE_PARAMETER); - - int beamSize = ChunkerME.DEFAULT_BEAM_SIZE; - if (beamSizeString != null) { - beamSize = Integer.parseInt(beamSizeString); - } + int beamSize = mlParams.getIntParameter(BeamSearch.BEAM_SIZE_PARAMETER, ChunkerME.DEFAULT_BEAM_SIZE); Map<String, String> manifestInfoEntries = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/opennlp/blob/45ea3f77/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmatizerME.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmatizerME.java b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmatizerME.java index 2b8122f..83db79a 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmatizerME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmatizerME.java @@ -202,12 +202,8 @@ public class LemmatizerME implements Lemmatizer { ObjectStream<LemmaSample> samples, TrainingParameters trainParams, LemmatizerFactory posFactory) throws IOException { - String beamSizeString = trainParams.getSettings().get(BeamSearch.BEAM_SIZE_PARAMETER); - - int beamSize = LemmatizerME.DEFAULT_BEAM_SIZE; - if (beamSizeString != null) { - beamSize = Integer.parseInt(beamSizeString); - } + int beamSize = trainParams.getIntParameter(BeamSearch.BEAM_SIZE_PARAMETER, + LemmatizerME.DEFAULT_BEAM_SIZE); LemmatizerContextGenerator contextGenerator = posFactory.getContextGenerator(); http://git-wip-us.apache.org/repos/asf/opennlp/blob/45ea3f77/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java index 1d52473..4cd8ebc 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java @@ -225,12 +225,8 @@ public class NameFinderME implements TokenNameFinder { trainParams.putIfAbsent(TrainingParameters.CUTOFF_PARAM, "0"); trainParams.putIfAbsent(TrainingParameters.ITERATIONS_PARAM, "300"); - String beamSizeString = trainParams.getSettings().get(BeamSearch.BEAM_SIZE_PARAMETER); - - int beamSize = NameFinderME.DEFAULT_BEAM_SIZE; - if (beamSizeString != null) { - beamSize = Integer.parseInt(beamSizeString); - } + int beamSize = trainParams.getIntParameter(BeamSearch.BEAM_SIZE_PARAMETER, + NameFinderME.DEFAULT_BEAM_SIZE); Map<String, String> manifestInfoEntries = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/opennlp/blob/45ea3f77/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java index 5415ba7..1edcf4b 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java @@ -225,12 +225,7 @@ public class POSTaggerME implements POSTagger { ObjectStream<POSSample> samples, TrainingParameters trainParams, POSTaggerFactory posFactory) throws IOException { - String beamSizeString = trainParams.getSettings().get(BeamSearch.BEAM_SIZE_PARAMETER); - - int beamSize = POSTaggerME.DEFAULT_BEAM_SIZE; - if (beamSizeString != null) { - beamSize = Integer.parseInt(beamSizeString); - } + int beamSize = trainParams.getIntParameter(BeamSearch.BEAM_SIZE_PARAMETER, POSTaggerME.DEFAULT_BEAM_SIZE); POSContextGenerator contextGenerator = posFactory.getPOSContextGenerator();
