changed experiment order

AGKhalil · Aug 17, 2019 · a3b42aa · a3b42aa
1 parent f2d8229
commit a3b42aa
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/manual_cl.py b/manual_cl.py
@@ -88,9 +88,9 @@ def run_experiment(exp_num, exp_type, variants, n_cpu, step_total, exp_log, log_
                     model_names, exp_log, log_dict, drive)
 
 if __name__ == "__main__":
-    n_cpu = 8
+    n_cpu = 20
     n_step = 128
-    desired_log_pts = 10
+    desired_log_pts = 1000
     step_total = desired_log_pts * n_cpu * n_step
     leg_lengths = [i * -0.1 for i in range(1, 5)]
     goal_diss = [i * -2 for i in range(2, 6)]
@@ -106,16 +106,15 @@ def run_experiment(exp_num, exp_type, variants, n_cpu, step_total, exp_log, log_
     leg_type = 'LEG_LENGTH'
     dis_type = 'GOAL_DIS'
     exp_types = [leg_type, dis_type]
-    for i in range(5):
-        for j, exp_type in enumerate(exp_types):
-            if exp_type == leg_type:
-                variant = leg_lengths
-            elif exp_type == dis_type:
-                variant = goal_diss
-            perm_2 = list(permutations(variant, 2))
-            perm_4 = list(permutations(variant))
-            perms = perm_2 + perm_4
-            for k, perm in enumerate(perms):
-                run_experiment(str(i) + '_' + str(j) + '_' + str(
-                    k), exp_type, perm, n_cpu, step_total, exp_log, log_dict, drive, og_dir)
-                pydrive_util.clean_up('tf_save')
+    for l in range(1, 5):
+    	for i in range(5):
+    		for j, exp_type in enumerate(exp_types):
+    			if exp_type == leg_type:
+    				variant = leg_lengths
+    			elif exp_type == dis_type:
+    				variant = goal_diss
+    			perms = list(permutations(variant, l))
+    			for k, perm in enumerate(perms):
+    				run_experiment(str(l) + '_' + str(i) + '_' + str(j) + '_' + str(
+    					k), exp_type, perm, n_cpu, step_total, exp_log, log_dict, drive, og_dir)
+    				pydrive_util.clean_up('tf_save')