save iterations preference

naman14 · May 14, 2016 · 1670633 · 1670633
1 parent 1bd5f2a
commit 1670633
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 4 deletions.
diff --git a/app/src/main/java/com/naman14/arcade/ArcadeService.java b/app/src/main/java/com/naman14/arcade/ArcadeService.java
@@ -32,6 +32,7 @@ protected void onHandleIntent(Intent intent) {
         builder.setProtoFIle(ArcadeUtils.getProtoPath());
         builder.setImageSize(Integer.parseInt(preferences.getString("preference_image_size", "128")));
         builder.setIterations(Integer.parseInt(preferences.getString("preference_iterations", "15")));
+        builder.setSaveIterations(Integer.parseInt(preferences.getString("preference_save_iter", "5")));
         builder.setContentWeight(Integer.parseInt(preferences.getString("preference_content_weight", "20")));
         builder.setStyleWeight(Integer.parseInt(preferences.getString("preference_style_weight", "200")));
         Arcade arcade = builder.build();

diff --git a/app/src/main/java/com/naman14/arcade/SettingsActivity.java b/app/src/main/java/com/naman14/arcade/SettingsActivity.java
@@ -49,6 +49,7 @@ public void onCreate(Bundle savedInstanceState) {
             preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
             preferences.registerOnSharedPreferenceChangeListener(this);
             findPreference("preference_iterations").setSummary(preferences.getString("preference_iterations", "15"));
+            findPreference("preference_save_iter").setSummary(preferences.getString("preference_save_iter", "5"));
             findPreference("preference_style_weight").setSummary(preferences.getString("preference_style_weight", "200"));
             findPreference("preference_content_weight").setSummary(preferences.getString("preference_content_weight", "20"));
 
@@ -61,6 +62,7 @@ public boolean onPreferenceClick(Preference preference) {
                     preferences.edit().putString("preference_image_size", "128").apply();
                     preferences.edit().putBoolean("preference_logs", false).apply();
                     findPreference("preference_iterations").setSummary(preferences.getString("preference_iterations", "15"));
+                    findPreference("preference_save_iter").setSummary(preferences.getString("preference_save_iter", "5"));
                     findPreference("preference_style_weight").setSummary(preferences.getString("preference_style_weight", "200"));
                     findPreference("preference_content_weight").setSummary(preferences.getString("preference_content_weight", "20"));
                     findPreference("preference_image_size").setSummary(preferences.getString("preference_image_size", "128"));
@@ -73,11 +75,9 @@ public boolean onPreferenceClick(Preference preference) {
 
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            Log.d("lol", "b;bfw;");
             Preference p = findPreference(key);
             if (p instanceof EditTextPreference) {
                 EditTextPreference editTextPref = (EditTextPreference) p;
-                Log.d("lodsbc", editTextPref.getText());
                 p.setSummary(editTextPref.getText());
             } else if (p instanceof ListPreference) {
                 ListPreference listPref = (ListPreference) p;

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -17,6 +17,13 @@
             android:key="preference_iterations"
             android:title="Number of iterations" />
 
+        <EditTextPreference
+            android:defaultValue="5"
+            android:hint="0 for saving only final image"
+            android:inputType="numberSigned"
+            android:key="preference_save_iter"
+            android:title="Save image after iterations" />
+
         <EditTextPreference
             android:defaultValue="200"
             android:inputType="numberSigned"

diff --git a/arcade/src/main/assets/neural_style.lua b/arcade/src/main/assets/neural_style.lua
@@ -283,7 +283,8 @@ function stylize(params)
             end
             updateProgress("Saving image")
             image.save(filename, disp)
---            onImageSaved(filename, isFinal)
+            updateProgress("Image saved in %s", filename)
+            --            onImageSaved(filename, isFinal)
         end
     end
 

diff --git a/arcade/src/main/java/com/naman14/arcade/library/Arcade.java b/arcade/src/main/java/com/naman14/arcade/library/Arcade.java
@@ -1,5 +1,6 @@
 package com.naman14.arcade.library;
 
+import android.os.Environment;
 import android.util.Log;
 import android.content.res.AssetManager;
 import android.content.pm.ApplicationInfo;
@@ -9,6 +10,8 @@
 import com.naman14.arcade.library.listeners.IterationListener;
 import com.naman14.arcade.library.listeners.ProgressListener;
 
+import java.io.File;
+
 public class Arcade {
 
     AssetManager assetManager;
@@ -37,6 +40,11 @@ public void initialize() {
     }
 
     public void stylize() {
+        File myDir = new File(Environment.getExternalStorageDirectory() + "/Arcade/outputs");
+
+        if (!myDir.exists())
+            myDir.mkdirs();
+
         stylize(builder.styleimage, builder.contentImage, builder.outputImage, builder.gpu, builder.iterations, builder.imageSize,
                 builder.optimizer, builder.modelFile, builder.protoFIle, builder.backend, builder.styleScale, builder.styleBlendWeights,
                 builder.styleLayers, builder.contentLayers, builder.pooling, builder.tvWeight, builder.styleWeight, builder.contentWeight,

diff --git a/arcade/src/main/java/com/naman14/arcade/library/ArcadeBuilder.java b/arcade/src/main/java/com/naman14/arcade/library/ArcadeBuilder.java
@@ -40,7 +40,7 @@ public ArcadeBuilder(Context context) {
         this.gpu = -1;
         this.styleimage = "/sdcard/examples/inputs/starry_night_crop.png";
         this.contentImage = "/sdcard/examples/outputs/golden_gate_scream.png";
-        this.outputImage = "/storage/emulated/0/Arcade/output.png";
+        this.outputImage = "/storage/emulated/0/Arcade/outputs/output.png";
         this.iterations = 40;
         this.backend = "nn";
         this.optimizer = "adam";

diff --git a/arcade/src/main/jni/arcade.cpp b/arcade/src/main/jni/arcade.cpp
@@ -26,6 +26,7 @@ static void onProgressUpdate(lua_State *L) {
     jstring logString = globalEnv->NewStringUTF(log);
     globalEnv->CallStaticVoidMethod(clazz, onProgressUpdate, logString);
     globalEnv->DeleteLocalRef(logString);
+    globalEnv->DeleteLocalRef(clazz);
 
 }
 
@@ -46,6 +47,7 @@ static void onImageSaved(lua_State *L) {
     jstring pathString = globalEnv->NewStringUTF(path);
     globalEnv->CallStaticVoidMethod(clazz, onImageSaved, pathString, isFinal);
     globalEnv->DeleteLocalRef(pathString);
+    globalEnv->DeleteLocalRef(clazz);
 
 }
 
@@ -62,6 +64,7 @@ static void onIterationUpdate(lua_State *L) {
                                                                "(II)V");
 
     globalEnv->CallStaticVoidMethod(clazz, onIterationUpdate, currentIteration, totalIterations);
+    globalEnv->DeleteLocalRef(clazz);
 
 }