Remove redundant array creation See issue OPENNLP-871
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/c4798464 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/c4798464 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/c4798464 Branch: refs/heads/trunk Commit: c479846405b5ea919609d2e63e25f3048c20d31e Parents: 3ab1618 Author: Jörn Kottmann <[email protected]> Authored: Wed Nov 2 19:45:47 2016 +0100 Committer: Jörn Kottmann <[email protected]> Committed: Mon Dec 19 23:37:33 2016 +0100 ---------------------------------------------------------------------- .../tools/namefind/DefaultNameContextGenerator.java | 12 +++++------- .../java/opennlp/tools/namefind/NameFinderME.java | 14 ++++++-------- 2 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/c4798464/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java index 6fe15ed..8dcfe1d 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java +++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java @@ -40,13 +40,11 @@ public class DefaultNameContextGenerator implements NameContextGenerator { @Deprecated private static AdaptiveFeatureGenerator windowFeatures = new CachedFeatureGenerator( - new AdaptiveFeatureGenerator[]{ - new WindowFeatureGenerator(new TokenFeatureGenerator(), 2, 2), - new WindowFeatureGenerator(new TokenClassFeatureGenerator(true), 2, 2), - new OutcomePriorFeatureGenerator(), - new PreviousMapFeatureGenerator(), - new BigramNameFeatureGenerator() - }); + new WindowFeatureGenerator(new TokenFeatureGenerator(), 2, 2), + new WindowFeatureGenerator(new TokenClassFeatureGenerator(true), 2, 2), + new OutcomePriorFeatureGenerator(), + new PreviousMapFeatureGenerator(), + new BigramNameFeatureGenerator()); /** * Creates a name context generator. http://git-wip-us.apache.org/repos/asf/opennlp/blob/c4798464/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 df06f2a..1824909 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java @@ -101,14 +101,12 @@ public class NameFinderME implements TokenNameFinder { */ static AdaptiveFeatureGenerator createFeatureGenerator() { return new CachedFeatureGenerator( - new AdaptiveFeatureGenerator[]{ - new WindowFeatureGenerator(new TokenFeatureGenerator(), 2, 2), - new WindowFeatureGenerator(new TokenClassFeatureGenerator(true), 2, 2), - new OutcomePriorFeatureGenerator(), - new PreviousMapFeatureGenerator(), - new BigramNameFeatureGenerator(), - new SentenceFeatureGenerator(true, false) - }); + new WindowFeatureGenerator(new TokenFeatureGenerator(), 2, 2), + new WindowFeatureGenerator(new TokenClassFeatureGenerator(true), 2, 2), + new OutcomePriorFeatureGenerator(), + new PreviousMapFeatureGenerator(), + new BigramNameFeatureGenerator(), + new SentenceFeatureGenerator(true, false)); } private static AdaptiveFeatureGenerator createFeatureGenerator(
