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/06/01 02:51:56 UTC
[61/94] [abbrv] incubator-joshua git commit: Updated hard-coded class
paths
Updated hard-coded class paths
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/ee2e5938
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/ee2e5938
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/ee2e5938
Branch: refs/heads/master
Commit: ee2e593868bc10efbe6fdb6d2da24beb28b206fc
Parents: abb8c51
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu May 26 18:26:19 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu May 26 18:26:19 2016 -0400
----------------------------------------------------------------------
jni/kenlm_wrap.cc | 28 ++++++++++----------
.../java/org/apache/joshua/decoder/Decoder.java | 2 +-
.../decoder/ff/tm/format/MosesFormatReader.java | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/ee2e5938/jni/kenlm_wrap.cc
----------------------------------------------------------------------
diff --git a/jni/kenlm_wrap.cc b/jni/kenlm_wrap.cc
index 64c9fe9..8c81386 100644
--- a/jni/kenlm_wrap.cc
+++ b/jni/kenlm_wrap.cc
@@ -310,7 +310,7 @@ VirtualBase *ConstructModel(const char *file_name) {
extern "C" {
-JNIEXPORT jlong JNICALL Java_joshua_decoder_ff_lm_KenLM_construct(
+JNIEXPORT jlong JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_construct(
JNIEnv *env, jclass, jstring file_name) {
const char *str = env->GetStringUTFChars(file_name, 0);
if (!str)
@@ -321,8 +321,8 @@ JNIEXPORT jlong JNICALL Java_joshua_decoder_ff_lm_KenLM_construct(
ret = ConstructModel(str);
// Get a class reference for the type pair that char
- jclass local_chart_pair = env->FindClass("joshua/decoder/ff/lm/KenLM$StateProbPair");
- UTIL_THROW_IF(!local_chart_pair, util::Exception, "Failed to find joshua/decoder/ff/lm/KenLM$StateProbPair");
+ jclass local_chart_pair = env->FindClass("org/apache/joshua/decoder/ff/lm/KenLM$StateProbPair");
+ UTIL_THROW_IF(!local_chart_pair, util::Exception, "Failed to find org/apache/joshua/decoder/ff/lm/KenLM$StateProbPair");
jclass chart_pair = (jclass)env->NewGlobalRef(local_chart_pair);
env->DeleteLocalRef(local_chart_pair);
@@ -339,30 +339,30 @@ JNIEXPORT jlong JNICALL Java_joshua_decoder_ff_lm_KenLM_construct(
return reinterpret_cast<jlong>(ret);
}
-JNIEXPORT void JNICALL Java_joshua_decoder_ff_lm_KenLM_destroy(
+JNIEXPORT void JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_destroy(
JNIEnv *env, jclass, jlong pointer) {
VirtualBase *base = reinterpret_cast<VirtualBase*>(pointer);
env->DeleteGlobalRef(base->ChartPair());
delete base;
}
-JNIEXPORT long JNICALL Java_joshua_decoder_ff_lm_KenLM_createPool(
+JNIEXPORT long JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_createPool(
JNIEnv *env, jclass) {
return reinterpret_cast<long>(new Chart());
}
-JNIEXPORT void JNICALL Java_joshua_decoder_ff_lm_KenLM_destroyPool(
+JNIEXPORT void JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_destroyPool(
JNIEnv *env, jclass, jlong pointer) {
Chart* chart = reinterpret_cast<Chart*>(pointer);
delete chart;
}
-JNIEXPORT jint JNICALL Java_joshua_decoder_ff_lm_KenLM_order(
+JNIEXPORT jint JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_order(
JNIEnv *env, jclass, jlong pointer) {
return reinterpret_cast<VirtualBase*>(pointer)->Order();
}
-JNIEXPORT jboolean JNICALL Java_joshua_decoder_ff_lm_KenLM_registerWord(
+JNIEXPORT jboolean JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_registerWord(
JNIEnv *env, jclass, jlong pointer, jstring word, jint id) {
const char *str = env->GetStringUTFChars(word, 0);
if (!str)
@@ -378,7 +378,7 @@ JNIEXPORT jboolean JNICALL Java_joshua_decoder_ff_lm_KenLM_registerWord(
return ret;
}
-JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_prob(
+JNIEXPORT jfloat JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_prob(
JNIEnv *env, jclass, jlong pointer, jintArray arr) {
jint length = env->GetArrayLength(arr);
if (length <= 0)
@@ -391,7 +391,7 @@ JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_prob(
values + length);
}
-JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_probForString(
+JNIEXPORT jfloat JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_probForString(
JNIEnv *env, jclass, jlong pointer, jobjectArray arr) {
jint length = env->GetArrayLength(arr);
if (length <= 0)
@@ -408,7 +408,7 @@ JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_probForString(
values + length);
}
-JNIEXPORT jboolean JNICALL Java_joshua_decoder_ff_lm_KenLM_isKnownWord(
+JNIEXPORT jboolean JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_isKnownWord(
JNIEnv *env, jclass, jlong pointer, jstring word) {
const char *str = env->GetStringUTFChars(word, 0);
if (!str)
@@ -421,7 +421,7 @@ JNIEXPORT jboolean JNICALL Java_joshua_decoder_ff_lm_KenLM_isKnownWord(
return ret;
}
-JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_probString(
+JNIEXPORT jfloat JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_probString(
JNIEnv *env, jclass, jlong pointer, jintArray arr, jint start) {
jint length = env->GetArrayLength(arr);
if (length <= start)
@@ -434,7 +434,7 @@ JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_probString(
values + length, start);
}
-JNIEXPORT jobject JNICALL Java_joshua_decoder_ff_lm_KenLM_probRule(
+JNIEXPORT jobject JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_probRule(
JNIEnv *env, jclass, jlong pointer, jlong chartPtr, jlongArray arr) {
jint length = env->GetArrayLength(arr);
// GCC only.
@@ -453,7 +453,7 @@ JNIEXPORT jobject JNICALL Java_joshua_decoder_ff_lm_KenLM_probRule(
return env->NewObject(base->ChartPair(), base->ChartPairInit(), (long)outStatePtr, prob);
}
-JNIEXPORT jfloat JNICALL Java_joshua_decoder_ff_lm_KenLM_estimateRule(
+JNIEXPORT jfloat JNICALL Java_org_apache_joshua_decoder_ff_lm_KenLM_estimateRule(
JNIEnv *env, jclass, jlong pointer, jlongArray arr) {
jint length = env->GetArrayLength(arr);
// GCC only.
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/ee2e5938/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index d13bf42..8535b11 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -956,7 +956,7 @@ public class Decoder {
private Class<?> getClass(String featureName) {
Class<?> clas = null;
- String[] packages = { "joshua.decoder.ff", "joshua.decoder.ff.lm", "joshua.decoder.ff.phrase" };
+ String[] packages = { "org.apache.joshua.decoder.ff", "org.apache.joshua.decoder.ff.lm", "org.apache.joshua.decoder.ff.phrase" };
for (String path : packages) {
try {
clas = Class.forName(String.format("%s.%s", path, featureName));
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/ee2e5938/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java b/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
index fcab917..ad42f0c 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
@@ -35,7 +35,7 @@ import org.apache.joshua.util.io.LineReader;
* There is also a tool to convert the grammars directly, so that they can be suitably packed. Usage:
*
* <pre>
- * cat PHRASE_TABLE | java -cp $JOSHUA/class joshua.decoder.ff.tm.format.MosesFormatReader > grammar
+ * cat PHRASE_TABLE | java -cp $JOSHUA/target/classes org.apache.joshua.decoder.ff.tm.format.MosesFormatReader > grammar
* </pre>
*
* @author Matt Post <po...@cs.jhu.edu>