include more packages in env and minor changes

Hippogriff · Mar 20, 2018 · 54b366c · 54b366c
1 parent f0cf9b5
commit 54b366c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/environment.yml b/environment.yml
@@ -15,3 +15,6 @@ dependencies:
   - scikit-image
   - six
   - pillow
+  - configobj
+  - argparse=1.4
+  - json
diff --git a/test_synthetic.py b/test_synthetic.py
@@ -40,8 +40,6 @@
 
 generator = MixedGenerateData(data_labels_paths=data_labels_paths,
                               batch_size=config.batch_size,
-                              train_size=config.train_size,
-                              test_size=config.test_size,
                               canvas_shape=config.canvas_shape)
 
 imitate_net = ImitateJoint(hd_sz=config.hidden_size,
@@ -119,7 +117,7 @@
 
             programs_tar[jit] += targ_prog
             programs_pred[jit] += pred_prog
-            distance = chamfer(target_images, pred_images) * 64 * 0.5 / 2
+            distance = chamfer(target_images, pred_images)
             total_CD += np.sum(distance)
 
     over_all_CD[jit] = total_CD / total_size
@@ -137,5 +135,5 @@
 with open("trained_models/results/{}/{}".format(model_name, "tar_prog.org"), 'w') as outfile:
     json.dump(programs_tar, outfile)
 
-with open("trained_models/results/{}/{}".format(model_name, "all_metrices.org"), 'w') as outfile:
+with open("trained_models/results/{}/{}".format(model_name, "top1_metrices.org"), 'w') as outfile:
     json.dump(metrics, outfile)