You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by le...@apache.org on 2016/05/26 07:03:51 UTC
[10/12] incubator-joshua git commit: Fix log issues such as redundant
checks and spaces
Fix log issues such as redundant checks and spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/d4ac4519
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/d4ac4519
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/d4ac4519
Branch: refs/heads/JOSHUA-252
Commit: d4ac45193450f1c901f23cc938e5981bb64eb8d6
Parents: 8652d19
Author: Thamme Gowda <tg...@gmail.com>
Authored: Sat May 21 12:32:39 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Sat May 21 12:32:39 2016 -0700
----------------------------------------------------------------------
.../apache/joshua/decoder/chart_parser/Chart.java | 4 +---
.../decoder/ff/lm/DefaultNGramLanguageModel.java | 5 +----
.../joshua/decoder/ff/lm/buildin_lm/TrieLM.java | 12 ++++++------
.../apache/joshua/decoder/ff/tm/GrammarReader.java | 4 ++--
.../org/apache/joshua/util/CompareGrammars.java | 6 +++---
.../joshua/util/encoding/FeatureTypeAnalyzer.java | 16 ++++++++++------
6 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d4ac4519/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java b/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
index c5bfd0f..ea30772 100644
--- a/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
+++ b/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
@@ -709,9 +709,7 @@ public class Chart {
HGNode resNode = chartBin.addHyperEdgeInCell(states, rule, i, j, antecedents,
new SourcePath(), true);
- if (LOG.isDebugEnabled()){
- LOG.debug("{}", rule);
- }
+ LOG.debug("{}", rule);
if (null != resNode && !seen_lhs.contains(resNode.lhs)) {
queue.add(resNode);
qtyAdditionsToQueue++;
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d4ac4519/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java b/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
index eefafe1..1de398f 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
@@ -96,10 +96,7 @@ public abstract class DefaultNGramLanguageModel implements NGramLanguageModel {
for (int i = 0; i <= sentenceLength - order; i++) {
int[] ngram = Arrays.copyOfRange(sentence, i, i + order);
double logProb = ngramLogProbability(ngram, order);
- if (LOG.isDebugEnabled()) {
- String words = Vocabulary.getWords(ngram);
- LOG.debug("\tlogp ({}) = {} ", words, logProb);
- }
+ LOG.debug("\tlogp ({}) = {} ", Vocabulary.getWords(ngram), logProb);
probability += logProb;
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d4ac4519/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java b/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
index 11423c3..1133a6b 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
@@ -108,9 +108,11 @@ public class TrieLM extends AbstractLM { //DefaultNGramLanguageModel {
int lineNumber = 0;
for (ArpaNgram ngram : arpaFile) {
lineNumber += 1;
- if (lineNumber%100000==0) LOG.info("Line: {}", lineNumber);
+ if (lineNumber % 100000 == 0){
+ LOG.info("Line: {}", lineNumber);
+ }
- if (LOG.isDebugEnabled()) LOG.debug("{}-gram: ({} | {})", ngram.order(), ngram.getWord(),
+ LOG.debug("{}-gram: ({} | {})", ngram.order(), ngram.getWord(),
Arrays.toString(ngram.getContext()));
int word = ngram.getWord();
@@ -153,8 +155,7 @@ public class TrieLM extends AbstractLM { //DefaultNGramLanguageModel {
wordChildID = children.get(backoffNodeKey);
} else {
wordChildID = ++nodeCounter;
- if (LOG.isDebugEnabled())
- LOG.debug("children.put({}:{}, {})", backoffNodeID, word, wordChildID);
+ LOG.debug("children.put({}: {}, {})", backoffNodeID, word, wordChildID);
children.put(backoffNodeKey, wordChildID);
}
backoffNodeID = wordChildID;
@@ -176,8 +177,7 @@ public class TrieLM extends AbstractLM { //DefaultNGramLanguageModel {
// Store the backoff for this n-gram at this node in the trie
{
float backoff = ngram.getBackoff();
- if (LOG.isDebugEnabled())
- LOG.debug("backoffs.put({}:{}, {})", backoffNodeID, word, backoff);
+ LOG.debug("backoffs.put({}:{}, {})", backoffNodeID, word, backoff);
this.backoffs.put(backoffNodeID, backoff);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d4ac4519/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java b/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
index 43ca3c9..c3b1f24 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
@@ -86,8 +86,8 @@ public abstract class GrammarReader<R extends Rule> implements Iterable<R>, Iter
try {
this.reader.close();
} catch (IOException e) {
- // FIXME: is this the right logging level?
- LOG.warn("Error closing grammar file stream: {}", this.fileName);
+ LOG.warn(e.getMessage(), e);
+ LOG.error("Error closing grammar file stream: {}", this.fileName);
}
this.reader = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d4ac4519/src/main/java/org/apache/joshua/util/CompareGrammars.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/CompareGrammars.java b/src/main/java/org/apache/joshua/util/CompareGrammars.java
index 483b457..37dd3b7 100644
--- a/src/main/java/org/apache/joshua/util/CompareGrammars.java
+++ b/src/main/java/org/apache/joshua/util/CompareGrammars.java
@@ -117,9 +117,9 @@ public class CompareGrammars {
if (set.isEmpty()) {
LOG.info("No score mismatches");
} else {
- LOG.warn("Number of mismatches: {} out of {}", set.size(), counter);
+ LOG.warn("Number of mismatches: {} out of {}", set.size(), counter);
LOG.warn("Total mismatch logProb mass: {} ({}) ({})", totalOverDiffs,
- totalOverDiffs / set.size(), totalOverDiffs / counter );
+ totalOverDiffs / set.size(), totalOverDiffs / counter);
}
}
@@ -132,7 +132,7 @@ public class CompareGrammars {
public static void main(String[] args) throws FileNotFoundException {
if (args.length != 2) {
- System.err.println("Usage: " + CompareGrammars.class.toString() + " grammarFile1 grammarFile2");
+ LOG.error("Usage: {} grammarFile1 grammarFile2", CompareGrammars.class.toString());
System.exit(-1);
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d4ac4519/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java b/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
index cf2766b..504859f 100644
--- a/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
+++ b/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
@@ -120,11 +120,15 @@ public class FeatureTypeAnalyzer {
// Inspects the collected histograms, inferring actual type of feature. Then replaces the
// analyzer, if present, with the most compact applicable type.
public void inferTypes(boolean labeled) {
- for (FeatureType ft : types)
+ for (FeatureType ft : types) {
ft.inferUncompressedType();
- for (int id : featureToType.keySet())
- LOG.info("Type inferred: {} is {}", (labeled ? Vocabulary.word(id) : "Feature " + id),
- types.get(featureToType.get(id)).encoder.getKey());
+ }
+ if (LOG.isInfoEnabled()) {
+ for (int id : featureToType.keySet()) {
+ LOG.info("Type inferred: {} is {}", (labeled ? Vocabulary.word(id) : "Feature " + id),
+ types.get(featureToType.get(id)).encoder.getKey());
+ }
+ }
}
public void buildFeatureMap() {
@@ -159,7 +163,7 @@ public class FeatureTypeAnalyzer {
DataOutputStream out_stream = new DataOutputStream(buf_stream);
buildFeatureMap();
-
+
getIdEncoder().writeState(out_stream);
out_stream.writeBoolean(labeled);
out_stream.writeInt(types.size());
@@ -185,7 +189,7 @@ public class FeatureTypeAnalyzer {
}
return sb.toString();
}
-
+
public boolean isLabeled() {
return labeled;
}