compute the right word probability

4 files changed, 31 insertions, 26 deletions

diff --git a/src/runtime/c/pgf/parser.c b/src/runtime/c/pgf/parser.c
index 74e3fb989..715fae04e 100644
--- a/src/runtime/c/pgf/parser.c
+++ b/src/runtime/c/pgf/parser.c
@@ -2532,7 +2532,9 @@ pgf_morpho_iter(PgfProductionIdx* idx,
 
 		PgfCId lemma = entry->papp->fun->absfun->name;
 		GuString analysis = entry->ccat->cnccat->labels[entry->lin_idx];
-		prob_t prob = entry->papp->fun->absfun->ep.prob;
+		
+		prob_t prob = entry->ccat->cnccat->abscat->prob +
+		              entry->papp->fun->absfun->ep.prob;
 		callback->callback(callback,
 						   lemma, analysis, prob, err);
 		if (!gu_ok(err))
diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c
index 019324449..2a92aa0c6 100644
--- a/src/runtime/java/jpgf.c
+++ b/src/runtime/java/jpgf.c
@@ -4,6 +4,7 @@
 #include <gu/mem.h>
 #include <gu/exn.h>
 #include <gu/utf8.h>
+#include <math.h>
 #include <jni.h>
 #ifndef __MINGW32__
 #include <alloca.h>
@@ -504,6 +505,7 @@ Java_org_grammaticalframework_pgf_Concr_tabularLinearize(JNIEnv* env, jobject se
 typedef struct {
 	PgfMorphoCallback fn;
 	jobject analyses;
+	prob_t prob;
 	JNIEnv* env;
 	jmethodID addId;
 	jclass an_class;
@@ -530,6 +532,8 @@ jpgf_collect_morpho(PgfMorphoCallback* self,
 	(*env)->DeleteLocalRef(env, jan);
 	(*env)->DeleteLocalRef(env, janalysis);
 	(*env)->DeleteLocalRef(env, jlemma);
+	
+	callback->prob += exp(-prob);
 }
 
 JNIEXPORT jobject JNICALL
@@ -548,7 +552,7 @@ Java_org_grammaticalframework_pgf_Concr_lookupMorpho(JNIEnv* env, jobject self,
 	
 	GuExn* err = gu_new_exn(NULL, gu_kind(type), tmp_pool);
 
-	JMorphoCallback callback = { { jpgf_collect_morpho }, analyses, env, addId, an_class, an_constrId };
+	JMorphoCallback callback = { { jpgf_collect_morpho }, analyses, 0, env, addId, an_class, an_constrId };
 	pgf_lookup_morpho(get_ref(env, self), j2gu_string(env, sentence, tmp_pool),
 	                  &callback.fn, err);
 	if (!gu_ok(err)) {
@@ -604,21 +608,10 @@ Java_org_grammaticalframework_pgf_FullFormIterator_fetchFullFormEntry
 
 	GuString form = pgf_fullform_get_string(entry);
 
-	jclass entry_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/FullFormEntry");
-	jmethodID entry_constrId = (*env)->GetMethodID(env, entry_class, "<init>", "(Ljava/lang/String;JLorg/grammaticalframework/pgf/Concr;)V");
-	jobject jentry = (*env)->NewObject(env, entry_class, entry_constrId, gu2j_string(env,form), p2l(entry), jconcr);
-
-	return jentry;
-}
-
-JNIEXPORT jobject JNICALL
-Java_org_grammaticalframework_pgf_FullFormEntry_getAnalyses
-  (JNIEnv* env, jobject self)
-{
 	jclass list_class = (*env)->FindClass(env, "java/util/ArrayList");
 	jmethodID list_constrId = (*env)->GetMethodID(env, list_class, "<init>", "()V");
 	jobject analyses = (*env)->NewObject(env, list_class, list_constrId);
-	
+
 	jmethodID addId = (*env)->GetMethodID(env, list_class, "add", "(Ljava/lang/Object;)Z");
 
 	jclass an_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/MorphoAnalysis");
@@ -627,8 +620,8 @@ Java_org_grammaticalframework_pgf_FullFormEntry_getAnalyses
 	GuPool* tmp_pool = gu_local_pool();
 	GuExn* err = gu_new_exn(NULL, gu_kind(type), tmp_pool);
 
-	JMorphoCallback callback = { { jpgf_collect_morpho }, analyses, env, addId, an_class, an_constrId };
-	pgf_fullform_get_analyses(get_ref(env, self), &callback.fn, err);	
+	JMorphoCallback callback = { { jpgf_collect_morpho }, analyses, 0, env, addId, an_class, an_constrId };
+	pgf_fullform_get_analyses(entry, &callback.fn, err);
 	if (!gu_ok(err)) {
 		if (gu_exn_caught(err) == gu_type(PgfExn)) {
 			GuString msg = (GuString) gu_exn_caught_data(err);
@@ -641,7 +634,11 @@ Java_org_grammaticalframework_pgf_FullFormEntry_getAnalyses
 
 	gu_pool_free(tmp_pool);
 
-	return analyses;
+	jclass entry_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/FullFormEntry");
+	jmethodID entry_constrId = (*env)->GetMethodID(env, entry_class, "<init>", "(Ljava/lang/String;DLjava/util/List;)V");
+	jobject jentry = (*env)->NewObject(env, entry_class, entry_constrId, gu2j_string(env,form), - log(callback.prob), analyses);
+
+	return jentry;
 }
 
 JNIEXPORT jboolean JNICALL
diff --git a/src/runtime/java/org/grammaticalframework/pgf/FullFormEntry.java b/src/runtime/java/org/grammaticalframework/pgf/FullFormEntry.java
index b0be7c342..cc67b47f2 100644
--- a/src/runtime/java/org/grammaticalframework/pgf/FullFormEntry.java
+++ b/src/runtime/java/org/grammaticalframework/pgf/FullFormEntry.java
@@ -4,18 +4,24 @@ import java.util.List;
 
 public class FullFormEntry {
 	private String form;
-	private long ref;
-	private Concr concr;
+	private double prob;
+	private List<MorphoAnalysis> analyses;
 
-	public FullFormEntry(String form, long ref, Concr concr) {
-		this.form  = form;
-		this.ref   = ref;
-		this.concr = concr;
+	public FullFormEntry(String form, double prob, List<MorphoAnalysis> analyses) {
+		this.form     = form;
+		this.prob     = prob;
+		this.analyses = analyses;
 	}
 
 	public String getForm() {
 		return form;
 	}
-	
-	public native List<MorphoAnalysis> getAnalyses();
+
+	public double getProb() {
+		return prob;
+	}
+
+	public List<MorphoAnalysis> getAnalyses() {
+		return analyses;
+	}
 }
diff --git a/src/runtime/python/pypgf.c b/src/runtime/python/pypgf.c
index 63df93217..f8abe6670 100644
--- a/src/runtime/python/pypgf.c
+++ b/src/runtime/python/pypgf.c
@@ -1515,7 +1515,7 @@ Concr_bracketedLinearize(ConcrObject* self, PyObject *args)
 	state.funcs = &pgf_bracket_lin_funcs;
 	state.stack = gu_new_buf(PyObject*, tmp_pool);
 	state.list  = list;
-	pgf_lzr_linearize(self->concr, ctree, 0, &state.funcs);
+	pgf_lzr_linearize(self->concr, ctree, 0, &state.funcs, tmp_pool);
 
 	gu_pool_free(tmp_pool);