diff options
Diffstat (limited to 'src/runtime/java/org')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/runtime/java/org/grammaticalframework/pgf/Bracket.java b/src/runtime/java/org/grammaticalframework/pgf/Bracket.java index 40fb744ea..e2e12fe19 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/Bracket.java +++ b/src/runtime/java/org/grammaticalframework/pgf/Bracket.java @@ -14,18 +14,18 @@ public class Bracket { * where they all will have the same id */ public final int fid; - public final int lindex; + public final String ann; /** The children of the bracket. Every element is either a string * if this is a leaf in the parse tree, or a {@link Bracket} object. */ public final Object[] children; - public Bracket(String cat, String fun, int fid, int lindex, Object[] children) { + public Bracket(String cat, String fun, int fid, String ann, Object[] children) { this.cat = cat; this.fun = fun; this.fid = fid; - this.lindex = lindex; + this.ann = ann; this.children = children; } } diff --git a/src/runtime/java/org/grammaticalframework/pgf/LiteralCallback.java b/src/runtime/java/org/grammaticalframework/pgf/LiteralCallback.java index 6c6b657e5..0d146159a 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/LiteralCallback.java +++ b/src/runtime/java/org/grammaticalframework/pgf/LiteralCallback.java @@ -3,9 +3,9 @@ package org.grammaticalframework.pgf; import java.util.Iterator; public interface LiteralCallback { - public CallbackResult match(int lin_idx, int start_offset); + public CallbackResult match(String ann, int start_offset); - public Iterator<TokenProb> predict(int lin_idx, String prefix); + public Iterator<TokenProb> predict(String ann, String prefix); public static class CallbackResult { private ExprProb ep; diff --git a/src/runtime/java/org/grammaticalframework/pgf/NercLiteralCallback.java b/src/runtime/java/org/grammaticalframework/pgf/NercLiteralCallback.java index f5375a70a..a49dcc218 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/NercLiteralCallback.java +++ b/src/runtime/java/org/grammaticalframework/pgf/NercLiteralCallback.java @@ -19,7 +19,7 @@ public class NercLiteralCallback implements LiteralCallback { this.sentence = sentence; } - public CallbackResult match(int lin_idx, int offset) { + public CallbackResult match(String ann, int offset) { StringBuilder sbuilder = new StringBuilder(); int i = 0; @@ -83,7 +83,7 @@ public class NercLiteralCallback implements LiteralCallback { return null; } - public Iterator<TokenProb> predict(int lin_idx, String prefix) { + public Iterator<TokenProb> predict(String ann, String prefix) { return Collections.<TokenProb>emptyList().iterator(); } } diff --git a/src/runtime/java/org/grammaticalframework/pgf/UnknownLiteralCallback.java b/src/runtime/java/org/grammaticalframework/pgf/UnknownLiteralCallback.java index d8e865db7..2fb03bb6e 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/UnknownLiteralCallback.java +++ b/src/runtime/java/org/grammaticalframework/pgf/UnknownLiteralCallback.java @@ -15,7 +15,7 @@ public class UnknownLiteralCallback implements LiteralCallback { this.sentence = sentence; } - public CallbackResult match(int lin_idx, int offset) { + public CallbackResult match(String ann, int offset) { if (offset < sentence.length() && !Character.isUpperCase(sentence.charAt(offset))) { int start_offset = offset; @@ -35,7 +35,7 @@ public class UnknownLiteralCallback implements LiteralCallback { return null; } - public Iterator<TokenProb> predict(int lin_idx, String prefix) { + public Iterator<TokenProb> predict(String ann, String prefix) { return Collections.<TokenProb>emptyList().iterator(); } } |