msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

filter out identical duplicated translations from the Android UI

Browse Source
This commit is contained in:
kr.angelov
2014-06-18 09:17:33 +00:00
parent 97b0294208
commit 447faf108e
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java
View File

@@ -171,10 +171,10 @@ public class AlternativesActivity extends ListActivity {
if (item instanceof MorphoAnalysis) {
final String lemma = ((MorphoAnalysis) item).getLemma();
String phrase = mTranslator.generateLexiconEntry(lemma);
descView.setText(phrase);
convertView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {

65
src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
View File

@@ -1,7 +1,9 @@
package org.grammaticalframework.ui.android;
import java.io.Serializable;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import android.app.Activity;
import android.content.Intent;
@@ -286,25 +288,6 @@ public class MainActivity extends Activity {
private void handleSpeechInput(final String input) {
final List<MorphoAnalysis> list = mTranslator.lookupMorpho(input);
// filter out duplicates
int i = 0;
while (i < list.size()) {
MorphoAnalysis an = list.get(i);
boolean found = false;
for (int j = 0; j < i; j++) {
if (list.get(j).getLemma().equals(an.getLemma())) {
found = true;
break;
}
}
if (found)
list.remove(i);
else {
i++;
}
}
mConversationView.updateLastUtterance(input);
new AsyncTask<Void,Void,Pair<String,List<ExprProb>>>() {
@Override
@@ -320,7 +303,49 @@ public class MainActivity extends Activity {
@Override
protected void onPostExecute(Pair<String,List<ExprProb>> res) {
String text = res.first;
Object alts = (list.size() == 0) ? res.second : list;
List<ExprProb> transl = res.second;
Object alts = null;
// filter out duplicates
int i = 0;
if (list.size() > 0) {
while (i < list.size()) {
MorphoAnalysis an = list.get(i);
boolean found = false;
for (int j = 0; j < i; j++) {
if (list.get(j).getLemma().equals(an.getLemma())) {
found = true;
break;
}
}
if (found)
list.remove(i);
else {
i++;
}
}
alts = list;
} else {
Set<String> strings = new HashSet<String>();
while (i < transl.size()) {
String s = mTranslator.linearize(transl.get(i).getExpr());
if (s.length() > 0 &&
(s.charAt(0) == '%' || s.charAt(0) == '*' || s.charAt(0) == '+')) {
s = s.substring(2);
}
if (strings.contains(s))
transl.remove(i);
else {
strings.add(s);
i++;
}
}
alts = transl;
}
if (DBG) Log.d(TAG, "Speaking: " + res.first);
CharSequence text2 =
mConversationView.addSecondPersonUtterance(input, text, alts);