From e81b39a3001ec5476fcf6c09bd8b1294e53feff2 Mon Sep 17 00:00:00 2001 From: krasimir Date: Wed, 25 May 2016 12:39:51 +0000 Subject: [PATCH] the Java API now also has access to the token's category while doing completion --- src/runtime/java/jpgf.c | 4 ++-- .../org/grammaticalframework/pgf/TokenProb.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c index 627727c15..bbe8ff2f6 100644 --- a/src/runtime/java/jpgf.c +++ b/src/runtime/java/jpgf.c @@ -627,8 +627,8 @@ Java_org_grammaticalframework_pgf_TokenIterator_fetchTokenProb(JNIEnv* env, jcla return NULL; jclass tp_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/TokenProb"); - jmethodID tp_constrId = (*env)->GetMethodID(env, tp_class, "", "(Ljava/lang/String;D)V"); - jobject jtp = (*env)->NewObject(env, tp_class, tp_constrId, gu2j_string(env,tp->tok), tp->prob); + jmethodID tp_constrId = (*env)->GetMethodID(env, tp_class, "", "(DLjava/lang/String;Ljava/lang/String;)V"); + jobject jtp = (*env)->NewObject(env, tp_class, tp_constrId, tp->prob, gu2j_string(env,tp->tok), gu2j_string(env,tp->cat)); return jtp; } diff --git a/src/runtime/java/org/grammaticalframework/pgf/TokenProb.java b/src/runtime/java/org/grammaticalframework/pgf/TokenProb.java index 3e0c4c62c..2c4ce4447 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/TokenProb.java +++ b/src/runtime/java/org/grammaticalframework/pgf/TokenProb.java @@ -3,11 +3,18 @@ package org.grammaticalframework.pgf; /** Simply a pair of an expression and a probability value. */ public class TokenProb { private String tok; + private String cat; private double prob; - public TokenProb(String tok, double prob) { - this.tok = tok; + public TokenProb(double prob, String tok, String cat) { this.prob = prob; + this.tok = tok; + this.cat = cat; + } + + /** Returns the negative logarithmic probability. */ + public double getProb() { + return prob; } /** Returns the token. */ @@ -15,8 +22,8 @@ public class TokenProb { return tok; } - /** Returns the negative logarithmic probability. */ - public double getProb() { - return prob; + /** Returns the category from which this word was predicted. */ + public String getCategory() { + return cat; } }