You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/05/25 18:08:08 UTC
[04/15] incubator-joshua git commit: renaming for readability
renaming for readability
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/47814050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/47814050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/47814050
Branch: refs/heads/master
Commit: 4781405080908edf86045dd2809cc2bff25d315f
Parents: b11b251
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed May 25 01:07:30 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed May 25 01:07:30 2016 +0200
----------------------------------------------------------------------
src/joshua/decoder/JoshuaConfiguration.java | 14 +++++++-------
src/joshua/util/FormatUtils.java | 11 ++---------
2 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/47814050/src/joshua/decoder/JoshuaConfiguration.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/JoshuaConfiguration.java b/src/joshua/decoder/JoshuaConfiguration.java
index 7a3de23..c874534 100644
--- a/src/joshua/decoder/JoshuaConfiguration.java
+++ b/src/joshua/decoder/JoshuaConfiguration.java
@@ -19,7 +19,7 @@
package joshua.decoder;
import static joshua.util.FormatUtils.cleanNonTerminal;
-import static joshua.util.FormatUtils.markup;
+import static joshua.util.FormatUtils.ensureNonTerminalBrackets;
import java.io.File;
import java.io.FileWriter;
@@ -74,8 +74,8 @@ public class JoshuaConfiguration {
public String weights_file = "";
// Default symbols. The symbol here should be enclosed in square brackets.
- public String default_non_terminal = FormatUtils.markup("X");
- public String goal_symbol = FormatUtils.markup("GOAL");
+ public String default_non_terminal = FormatUtils.ensureNonTerminalBrackets("X");
+ public String goal_symbol = FormatUtils.ensureNonTerminalBrackets("GOAL");
/*
* A list of OOV symbols in the form
@@ -445,7 +445,7 @@ public class JoshuaConfiguration {
while (str != null) {
String[] tokens = str.trim().split("\\s+");
- oovList.add(new OOVItem(FormatUtils.markup(tokens[0]),
+ oovList.add(new OOVItem(FormatUtils.ensureNonTerminalBrackets(tokens[0]),
(float) Math.log(Float.parseFloat(tokens[1]))));
str = br.readLine();
@@ -469,7 +469,7 @@ public class JoshuaConfiguration {
oovList = new ArrayList<OOVItem>();
for (int i = 0; i < tokens.length; i += 2)
- oovList.add(new OOVItem(FormatUtils.markup(tokens[i]),
+ oovList.add(new OOVItem(FormatUtils.ensureNonTerminalBrackets(tokens[i]),
(float) Math.log(Float.parseFloat(tokens[i + 1]))));
Collections.sort(oovList);
@@ -483,11 +483,11 @@ public class JoshuaConfiguration {
lattice_decoding = true;
} else if (parameter.equals(normalize_key("default-non-terminal"))) {
- default_non_terminal = markup(cleanNonTerminal(fds[1].trim()));
+ default_non_terminal = ensureNonTerminalBrackets(cleanNonTerminal(fds[1].trim()));
logger.finest(String.format("default_non_terminal: %s", default_non_terminal));
} else if (parameter.equals(normalize_key("goal-symbol"))) {
- goal_symbol = markup(cleanNonTerminal(fds[1].trim()));
+ goal_symbol = ensureNonTerminalBrackets(cleanNonTerminal(fds[1].trim()));
logger.finest("goalSymbol: " + goal_symbol);
} else if (parameter.equals(normalize_key("weights-file"))) {
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/47814050/src/joshua/util/FormatUtils.java
----------------------------------------------------------------------
diff --git a/src/joshua/util/FormatUtils.java b/src/joshua/util/FormatUtils.java
index c925cba..568d3ca 100644
--- a/src/joshua/util/FormatUtils.java
+++ b/src/joshua/util/FormatUtils.java
@@ -75,7 +75,7 @@ public class FormatUtils {
* Removes the index from a nonTerminal: [X,1] -> [X].
*/
public static String stripNonTerminalIndex(String nt) {
- return markup(cleanNonTerminal(nt));
+ return ensureNonTerminalBrackets(cleanNonTerminal(nt));
}
/**
@@ -97,19 +97,12 @@ public class FormatUtils {
* @param nt the nonterminal string
* @return the nonterminal string surrounded in square brackets (if not already)
*/
- public static String markup(String nt) {
+ public static String ensureNonTerminalBrackets(String nt) {
if (isNonterminal(nt))
return nt;
else
return "[" + nt + "]";
}
-
- public static String markup(String nt, int index) {
- if (isNonterminal(nt)) {
- return markup(cleanNonTerminal(nt), index);
- }
- return "[" + nt + INDEX_SEPARATOR + index + "]";
- }
public static String escapeSpecialSymbols(String s) {
return s.replaceAll("\\[", "-lsb-")