This is an automated email from the ASF dual-hosted git repository.
mawiesne pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opennlp.git
The following commit(s) were added to refs/heads/main by this push:
new ccdf0c2e OPENNLP-1450 - Revise log messages in OpenNLP regarding use
of variable substitution (#520)
ccdf0c2e is described below
commit ccdf0c2ee24a9451b2add5fb1bfa3e9141461abb
Author: Richard Zowalla <[email protected]>
AuthorDate: Thu Mar 9 15:09:40 2023 +0100
OPENNLP-1450 - Revise log messages in OpenNLP regarding use of variable
substitution (#520)
---
.../java/opennlp/bratann/NameFinderAnnService.java | 2 +-
.../languagemodel/NGramLanguageModelTool.java | 4 +--
.../cmdline/namefind/NameSampleCountersStream.java | 3 +-
.../opennlp/tools/cmdline/parser/ParserTool.java | 2 +-
.../tools/formats/brat/BratDocumentParser.java | 6 ++--
.../tools/formats/masc/MascNamedEntityParser.java | 4 +--
.../opennlp/tools/formats/masc/MascSentence.java | 2 +-
.../java/opennlp/tools/ml/maxent/GISTrainer.java | 5 ++--
.../tools/ml/maxent/quasinewton/QNMinimizer.java | 13 ++++-----
.../tools/ml/naivebayes/NaiveBayesTrainer.java | 2 +-
.../tools/ml/perceptron/PerceptronTrainer.java | 6 ++--
.../SimplePerceptronSequenceTrainer.java | 27 +++++++++--------
.../tools/parser/AbstractBottomUpParser.java | 2 +-
.../src/main/java/opennlp/tools/parser/Parse.java | 29 +++++++++---------
.../java/opennlp/tools/parser/chunking/Parser.java | 22 +++++++-------
.../tools/parser/chunking/ParserEventStream.java | 4 +--
.../opennlp/tools/parser/treeinsert/Parser.java | 34 +++++++++++-----------
.../tools/parser/treeinsert/ParserEventStream.java | 33 ++++++++++-----------
.../opennlp/tools/tokenize/TokSpanEventStream.java | 4 +--
19 files changed, 102 insertions(+), 102 deletions(-)
diff --git
a/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
b/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
index f5f480c0..cfd7e473 100644
---
a/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
+++
b/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
@@ -81,7 +81,7 @@ public class NameFinderAnnService {
} else if ("simple".equals(args[ruleBasedTokenizerIndex])) {
tokenizer = SimpleTokenizer.INSTANCE;
} else {
- logger.error("unknown tokenizer: " + args[ruleBasedTokenizerIndex]);
+ logger.error("unknown tokenizer: {}", args[ruleBasedTokenizerIndex]);
return;
}
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/cmdline/languagemodel/NGramLanguageModelTool.java
b/opennlp-tools/src/main/java/opennlp/tools/cmdline/languagemodel/NGramLanguageModelTool.java
index 299e0714..35c2e931 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/cmdline/languagemodel/NGramLanguageModelTool.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/cmdline/languagemodel/NGramLanguageModelTool.java
@@ -74,8 +74,8 @@ public class NGramLanguageModelTool extends BasicCmdLineTool {
continue;
}
- logger.info(Arrays.toString(tokens) + " -> prob:" + probability + ",
" +
- "next:" + Arrays.toString(predicted));
+ logger.info("{} -> prob: {}, next: {}",
+ Arrays.toString(tokens), probability,
Arrays.toString(predicted));
perfMon.incrementCounter();
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/NameSampleCountersStream.java
b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/NameSampleCountersStream.java
index 65c6fd67..4ba54b77 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/NameSampleCountersStream.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/NameSampleCountersStream.java
@@ -98,8 +98,9 @@ public class NameSampleCountersStream
int totalNames = 0;
for (Map.Entry<String, Integer> counter : getNameCounters().entrySet()) {
- logger.info("#" + counter.getKey() + " entities: " + counter.getValue());
+ logger.info("# {} entities: {}", counter.getKey(), counter.getValue());
totalNames += counter.getValue();
}
+ logger.info("# total: {}", totalNames);
}
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java
b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java
index 2eff34ac..05c55c2e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTool.java
@@ -152,7 +152,7 @@ public final class ParserTool extends BasicCmdLineTool {
for (int pi = 0, pn = parses.length; pi < pn; pi++) {
if (showTopK) {
- logger.debug(pi + " " + parses[pi].getProb() + " ");
+ logger.debug("{} {} ", pi, parses[pi].getProb());
}
parses[pi].show();
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocumentParser.java
b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocumentParser.java
index 84bb4010..c8f82952 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocumentParser.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocumentParser.java
@@ -148,9 +148,9 @@ public class BratDocumentParser {
if (nameBeginIndex != null && nameEndIndex != null) {
mappedFragments.add(new Span(nameBeginIndex, nameEndIndex,
entity.getType()));
} else {
- logger.warn("Dropped entity " + entity.getId() + " ("
- + entitySpan.getCoveredText(sample.getText()) + ") " + "
in document "
- + sample.getId() + ", it is not matching tokenization!");
+ logger.warn("Dropped entity {} ({}) in document {} as it is
not matching " +
+ "tokenization!", entity.getId(),
+ entitySpan.getCoveredText(sample.getText()),
sample.getId());
}
}
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascNamedEntityParser.java
b/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascNamedEntityParser.java
index a0a455e0..bd100507 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascNamedEntityParser.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascNamedEntityParser.java
@@ -88,8 +88,8 @@ public class MascNamedEntityParser extends DefaultHandler {
String type = entityIDtoEntityType.get(entityID);
if (tokenToEntity.containsKey(tokenID) &&
!type.equals(tokenToEntity.get(tokenID))) {
logger.warn("One token assigned to different named entity types.\n" +
- "\tPenn-TokenID: " + tokenID + "\n\tToken types: \"" + type +
"\", \"" +
- tokenToEntity.get(tokenID) + "\"\n\tKeeping only " + "\"type\"");
+ "\tPenn-TokenID: {}\n\tToken types: \"{}\", \"{}\"\n\tKeeping
only " + "\"type\"",
+ tokenID, type, tokenToEntity.get(tokenID));
}
tokenToEntity.put(tokenID, type);
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascSentence.java
b/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascSentence.java
index bef5152b..ec7762b8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascSentence.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/masc/MascSentence.java
@@ -243,7 +243,7 @@ public class MascSentence extends Span {
Span leftSpan = namedEntities.get(leftIndex);
Span rightSpan = namedEntities.get(rightIndex);
if (leftSpan.contains(rightSpan) || leftSpan.crosses(rightSpan)) {
- logger.warn("Named entities overlap. This is forbidden in the
OpenNLP." +
+ logger.warn("Named entities overlap. This is forbidden in OpenNLP." +
"\n\tKeeping the longer of them.");
if (rightSpan.length() > leftSpan.length()) {
overlaps.add(leftIndex);
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
index 93a4c635..e3bde283 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
@@ -628,7 +628,7 @@ public class GISTrainer extends AbstractEventTrainer {
params[pi].updateParameter(aoi, gaussianUpdate(pi, aoi,
correctionConstant));
} else {
if (model[aoi] == 0) {
- logger.warn("Model expects == 0 for " + predLabels[pi] + " " +
outcomeLabels[aoi]);
+ logger.warn("Model expects == 0 for {} {}", predLabels[pi],
outcomeLabels[aoi]);
}
//params[pi].updateParameter(aoi,(StrictMath.log(observed[aoi]) -
StrictMath.log(model[aoi])));
params[pi].updateParameter(aoi, ((StrictMath.log(observed[aoi]) -
StrictMath.log(model[aoi]))
@@ -642,7 +642,8 @@ public class GISTrainer extends AbstractEventTrainer {
}
}
- logger.info("{} - loglikelihood=" + loglikelihood + "\t" + ((double)
numCorrect / numEvents), iteration);
+ logger.info("{} - loglikelihood={}\t{}",
+ iteration, loglikelihood, ((double) numCorrect / numEvents));
return loglikelihood;
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNMinimizer.java
b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNMinimizer.java
index 2089188a..194500f7 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNMinimizer.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNMinimizer.java
@@ -226,8 +226,8 @@ public class QNMinimizer {
if (logger.isDebugEnabled()) {
logger.debug("Solving convex optimization problem.");
logger.debug("Objective function has {} variable(s).", dimension);
- logger.debug("Performing " + iterations + " iterations with " +
- "L1Cost=" + l1Cost + " and L2Cost=" + l2Cost );
+ logger.debug("Performing {} iterations with L1Cost={} and L2Cost={}",
+ iterations, l1Cost, l2Cost);
}
double[] direction = new double[dimension];
@@ -270,11 +270,10 @@ public class QNMinimizer {
if (logger.isDebugEnabled()) {
if (evaluator != null) {
- logger.debug("{}: \t" + lsr.getValueAtNext() + "\t" +
lsr.getFuncChangeRate()
- + "\t" + evaluator.evaluate(lsr.getNextPoint()), iter);
+ logger.debug("{}: \t{}\t{}\t{}", iter,
+ lsr.getValueAtNext(),
lsr.getFuncChangeRate(),evaluator.evaluate(lsr.getNextPoint()));
} else {
- logger.debug("{}: \t " + lsr.getValueAtNext() +
- "\t" + lsr.getFuncChangeRate() + "\n", iter);
+ logger.debug("{}: \t {}\t{}\n", iter, lsr.getValueAtNext(),
lsr.getFuncChangeRate());
}
}
if (isConverged(lsr))
@@ -294,7 +293,7 @@ public class QNMinimizer {
long endTime = System.currentTimeMillis();
long duration = endTime - startTime;
- logger.info("Running time: " + (duration / 1000.) + "s\n");
+ logger.info("Running time: {}s\n", (duration / 1000.));
// Release memory
this.updateInfo = null;
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesTrainer.java
b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesTrainer.java
index d1990ab9..f43f0d9a 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesTrainer.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesTrainer.java
@@ -233,7 +233,7 @@ public class NaiveBayesTrainer extends AbstractEventTrainer
{
}
}
double trainingAccuracy = (double) numCorrect / numEvents;
- logger.info("Stats: (" + numCorrect + "/" + numEvents + ") " +
trainingAccuracy);
+ logger.info("Stats: ({}/{}) {}", numCorrect, numEvents, trainingAccuracy);
return trainingAccuracy;
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
index 77a9db1e..f8275db0 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
@@ -288,7 +288,7 @@ public class PerceptronTrainer extends AbstractEventTrainer
{
private MutableContext[] findParameters(int iterations, boolean useAverage) {
- logger.info("Performing " + iterations + " iterations.");
+ logger.info("Performing {} iterations.", iterations);
int[] allOutcomesPattern = new int[numOutcomes];
for (int oi = 0; oi < numOutcomes; oi++)
@@ -373,7 +373,7 @@ public class PerceptronTrainer extends AbstractEventTrainer
{
// Calculate the training accuracy and display.
double trainingAccuracy = (double) numCorrect / numEvents;
if (i < 10 || (i % 10) == 0)
- logger.info("{}: (" + numCorrect + "/" + numEvents + ") " +
trainingAccuracy, i);
+ logger.info("{}: ({}/{}) {}", i, numCorrect, numEvents,
trainingAccuracy);
// TODO: Make averaging configurable !!!
@@ -442,7 +442,7 @@ public class PerceptronTrainer extends AbstractEventTrainer
{
}
}
double trainingAccuracy = (double) numCorrect / numEvents;
- logger.info("Stats: (" + numCorrect + "/" + numEvents + ") " +
trainingAccuracy);
+ logger.info("Stats: ({}/{}) {}", numCorrect, numEvents, trainingAccuracy);
return trainingAccuracy;
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
index 44073554..3488b840 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
@@ -253,7 +253,7 @@ public class SimplePerceptronSequenceTrainer extends
AbstractEventModelSequenceT
}
private void findParameters(int iterations) throws IOException {
- logger.info("Performing " + iterations + " iterations.\n");
+ logger.info("Performing {} iterations.\n", iterations);
for (int i = 1; i <= iterations; i++) {
nextIteration(i);
}
@@ -356,8 +356,8 @@ public class SimplePerceptronSequenceTrainer extends
AbstractEventModelSequenceT
int pi = pmap.getOrDefault(feature, -1);
if (pi != -1) {
if (logger.isTraceEnabled()) {
- logger.trace(si + " " + outcomeLabels[oi] + " " + feature + " "
- + featureCounts.get(oi).get(feature));
+ logger.trace("{} {} {} {}",
+ si, outcomeLabels[oi], feature,
featureCounts.get(oi).get(feature));
}
params[pi].updateParameter(oi,
featureCounts.get(oi).get(feature));
if (useAverage) {
@@ -365,14 +365,13 @@ public class SimplePerceptronSequenceTrainer extends
AbstractEventModelSequenceT
averageParams[pi].updateParameter(oi, updates[pi][oi][VALUE]
* (numSequences
* (iteration - updates[pi][oi][ITER]) + (si -
updates[pi][oi][EVENT])));
if (logger.isTraceEnabled()) {
- logger.trace("p avp[" + pi + "]." + oi + "=" +
averageParams[pi].getParameters()[oi]);
+ logger.trace("p avp[{}].{}={}", pi, oi,
averageParams[pi].getParameters()[oi]);
}
}
if (logger.isTraceEnabled()) {
- logger.trace("p updates[" + pi + "][" + oi + "]=(" +
updates[pi][oi][ITER] + ","
- + updates[pi][oi][EVENT] + "," + updates[pi][oi][VALUE]
+ ") + ("
- + iteration + "," + oei + "," +
params[pi].getParameters()[oi]
- + ") -> " + averageParams[pi].getParameters()[oi]);
+ logger.trace("p updates[{}]{{}]=({},{},{})({},{},{}) -> {}",
pi, oi, updates[pi][oi][ITER],
+ updates[pi][oi][EVENT], updates[pi][oi][VALUE],
iteration, oei,
+ params[pi].getParameters()[oi],
averageParams[pi].getParameters()[oi]);
}
updates[pi][oi][VALUE] = (int) params[pi].getParameters()[oi];
updates[pi][oi][ITER] = iteration;
@@ -399,16 +398,16 @@ public class SimplePerceptronSequenceTrainer extends
AbstractEventModelSequenceT
predParams[oi] /= totIterations;
averageParams[pi].setParameter(oi, predParams[oi]);
if (logger.isTraceEnabled()) {
- logger.trace("updates[" + pi + "][" + oi + "]=(" +
updates[pi][oi][ITER] + ","
- + updates[pi][oi][EVENT] + "," + updates[pi][oi][VALUE] + ")
+ (" + iterations
- + "," + 0 + "," + params[pi].getParameters()[oi] + ") -> "
- + averageParams[pi].getParameters()[oi]);
+ logger.trace("updates[{}][{}]=({},{},{})({},{},{}) -> {}", pi,
oi, updates[pi][oi][ITER],
+ updates[pi][oi][EVENT], updates[pi][oi][VALUE], iterations,
0,
+ params[pi].getParameters()[oi],
averageParams[pi].getParameters()[oi]);
}
}
}
}
}
- logger.info("{}. (" + numCorrect + "/" + numEvents + ") " + ((double)
numCorrect / numEvents), iteration);
+ logger.info("{}. ({}/{}) {}", iteration, numCorrect,
+ numEvents, ((double) numCorrect / numEvents));
}
private void trainingStats(MutableContext[] params) throws IOException {
@@ -428,6 +427,6 @@ public class SimplePerceptronSequenceTrainer extends
AbstractEventModelSequenceT
}
}
}
- logger.info(". (" + numCorrect + "/" + numEvents + ") " + ((double)
numCorrect / numEvents));
+ logger.info(". ({}/{}) {}", numCorrect, numEvents, ((double) numCorrect /
numEvents));
}
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
index d0454c45..cf0b4981 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
@@ -295,7 +295,7 @@ public abstract class AbstractBottomUpParser implements
Parser {
guess = tp;
}
if (logger.isDebugEnabled()) {
- logger.debug(derivationStage + " " + derivationRank + " " +
tp.getProb());
+ logger.debug("{} {} {}", derivationStage, derivationRank,
tp.getProb());
tp.show();
}
Parse[] nd;
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
b/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
index 33880baf..e5bd3124 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
@@ -323,8 +323,8 @@ public class Parse implements Cloneable, Comparable<Parse> {
for (; pi < pn; pi++) {
Parse subPart = parts.get(pi);
if (logger.isTraceEnabled()) {
- logger.trace("Parse.insert:con=" + constituent + " sp[" + pi + "] "
- + subPart + " " + subPart.getType());
+ logger.trace("Parse.insert:con={} sp[{}] {} {}",
+ constituent, pi, subPart, subPart.getType());
}
Span sp = subPart.span;
if (sp.getStart() >= ic.getEnd()) {
@@ -340,7 +340,8 @@ public class Parse implements Cloneable, Comparable<Parse> {
constituent.parts.add(subPart);
subPart.setParent(constituent);
if (logger.isTraceEnabled()) {
- logger.trace("Parse.insert: " + subPart.hashCode() + " -> " +
subPart.getParent().hashCode());
+ logger.trace("Parse.insert: {} -> {}",
+ subPart.hashCode(), subPart.getParent().hashCode());
}
pn = parts.size();
} else if (sp.contains(ic)) {
@@ -352,7 +353,7 @@ public class Parse implements Cloneable, Comparable<Parse> {
}
}
if (logger.isTraceEnabled()) {
- logger.trace("Parse.insert:adding con=" + constituent + " to " + this);
+ logger.trace("Parse.insert:adding con={} to {}", constituent, this);
}
parts.add(pi, constituent);
constituent.setParent(this);
@@ -375,20 +376,20 @@ public class Parse implements Cloneable,
Comparable<Parse> {
sb.append("(");
sb.append(type).append(" ");
if (logger.isTraceEnabled()) {
- logger.trace(label + " ");
+ logger.trace("{} ", label);
}
if (logger.isTraceEnabled()) {
- logger.trace(head + " ");
+ logger.trace("{} ", head);
}
if (logger.isTraceEnabled()) {
- logger.trace(prob + " ");
+ logger.trace("{} ", prob);
}
}
for (Parse c : parts) {
Span s = c.span;
if (start < s.getStart()) {
if (logger.isTraceEnabled()) {
- logger.trace("pre " + start + " " + s.getStart());
+ logger.trace("pre {} {}", start, s.getStart());
}
sb.append(encodeToken(text.substring(start, s.getStart())));
}
@@ -418,11 +419,11 @@ public class Parse implements Cloneable,
Comparable<Parse> {
*/
public double getTagSequenceProb() {
if (logger.isTraceEnabled()) {
- logger.trace("Parse.getTagSequenceProb: " + type + " " + this);
+ logger.trace("Parse.getTagSequenceProb: {} {}",type, this);
}
if (parts.size() == 1 &&
(parts.get(0)).type.equals(AbstractBottomUpParser.TOK_NODE)) {
if (logger.isTraceEnabled()) {
- logger.trace(this + " " + prob);
+ logger.trace("{} {}", this, prob);
}
return (StrictMath.log(prob));
} else if (parts.size() == 0) {
@@ -582,7 +583,7 @@ public class Parse implements Cloneable, Comparable<Parse> {
public void expandTopNode(Parse root) {
boolean beforeRoot = true;
if (logger.isTraceEnabled()) {
- logger.trace("expandTopNode: parts=" + parts);
+ logger.trace("expandTopNode: parts={}", parts);
}
for (int pi = 0, ai = 0; pi < parts.size(); pi++, ai++) {
Parse node = parts.get(pi);
@@ -839,7 +840,7 @@ public class Parse implements Cloneable, Comparable<Parse> {
if (token != null) {
if (Objects.equals(type, "-NONE-") && gl != null) {
if (logger.isTraceEnabled()) {
- logger.trace("stack.size=" + stack.size());
+ logger.trace("stack.size={}", stack.size());
}
gl.labelGaps(stack);
} else {
@@ -868,7 +869,7 @@ public class Parse implements Cloneable, Comparable<Parse> {
}
Parse c = new Parse(txt, con.getSpan(), type, 1, tokenIndex);
if (logger.isTraceEnabled()) {
- logger.trace("insert[" + tokenIndex + "] " + type + " " + c + " " +
c.hashCode());
+ logger.trace("insert[{}] {} {} {}", tokenIndex, type, c,
c.hashCode());
}
p.insert(c);
//codeTree(p);
@@ -1064,7 +1065,7 @@ public class Parse implements Cloneable,
Comparable<Parse> {
Parse endToken = tokens[nameTokenSpan.getEnd() - 1];
Parse commonParent = startToken.getCommonParent(endToken);
if (logger.isTraceEnabled()) {
- logger.trace("addNames: " + startToken + " .. " + endToken + "
commonParent = " + commonParent);
+ logger.trace("addNames: {} .. {} commonParent = {}", startToken,
endToken, commonParent);
}
if (commonParent != null) {
Span nameSpan = new Span(startToken.getSpan().getStart(),
endToken.getSpan().getEnd());
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 a35c2ddd..d8017d44 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
@@ -147,12 +147,12 @@ public class Parser extends AbstractBottomUpParser {
String outcome = buildModel.getOutcome(boi);
if (outcome.startsWith(START)) {
if (logger.isTraceEnabled()) {
- logger.trace("startMap " + outcome + "->" +
outcome.substring(START.length()));
+ logger.trace("startMap {} -> {} ", outcome,
outcome.substring(START.length()));
}
startTypeMap.put(outcome, outcome.substring(START.length()));
} else if (outcome.startsWith(CONT)) {
if (logger.isTraceEnabled()) {
- logger.trace("contMap " + outcome + "->" +
outcome.substring(CONT.length()));
+ logger.trace("contMap {} -> {}", outcome,
outcome.substring(CONT.length()));
}
contTypeMap.put(outcome, outcome.substring(CONT.length()));
}
@@ -200,8 +200,8 @@ public class Parser extends AbstractBottomUpParser {
lastStartNode = advanceNode;
lastStartIndex = advanceNodeIndex;
if (logger.isTraceEnabled()) {
- logger.trace("lastStart " + lastStartIndex + " "
- + lastStartNode.getLabel() + " " + lastStartNode.getProb());
+ logger.trace("lastStart {} {} {}", lastStartIndex,
+ lastStartNode.getLabel(), lastStartNode.getProb());
}
}
}
@@ -226,13 +226,13 @@ public class Parser extends AbstractBottomUpParser {
bprobSum += bprob;
String tag = buildModel.getOutcome(max);
if (logger.isTraceEnabled()) {
- logger.trace("trying " + tag + " " + bprobSum + " lst=" + tag);
+ logger.trace("trying {} {} list={}", tag, bprobSum, tag);
}
if (max == topStartIndex) { // can't have top until complete
continue;
}
if (logger.isTraceEnabled()) {
- logger.trace(tag + " " + bprob);
+ logger.trace("{} {}", tag, bprob);
}
if (startTypeMap.containsKey(tag)) { //update last start
lastStartIndex = advanceNodeIndex;
@@ -257,8 +257,8 @@ public class Parser extends AbstractBottomUpParser {
if (logger.isTraceEnabled()) {
String[] context =
checkContextGenerator.getContext(newParse1.getChildren(),
lastStartType, lastStartIndex, advanceNodeIndex);
- logger.trace(("check " + lastStartType + " " + cprobs[completeIndex] +
" "
- + cprobs[incompleteIndex] + " " + tag + " " +
java.util.Arrays.asList(context)));
+ logger.trace("check {} {} {} {} {}", lastStartType,
cprobs[completeIndex],
+ cprobs[incompleteIndex], tag, java.util.Arrays.asList(context));
}
Parse newParse2;
@@ -285,9 +285,9 @@ public class Parser extends AbstractBottomUpParser {
//check for top node to include end and begining punctuation
if (lastStartIndex == 0 && advanceNodeIndex == numNodes - 1) {
if (logger.isTraceEnabled()) {
- logger.trace("ParserME.advanceParses: reducing entire span: "
- + new Span(lastStartNode.getSpan().getStart(),
advanceNode.getSpan().getEnd()) + " "
- + lastStartType + " " + java.util.Arrays.asList(children));
+ logger.trace("ParserME.advanceParses: reducing entire span: {}
{} {}",
+ new Span(lastStartNode.getSpan().getStart(),
advanceNode.getSpan().getEnd()),
+ lastStartType, java.util.Arrays.asList(children));
}
newParse2.insert(new Parse(p.getText(), p.getSpan(),
lastStartType, cprobs[1],
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
index 036ffa1a..73e4c6c9 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
@@ -154,8 +154,8 @@ public class ParserEventStream extends
AbstractParserEventStream {
outcome = AbstractBottomUpParser.CONT + type;
}
if (logger.isTraceEnabled()) {
- logger.trace("parserEventStream.addParseEvents: chunks[" + ci + "]="
- + c + " label=" + outcome + " bcg=" + bcg);
+ logger.trace("parserEventStream.addParseEvents: chunks[{}]={}
label={} bcg={}",
+ ci, c, outcome, bcg);
}
c.setLabel(outcome);
if (etype == ParserEventTypeEnum.BUILD) {
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
index 19dbf9e0..8f6518a0 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
@@ -305,9 +305,9 @@ public class Parser extends AbstractBottomUpParser {
buildModel.eval(buildContextGenerator.getContext(children,
advanceNodeIndex), bprobs);
double doneProb = bprobs[doneIndex];
if (logger.isDebugEnabled())
- logger.debug("adi=" + advanceNodeIndex + " " + advanceNode.getType() +
"."
- + advanceNode.getLabel() + " " + advanceNode + " choose build=" + (1
- doneProb)
- + " attach=" + doneProb);
+ logger.debug("adi={} {}.{} {} choose build={} attach={}",
+ advanceNodeIndex, advanceNode.getType(), advanceNode.getLabel(),
+ advanceNode, (1 - doneProb), doneProb);
if (1 - doneProb > q) {
double bprobSum = 0;
@@ -336,7 +336,7 @@ public class Parser extends AbstractBottomUpParser {
cprobs = checkModel.eval(checkContextGenerator.getContext(newNode,
children,
advanceNodeIndex,false));
if (logger.isDebugEnabled())
- logger.debug("building " + tag + " " + bprob + " c=" +
cprobs[completeIndex]);
+ logger.debug("building {} {} c={}", tag, bprob,
cprobs[completeIndex]);
if (cprobs[completeIndex] > probMass) { //just complete advances
setComplete(newNode);
newParse1.addProb(StrictMath.log(cprobs[completeIndex]));
@@ -362,7 +362,7 @@ public class Parser extends AbstractBottomUpParser {
}
}
else {
- if (logger.isDebugEnabled()) logger.debug("building " + tag + " "
+ bprob);
+ if (logger.isDebugEnabled()) logger.debug("building {} {}", tag,
bprob);
}
}
}
@@ -397,9 +397,9 @@ public class Parser extends AbstractBottomUpParser {
if (logger.isDebugEnabled()) {
// List cs =
java.util.Arrays.asList(attachContextGenerator.getContext(children,
// advanceNodeIndex,rf,fi,punctSet));
- logger.debug("Frontier node(" + fi + "): " + fn.getType() + "." +
fn.getLabel()
- + " " + fn + " <- " + advanceNode.getType() + " " +
advanceNode + " d="
- + aprobs[daughterAttachIndex] + " s=" +
aprobs[sisterAttachIndex] + " ");
+ logger.debug("Frontier node({}): {}.{} {} <- {} {} d={} s={} ",
+ fi, fn.getType(), fn.getLabel(), fn, advanceNode.getType(),
+ advanceNode, aprobs[daughterAttachIndex],
aprobs[sisterAttachIndex]);
}
for (int attachment : attachments) {
double prob = aprobs[attachment];
@@ -417,8 +417,8 @@ public class Parser extends AbstractBottomUpParser {
//remove node from top level since were going to attach it
(including punct)
for (int ri = originalZeroIndex + 1; ri <= originalAdvanceIndex;
ri++) {
if (logger.isTraceEnabled()) {
- logger.trace(ri + "-removing " + (originalZeroIndex + 1) + "
"
- + newParse2.getChildren()[originalZeroIndex + 1]);
+ logger.trace("{}-removing {} {}", ri, (originalZeroIndex +
1),
+ newParse2.getChildren()[originalZeroIndex + 1]);
}
newParse2.remove(originalZeroIndex + 1);
}
@@ -465,21 +465,21 @@ public class Parser extends AbstractBottomUpParser {
setIncomplete(updatedNode);
newParse2.addProb(StrictMath.log(1 - cprobs[completeIndex]));
if (logger.isDebugEnabled())
- logger.debug("Advancing both complete and incomplete
nodes; c="
- + cprobs[completeIndex]);
+ logger.debug("Advancing both complete and incomplete
nodes; c={}",
+ cprobs[completeIndex]);
}
}
} else {
if (logger.isDebugEnabled())
- logger.debug("Skipping " + fn.getType() + "." + fn.getLabel()
+ " "
- + fn + " daughter=" + (attachment ==
daughterAttachIndex)
- + " complete=" + isComplete(fn) + " prob=" + prob);
+ logger.debug("Skipping {}.{} {} daughter={} complete={}
prob={}",
+ fn.getType(), fn.getLabel(), fn, (attachment ==
daughterAttachIndex),
+ isComplete(fn), prob);
}
}
if (checkComplete && !isComplete(fn)) {
if (logger.isDebugEnabled())
- logger.debug("Stopping at incomplete node(" + fi + "): "
- + fn.getType() + "." + fn.getLabel() + " " + fn);
+ logger.debug("Stopping at incomplete node({}): {} . {} {}",
+ fi, fn.getType(), fn.getLabel(), fn);
break;
}
}
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java
b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java
index 5e7be970..d50d3b3f 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java
@@ -224,8 +224,8 @@ public class ParserEventStream extends
AbstractParserEventStream {
/* Right frontier consisting of partially-built nodes based on current
state of the parse.*/
List<Parse> currentRightFrontier =
Parser.getRightFrontier(currentChunks[0],punctSet);
if (currentRightFrontier.size() != rightFrontier.size()) {
- logger.error("Frontiers mis-aligned: " + currentRightFrontier.size()
+ " != "
- + rightFrontier.size() + " " + currentRightFrontier + " " +
rightFrontier);
+ logger.error("Frontiers mis-aligned: {} != {} {} {}",
currentRightFrontier.size(),
+ rightFrontier.size(), currentRightFrontier, rightFrontier);
System.exit(1);
}
Map<Parse, Integer> parents = getNonAdjoinedParent(chunks[ci]);
@@ -236,10 +236,10 @@ public class ParserEventStream extends
AbstractParserEventStream {
if (!Parser.checkComplete ||
!Parser.COMPLETE.equals(cfn.getLabel())) {
Integer i = parents.get(frontierNode);
if (logger.isDebugEnabled())
- logger.debug("Looking at attachment site (" + cfi + "): "
- + cfn.getType() + " ci=" + i + " cs=" +
nonPunctChildCount(cfn)
- + ", " + cfn + " :for " + currentChunks[ci].getType() + " "
- + currentChunks[ci] + " -> " + parents);
+ logger.debug("Looking at attachment site ({}): {} ci={} cs={},
{} :for {} {} -> {}",
+ cfi, cfn.getType(), i, nonPunctChildCount(cfn), cfn,
currentChunks[ci].getType(),
+ currentChunks[ci], parents
+ );
if (attachNode == null && i != null && i ==
nonPunctChildCount(cfn)) {
attachType = Parser.ATTACH_DAUGHTER;
@@ -253,13 +253,13 @@ public class ParserEventStream extends
AbstractParserEventStream {
}
else {
if (logger.isDebugEnabled())
- logger.debug("Skipping (" + cfi + "): " + cfn.getType() + ","
- + cfn.getPreviousPunctuationSet() + " " + cfn + " :for "
- + currentChunks[ci].getType() + " " + currentChunks[ci] + "
-> " + parents);
+ logger.debug("Skipping ({}): {},{} {} :for {} {} -> {}",
+ cfi, cfn.getType(), cfn.getPreviousPunctuationSet(), cfn,
+ currentChunks[ci].getType(), currentChunks[ci], parents);
}
// Can't attach past first incomplete node.
if (Parser.checkComplete &&
cfn.getLabel().equals(Parser.INCOMPLETE)) {
- if (logger.isDebugEnabled()) logger.debug("breaking on
incomplete:" + cfn.getType() + " " + cfn);
+ if (logger.isDebugEnabled()) logger.debug("breaking on incomplete:
{} {}", cfn.getType(), cfn);
break;
}
}
@@ -290,7 +290,7 @@ public class ParserEventStream extends
AbstractParserEventStream {
}
//Can't attach past first incomplete node.
if (Parser.checkComplete &&
cfn.getLabel().equals(Parser.INCOMPLETE)) {
- if (logger.isDebugEnabled()) logger.debug("breaking on
incomplete:" + cfn.getType() + " " + cfn);
+ if (logger.isDebugEnabled()) logger.debug("breaking on incomplete:
{} {}", cfn.getType(), cfn);
break;
}
}
@@ -299,9 +299,8 @@ public class ParserEventStream extends
AbstractParserEventStream {
if (Parser.ATTACH_DAUGHTER.equals(attachType)) {
Parse daughter = currentChunks[ci];
if (logger.isDebugEnabled())
- logger.debug("daughter attach a=" + attachNode.getType() + ":"
- + attachNode + " d=" + daughter + " com="
- + lastChild(chunks[ci], rightFrontier.get(attachNodeIndex)));
+ logger.debug("daughter attach a={}:{} d={} com={}",
attachNode.getType(),
+ attachNode, daughter, lastChild(chunks[ci],
rightFrontier.get(attachNodeIndex)));
attachNode.add(daughter,rules);
daughter.setParent(attachNode);
@@ -324,9 +323,9 @@ public class ParserEventStream extends
AbstractParserEventStream {
rightFrontier.set(attachNodeIndex,frontierNode.getParent());
Parse sister = currentChunks[ci];
if (logger.isDebugEnabled())
- logger.debug("sister attach a=" + attachNode.getType()
- + ":" + attachNode + " s=" + sister + " ap=" +
attachNode.getParent()
- + " com=" + lastChild(chunks[ci],
rightFrontier.get(attachNodeIndex)));
+ logger.debug("sister attach a={}:{} s={} ap={} com={}",
attachNode.getType(),
+ attachNode, sister, attachNode.getParent(),
+ lastChild(chunks[ci], rightFrontier.get(attachNodeIndex)));
Parse newParent = attachNode.getParent().adjoin(sister,rules);
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
index 0f693262..36f4a98d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
@@ -138,8 +138,8 @@ public class TokSpanEventStream extends
AbstractEventStream<TokenSample> {
//keep looking
}
else {
- logger.warn("Bad training token: " + tokens[ti] + " cand: " +
cSpan +
- " token=" + text.substring(tokens[ti].getStart(),
tokens[ti].getEnd()));
+ logger.warn("Bad training token: {} cand: {} token={}",
tokens[ti], cSpan,
+ text.substring(tokens[ti].getStart(), tokens[ti].getEnd()));
}
}
