1 files changed, 22 insertions, 7 deletions
diff --git a/cli/app/search/json.py b/cli/app/search/json.py
index 0f6c71c..beaed3b 100644
--- a/cli/app/search/json.py
+++ b/cli/app/search/json.py
@@ -1,8 +1,9 @@
 from os.path import join
 from app.utils.file_utils import write_json
+from app.search.params import ParamsDict
 
-def save_params_latent(fp_out_dir, tag):
-  data = {
+def make_params_latent(fp_out_dir, tag):
+  return {
     "tag": tag,
     "decay_n": 2, 
     "features": True, 
@@ -43,12 +44,19 @@ def save_params_latent(fp_out_dir, tag):
     "dataset": "inverses/{}/dataset.encodings.hdf5".format(tag),
     "save_progress": True,
   }
+
+def params_latent(fp_out_dir, tag):
+  return ParamsDict(make_params_latent(fp_out_dir, tag))
+
+def save_params_latent(fp_out_dir, tag):
+  data = make_params_latent(fp_out_dir, tag)
   fp_out_fn = join(fp_out_dir, "params_latent.json")
   write_json(data, fp_out_fn)
 
-def save_params_dense(fp_out_dir, tag):
-  data = {
+def make_params_dense(fp_out_dir, tag, folder_id=None):
+  return {
     "tag": tag,
+    "folder_id": folder_id,
     "decay_n": 2, 
     "features": True, 
     "clip": 1.0, 
@@ -56,8 +64,8 @@ def save_params_dense(fp_out_dir, tag):
     "clipping": False, 
     "dataset": "inverses/{}/dataset.encodings.hdf5".format(tag),
     "inv_layer": "Generator_2/G_Z/Reshape:0", 
-    "decay_lr": True, 
-    "inv_it": 15000, 
+    "decay_lr": False, 
+    "inv_it": 6000, 
     "generator_path": "https://tfhub.dev/deepmind/biggan-512/2", 
     "attention_map_layer": "Generator_2/attention/Softmax:0",
     "pre_trained_latent": True, 
@@ -85,8 +93,15 @@ def save_params_dense(fp_out_dir, tag):
     "lambda_reg": 0.1, 
     "dist_loss": True, 
     "sample_size": 4, 
-    "dataset": "inverses/{}/dataset.encodings.dense.hdf5".format(tag),
+    "out_dataset": "inverses/{}/dataset.encodings.dense.hdf5".format(tag),
     "save_progress": True,
+    "max_batches": 0,
   }
+
+def params_dense_dict(fp_out_dir, tag, folder_id=None):
+  return ParamsDict(make_params_dense(fp_out_dir, tag, folder_id))
+
+def save_params_dense(fp_out_dir, tag, folder_id):
+  data = make_params_dense(fp_out_dir, tag, folder_id)
   fp_out_fn = join(fp_out_dir, "params_dense.json")
   write_json(data, fp_out_fn)