GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

ensure that the grammar is loaded only once

Browse Source
This commit is contained in:
kr.angelov
2013-10-07 11:26:53 +00:00
parent 872a14d7ca
commit f42bd89676
1 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
View File

@@ -29,20 +29,17 @@ public class Translator {
new Language("fr-FR", "French", "ResourceDemoFre"), new Language("fr-FR", "French", "ResourceDemoFre"),
}; };
private final Context mContext;
private Language mSourceLanguage; private Language mSourceLanguage;
private Language mTargetLanguage; private Language mTargetLanguage;
private PGF mPgf; private PGF mPGF;
private Thread mGrammarLoader;
public Translator(Context context) { public Translator(Context context) {
mContext = context; mGrammarLoader = new GrammarLoader(context);
} mGrammarLoader.start();
public Context getContext() {
return mContext;
} }
public List<Language> getAvailableSourceLanguages() { public List<Language> getAvailableSourceLanguages() {
@@ -69,46 +66,10 @@ public class Translator {
return mTargetLanguage != null ? mTargetLanguage : mLanguages[1]; return mTargetLanguage != null ? mTargetLanguage : mLanguages[1];
} }
/**
* Takes a lot of time. Must not be called on the main thread.
*/
public void init() {
ensureLoaded(mGrammar);
}
/** /**
* Takes a lot of time. Must not be called on the main thread. * Takes a lot of time. Must not be called on the main thread.
*/ */
public String translate(String input) { public String translate(String input) {
ensureLoaded(mGrammar);
return translateInternal(input);
}
private synchronized void ensureLoaded(String grammarName) {
if (mPgf != null) return;
InputStream in = null;
try {
// TODO: use PGF API to read this directly from assets
in = getContext().getAssets().open(grammarName);
Log.d(TAG, "Trying to open " + grammarName);
mPgf = PGF.readPGF(in);
} catch (FileNotFoundException e) {
Log.e(TAG, "File not found", e);
} catch (IOException e) {
Log.e(TAG, "Error loading grammar", e);
} finally {
if (in != null) {
try {
in.close();
} catch (IOException e) {
}
}
}
}
protected String translateInternal(String input) {
try { try {
Concr sourceGrammar = getConcr(getSourceLanguage().getConcrete()); Concr sourceGrammar = getConcr(getSourceLanguage().getConcrete());
Expr expr = sourceGrammar.parseBest("S", input); Expr expr = sourceGrammar.parseBest("S", input);
@@ -122,7 +83,48 @@ public class Translator {
} }
private Concr getConcr(String name) { private Concr getConcr(String name) {
return mPgf.getLanguages().get(name); return getGrammar().getLanguages().get(name);
} }
private PGF getGrammar() {
try {
mGrammarLoader.join();
} catch (InterruptedException e) {
Log.e(TAG, "Loading interrupted", e);
}
return mPGF;
}
private class GrammarLoader extends Thread {
private final Context mContext;
public GrammarLoader(Context context) {
mContext = context;
}
public void run() {
InputStream in = null;
try {
in = mContext.getAssets().open(mGrammar);
Log.d(TAG, "Trying to open " + mGrammar);
long t1 = System.currentTimeMillis();
mPGF = PGF.readPGF(in);
long t2 = System.currentTimeMillis();
Log.d(TAG, "Grammar loaded ("+(t2-t1)+" ms)");
} catch (FileNotFoundException e) {
Log.e(TAG, "File not found", e);
} catch (IOException e) {
Log.e(TAG, "Error loading grammar", e);
} finally {
if (in != null) {
try {
in.close();
} catch (IOException e) {
Log.e(TAG, "Error closing the stream", e);
}
}
}
}
}
} }