You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by sm...@apache.org on 2017/01/20 04:42:48 UTC
opennlp git commit: NoJira: Trivial fixes,
this closes apache/opennlp#78
Repository: opennlp
Updated Branches:
refs/heads/master 575346f22 -> 2ff81900c
NoJira: Trivial fixes, this closes apache/opennlp#78
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/2ff81900
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/2ff81900
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/2ff81900
Branch: refs/heads/master
Commit: 2ff81900cad4eab3eb7805194cac5546ae1fa71a
Parents: 575346f
Author: smarthi <sm...@apache.org>
Authored: Thu Jan 19 23:42:29 2017 -0500
Committer: smarthi <sm...@apache.org>
Committed: Thu Jan 19 23:42:29 2017 -0500
----------------------------------------------------------------------
.../tools/chunker/ChunkSampleStream.java | 11 ++-
.../java/opennlp/tools/cmdline/CmdLineUtil.java | 2 +-
.../doccat/DoccatCrossValidatorTool.java | 5 +-
.../cmdline/doccat/DoccatEvaluatorTool.java | 2 +-
.../LemmatizerFineGrainedReportListener.java | 81 +++++++++-----------
.../POSTaggerFineGrainedReportListener.java | 81 +++++++++-----------
.../tools/doccat/DocumentSampleStream.java | 5 +-
.../frenchtreebank/ConstitDocumentHandler.java | 4 +-
.../opennlp/tools/ml/model/AbstractModel.java | 2 +-
.../java/opennlp/tools/namefind/BioCodec.java | 8 +-
.../namefind/DefaultNameContextGenerator.java | 2 +-
.../tools/util/featuregen/BrownCluster.java | 2 +-
.../tools/ml/maxent/GISIndexingTest.java | 6 +-
13 files changed, 96 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleStream.java
index 773dd19..9a074ee 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleStream.java
@@ -44,9 +44,9 @@ public class ChunkSampleStream extends FilterObjectStream<String, ChunkSample> {
public ChunkSample read() throws IOException {
- List<String> toks = new ArrayList<String>();
- List<String> tags = new ArrayList<String>();
- List<String> preds = new ArrayList<String>();
+ List<String> toks = new ArrayList<>();
+ List<String> tags = new ArrayList<>();
+ List<String> preds = new ArrayList<>();
for (String line = samples.read(); line != null && !line.equals(""); line = samples.read()) {
String[] parts = line.split(" ");
@@ -64,8 +64,7 @@ public class ChunkSampleStream extends FilterObjectStream<String, ChunkSample> {
return new ChunkSample(toks.toArray(new String[toks.size()]),
tags.toArray(new String[tags.size()]), preds.toArray(new String[preds.size()]));
}
- else {
- return null;
- }
+
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
index 424f297..6855898 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
@@ -276,7 +276,7 @@ public final class CmdLineUtil {
}
public static void checkLanguageCode(String code) {
- List<String> languageCodes = new ArrayList<String>();
+ List<String> languageCodes = new ArrayList<>();
languageCodes.addAll(Arrays.asList(Locale.getISOLanguages()));
languageCodes.add("x-unspecified");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatCrossValidatorTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatCrossValidatorTool.java
index 867e8e1..a46cdd3 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatCrossValidatorTool.java
@@ -66,7 +66,7 @@ public final class DoccatCrossValidatorTool extends
mlParams = ModelUtil.createDefaultTrainingParameters();
}
- List<EvaluationMonitor<DocumentSample>> listeners = new LinkedList<EvaluationMonitor<DocumentSample>>();
+ List<EvaluationMonitor<DocumentSample>> listeners = new LinkedList<>();
if (params.getMisclassified()) {
listeners.add(new DoccatEvaluationErrorListener());
}
@@ -104,8 +104,7 @@ public final class DoccatCrossValidatorTool extends
validator.evaluate(sampleStream, params.getFolds());
} catch (IOException e) {
throw new TerminateToolException(-1,
- "IO error while reading training data or indexing data: "
- + e.getMessage(), e);
+ "IO error while reading training data or indexing data: " + e.getMessage(), e);
} finally {
try {
sampleStream.close();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatEvaluatorTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatEvaluatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatEvaluatorTool.java
index 788a5ad..69ff8f3 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatEvaluatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatEvaluatorTool.java
@@ -63,7 +63,7 @@ public final class DoccatEvaluatorTool extends
DoccatModel model = new DoccatModelLoader().load(params.getModel());
- List<EvaluationMonitor<DocumentSample>> listeners = new LinkedList<EvaluationMonitor<DocumentSample>>();
+ List<EvaluationMonitor<DocumentSample>> listeners = new LinkedList<>();
if (params.getMisclassified()) {
listeners.add(new DoccatEvaluationErrorListener());
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
index b72e889..b5e647c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/lemmatizer/LemmatizerFineGrainedReportListener.java
@@ -565,8 +565,7 @@ public class LemmatizerFineGrainedReportListener
generalConfusionMatrix.get(ref).increment(pred);
if (!tokenConfusionMatrix.containsKey(tok)) {
- tokenConfusionMatrix.put(tok,
- new HashMap<String, ConfusionMatrixLine>());
+ tokenConfusionMatrix.put(tok, new HashMap<>());
}
if (!tokenConfusionMatrix.get(tok).containsKey(ref)) {
tokenConfusionMatrix.get(tok).put(ref, new ConfusionMatrixLine(ref));
@@ -638,21 +637,19 @@ public class LemmatizerFineGrainedReportListener
}
public SortedSet<String> getTokensOrderedByFrequency() {
- SortedSet<String> toks = new TreeSet<>(new Comparator<String>() {
- public int compare(String o1, String o2) {
- if (o1.equals(o2)) {
- return 0;
- }
- int e1 = 0, e2 = 0;
- if (tokOcurrencies.containsKey(o1))
- e1 = tokOcurrencies.get(o1).value();
- if (tokOcurrencies.containsKey(o2))
- e2 = tokOcurrencies.get(o2).value();
- if (e1 == e2) {
- return o1.compareTo(o2);
- }
- return e2 - e1;
+ SortedSet<String> toks = new TreeSet<>((o1, o2) -> {
+ if (o1.equals(o2)) {
+ return 0;
+ }
+ int e1 = 0, e2 = 0;
+ if (tokOcurrencies.containsKey(o1))
+ e1 = tokOcurrencies.get(o1).value();
+ if (tokOcurrencies.containsKey(o2))
+ e2 = tokOcurrencies.get(o2).value();
+ if (e1 == e2) {
+ return o1.compareTo(o2);
}
+ return e2 - e1;
});
toks.addAll(tokOcurrencies.keySet());
@@ -661,21 +658,19 @@ public class LemmatizerFineGrainedReportListener
}
public SortedSet<String> getTokensOrderedByNumberOfErrors() {
- SortedSet<String> toks = new TreeSet<>(new Comparator<String>() {
- public int compare(String o1, String o2) {
- if (o1.equals(o2)) {
- return 0;
- }
- int e1 = 0, e2 = 0;
- if (tokErrors.containsKey(o1))
- e1 = tokErrors.get(o1).value();
- if (tokErrors.containsKey(o2))
- e2 = tokErrors.get(o2).value();
- if (e1 == e2) {
- return o1.compareTo(o2);
- }
- return e2 - e1;
+ SortedSet<String> toks = new TreeSet<>((o1, o2) -> {
+ if (o1.equals(o2)) {
+ return 0;
}
+ int e1 = 0, e2 = 0;
+ if (tokErrors.containsKey(o1))
+ e1 = tokErrors.get(o1).value();
+ if (tokErrors.containsKey(o2))
+ e2 = tokErrors.get(o2).value();
+ if (e1 == e2) {
+ return o1.compareTo(o2);
+ }
+ return e2 - e1;
});
toks.addAll(tokErrors.keySet());
return toks;
@@ -702,21 +697,19 @@ public class LemmatizerFineGrainedReportListener
}
public SortedSet<String> getTagsOrderedByErrors() {
- SortedSet<String> tags = new TreeSet<>(new Comparator<String>() {
- public int compare(String o1, String o2) {
- if (o1.equals(o2)) {
- return 0;
- }
- int e1 = 0, e2 = 0;
- if (tagErrors.containsKey(o1))
- e1 = tagErrors.get(o1).value();
- if (tagErrors.containsKey(o2))
- e2 = tagErrors.get(o2).value();
- if (e1 == e2) {
- return o1.compareTo(o2);
- }
- return e2 - e1;
+ SortedSet<String> tags = new TreeSet<>((o1, o2) -> {
+ if (o1.equals(o2)) {
+ return 0;
+ }
+ int e1 = 0, e2 = 0;
+ if (tagErrors.containsKey(o1))
+ e1 = tagErrors.get(o1).value();
+ if (tagErrors.containsKey(o2))
+ e2 = tagErrors.get(o2).value();
+ if (e1 == e2) {
+ return o1.compareTo(o2);
}
+ return e2 - e1;
});
tags.addAll(tagErrors.keySet());
return Collections.unmodifiableSortedSet(tags);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
index 4149c97..ac22ce7 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerFineGrainedReportListener.java
@@ -572,8 +572,7 @@ public class POSTaggerFineGrainedReportListener implements
generalConfusionMatrix.get(ref).increment(pred);
if (!tokenConfusionMatrix.containsKey(tok)) {
- tokenConfusionMatrix.put(tok,
- new HashMap<String, ConfusionMatrixLine>());
+ tokenConfusionMatrix.put(tok, new HashMap<>());
}
if (!tokenConfusionMatrix.get(tok).containsKey(ref)) {
tokenConfusionMatrix.get(tok).put(ref, new ConfusionMatrixLine(ref));
@@ -645,21 +644,19 @@ public class POSTaggerFineGrainedReportListener implements
}
public SortedSet<String> getTokensOrderedByFrequency() {
- SortedSet<String> toks = new TreeSet<>(new Comparator<String>() {
- public int compare(String o1, String o2) {
- if (o1.equals(o2)) {
- return 0;
- }
- int e1 = 0, e2 = 0;
- if (tokOcurrencies.containsKey(o1))
- e1 = tokOcurrencies.get(o1).value();
- if (tokOcurrencies.containsKey(o2))
- e2 = tokOcurrencies.get(o2).value();
- if (e1 == e2) {
- return o1.compareTo(o2);
- }
- return e2 - e1;
+ SortedSet<String> toks = new TreeSet<>((o1, o2) -> {
+ if (o1.equals(o2)) {
+ return 0;
+ }
+ int e1 = 0, e2 = 0;
+ if (tokOcurrencies.containsKey(o1))
+ e1 = tokOcurrencies.get(o1).value();
+ if (tokOcurrencies.containsKey(o2))
+ e2 = tokOcurrencies.get(o2).value();
+ if (e1 == e2) {
+ return o1.compareTo(o2);
}
+ return e2 - e1;
});
toks.addAll(tokOcurrencies.keySet());
@@ -668,21 +665,19 @@ public class POSTaggerFineGrainedReportListener implements
}
public SortedSet<String> getTokensOrderedByNumberOfErrors() {
- SortedSet<String> toks = new TreeSet<>(new Comparator<String>() {
- public int compare(String o1, String o2) {
- if (o1.equals(o2)) {
- return 0;
- }
- int e1 = 0, e2 = 0;
- if (tokErrors.containsKey(o1))
- e1 = tokErrors.get(o1).value();
- if (tokErrors.containsKey(o2))
- e2 = tokErrors.get(o2).value();
- if (e1 == e2) {
- return o1.compareTo(o2);
- }
- return e2 - e1;
+ SortedSet<String> toks = new TreeSet<>((o1, o2) -> {
+ if (o1.equals(o2)) {
+ return 0;
}
+ int e1 = 0, e2 = 0;
+ if (tokErrors.containsKey(o1))
+ e1 = tokErrors.get(o1).value();
+ if (tokErrors.containsKey(o2))
+ e2 = tokErrors.get(o2).value();
+ if (e1 == e2) {
+ return o1.compareTo(o2);
+ }
+ return e2 - e1;
});
toks.addAll(tokErrors.keySet());
return toks;
@@ -709,21 +704,19 @@ public class POSTaggerFineGrainedReportListener implements
}
public SortedSet<String> getTagsOrderedByErrors() {
- SortedSet<String> tags = new TreeSet<>(new Comparator<String>() {
- public int compare(String o1, String o2) {
- if (o1.equals(o2)) {
- return 0;
- }
- int e1 = 0, e2 = 0;
- if (tagErrors.containsKey(o1))
- e1 = tagErrors.get(o1).value();
- if (tagErrors.containsKey(o2))
- e2 = tagErrors.get(o2).value();
- if (e1 == e2) {
- return o1.compareTo(o2);
- }
- return e2 - e1;
+ SortedSet<String> tags = new TreeSet<>((o1, o2) -> {
+ if (o1.equals(o2)) {
+ return 0;
+ }
+ int e1 = 0, e2 = 0;
+ if (tagErrors.containsKey(o1))
+ e1 = tagErrors.get(o1).value();
+ if (tagErrors.containsKey(o2))
+ e2 = tagErrors.get(o2).value();
+ if (e1 == e2) {
+ return o1.compareTo(o2);
}
+ return e2 - e1;
});
tags.addAll(tagErrors.keySet());
return Collections.unmodifiableSortedSet(tags);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
index b35742f..13d9184 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
@@ -62,8 +62,7 @@ public class DocumentSampleStream extends FilterObjectStream<String, DocumentSam
return sample;
}
- else {
- return null;
- }
+
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitDocumentHandler.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitDocumentHandler.java b/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitDocumentHandler.java
index a62a976..f59ab51 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitDocumentHandler.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/frenchtreebank/ConstitDocumentHandler.java
@@ -50,8 +50,8 @@ class ConstitDocumentHandler extends DefaultHandler {
private final StringBuilder text = new StringBuilder();
private int offset;
- private final Stack<Constituent> stack = new Stack<Constituent>();
- private final List<Constituent> cons = new LinkedList<Constituent>();
+ private final Stack<Constituent> stack = new Stack<>();
+ private final List<Constituent> cons = new LinkedList<>();
ConstitDocumentHandler(List<Parse> parses) {
this.parses = parses;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java
index fb08152..1a005a6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java
@@ -61,7 +61,7 @@ public abstract class AbstractModel implements MaxentModel {
}
private void init(String[] predLabels, String[] outcomeNames) {
- this.pmap = new HashMap<String, Integer>(predLabels.length);
+ this.pmap = new HashMap<>(predLabels.length);
for (int i = 0; i < predLabels.length; i++) {
pmap.put(predLabels[i], i);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
index 916a531..284ae87 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
@@ -113,8 +113,8 @@ public class BioCodec implements SequenceCodec<String> {
// To validate the model we check if we have one outcome named "other", at least
// one outcome with suffix start. After that we check if all outcomes that ends with
// "cont" have a pair that ends with "start".
- List<String> start = new ArrayList<String>();
- List<String> cont = new ArrayList<String>();
+ List<String> start = new ArrayList<>();
+ List<String> cont = new ArrayList<>();
for (int i = 0; i < outcomes.length; i++) {
String outcome = outcomes[i];
@@ -124,9 +124,7 @@ public class BioCodec implements SequenceCodec<String> {
} else if (outcome.endsWith(NameFinderME.CONTINUE)) {
cont.add(outcome.substring(0, outcome.length()
- NameFinderME.CONTINUE.length()));
- } else if (outcome.equals(NameFinderME.OTHER)) {
- // don't fail anymore if couldn't find outcome named OTHER
- } else {
+ } else if (!outcome.equals(NameFinderME.OTHER)) {
// got unexpected outcome
return false;
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/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 9c65ba4..7f913f9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
@@ -113,7 +113,7 @@ public class DefaultNameContextGenerator implements NameContextGenerator {
* @return the context for finding names at the specified index.
*/
public String[] getContext(int index, String[] tokens, String[] preds, Object[] additionalContext) {
- List<String> features = new ArrayList<String>();
+ List<String> features = new ArrayList<>();
for (AdaptiveFeatureGenerator featureGenerator : featureGenerators) {
featureGenerator.createFeatures(features, tokens, index, preds);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownCluster.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownCluster.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownCluster.java
index bad6be4..009c7c0 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownCluster.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/BrownCluster.java
@@ -58,7 +58,7 @@ public class BrownCluster implements SerializableArtifact {
}
}
- private Map<String, String> tokenToClusterMap = new HashMap<String, String>();
+ private Map<String, String> tokenToClusterMap = new HashMap<>();
/**
* Generates the token to cluster map from Brown cluster input file.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/2ff81900/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/GISIndexingTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/GISIndexingTest.java b/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/GISIndexingTest.java
index 0554316..771d3a5 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/GISIndexingTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/GISIndexingTest.java
@@ -118,8 +118,8 @@ public class GISIndexingTest {
parameters.put(AbstractDataIndexer.SORT_PARAM, "true");
// guarantee that you have a GIS trainer...
- EventTrainer trainer = TrainerFactory.getEventTrainer(parameters.getSettings(),
- new HashMap<String,String>());
+ EventTrainer trainer =
+ TrainerFactory.getEventTrainer(parameters.getSettings(), new HashMap<>());
Assert.assertEquals("opennlp.tools.ml.maxent.GIS", trainer.getClass().getName());
AbstractEventTrainer aeTrainer = (AbstractEventTrainer)trainer;
// guarantee that you have a OnePassDataIndexer ...
@@ -137,7 +137,7 @@ public class GISIndexingTest {
parameters.put(AbstractEventTrainer.DATA_INDEXER_PARAM, AbstractEventTrainer.DATA_INDEXER_TWO_PASS_VALUE);
parameters.put(AbstractEventTrainer.CUTOFF_PARAM, "2");
- trainer = TrainerFactory.getEventTrainer(parameters.getSettings(), new HashMap<String,String>());
+ trainer = TrainerFactory.getEventTrainer(parameters.getSettings(), new HashMap<>());
Assert.assertEquals("opennlp.tools.ml.maxent.quasinewton.QNTrainer", trainer.getClass().getName());
aeTrainer = (AbstractEventTrainer)trainer;
di = aeTrainer.getDataIndexer(eventStream);