working on GF integration (iii)

android/Pictogram/app/src/fernandoFlavor/java/com/yottacode/pictogrammar/Translate.java

@@ -12,17 +12,21 @@ package com.yottacode.pictogrammar;
 
 
     import android.app.ProgressDialog;
     import android.app.ProgressDialog;
     import android.os.AsyncTask;
     import android.os.AsyncTask;
+    import android.widget.Toast;
 
 
     import java.io.FileNotFoundException;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.InputStream;
     import java.util.Map;
     import java.util.Map;
+    import java.util.Vector;
 
 
 
 
     import org.grammaticalframework.sg.SG;
     import org.grammaticalframework.sg.SG;
 
 
     import org.grammaticalframework.pgf.*;
     import org.grammaticalframework.pgf.*;
 
 
+    import com.yottacode.pictogram.dao.PCBDBHelper;
+    import com.yottacode.pictogram.tools.PCBcontext;
     import com.yottacode.pictogram.tts.TTSHelper;
     import com.yottacode.pictogram.tts.TTSHelper;
     import com.yottacode.pictogram.R;
     import com.yottacode.pictogram.R;
 
 
@@ -30,7 +34,7 @@ package com.yottacode.pictogrammar;
 public class Translate extends Activity
 public class Translate extends Activity
     {
     {
         private ArrayAdapter mArrayAdapter;
         private ArrayAdapter mArrayAdapter;
-        private PGF mPGF;
+         private PGF mPGF;
         private TTSHelper tts;
         private TTSHelper tts;
         private GrammarLoader mGrammarLoader;
         private GrammarLoader mGrammarLoader;
         private ConcrLoader mSourceLoader;
         private ConcrLoader mSourceLoader;
@@ -190,18 +194,22 @@ public class Translate extends Activity
 
 
                         int i=0;
                         int i=0;
 
 
-                        for (ExprProb ep : eng.parse(mPGF.getStartCat(), "I want chips")) {
+                        for (ExprProb ep : eng.parse(mPGF.getStartCat(), "I want salty chips")) {
                             if (i++>5) break;
                             if (i++>5) break;
-                            Log.i(this.getClass().getSimpleName(), "[" + ep.getProb() + "] " + ep.getExpr());
+                            Log.e(this.getClass().getSimpleName(), "Next: [" + ep.getProb() + "] " + ep.getExpr());
                         }
                         }
-i=0;
-                        for (TokenProb tk : eng.complete(mPGF.getStartCat(), "","I want")) {
-                            if (i++>5) break;
+                        i=0;
+                        java.util.Vector<Integer> categories=new Vector<>();
+                        for (TokenProb tk : eng.complete(mPGF.getStartCat(),"I want salty","")) {
+                            String translation=tk.getToken();
+
+                            Log.i(this.getClass().getSimpleName(), "Next: " + translation );
 
 
-                            Log.i(this.getClass().getSimpleName(), "Next: " + tk.getToken() + ". Prob. " + tk.getProb());
                         }
                         }
+
+
                     } catch (ParseError e) {
                     } catch (ParseError e) {
-                        Log.i(this.getClass().getSimpleName(),"Parsing failed at token \""+e.getToken()+"\"");
+                        Log.e(this.getClass().getSimpleName(),"Parsing failed at token \""+e.getToken()+"\"");
                     }
                     }
 
 
                 } catch (FileNotFoundException e) {
                 } catch (FileNotFoundException e) {

android/Pictogram/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
         jcenter()
     }
     }
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         // in the individual module build.gradle files

android/Pictogram/gradle/wrapper/gradle-wrapper.properties

-#Wed Apr 10 15:27:10 PDT 2013
+#Thu May 26 14:03:38 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip