syncscript and testall adaption

syncscript.sh

@@ -19,13 +19,14 @@ experiment_log_dir="${2}"
 num_evaluations=$3
 shield_value=$6
 prism_config=$7
-prob_next=$8
-prob_direct=$9
-prob_forward="${10}"
+prob_displacement=$8
+prob_intended=$9
+prob_turn_displacement="${10}"
+prop_turn_intended="${12}"
 shield_comparision="${11}"
 NUM_GPUS="1"
 
-exp_name="${commit_message}-${datetime}-env:${env}-sh:${shielding}-value:${shield_value}-comp:${shield_comparision}-prob:${prob_forward}"
+exp_name="${commit_message}-${datetime}-env:${env}-sh:${shielding}-value:${shield_value}-comp:${shield_comparision}-prob:${prob_intended}"
 experiment_log_dir="${2}/${exp_name}"
 
 
@@ -51,9 +52,10 @@ srun -w $gpu python3 examples/shields/rl/15_train_eval_tune.py --env $4 \
      --grid_to_prism_binary_path $MINIGRID_BINARY \
      --shield_comparision $6  \
      --prism_config $7  \
-     --prob_next $8 \
-     --prob_direct $9 \
-     --prob_forward "${10}" \
+     --prob_displacement $8 \
+     --prob_intended $9 \
+     --prob_turn_displacement "${10}" \
+     --prop_turn_intended "${12}" \
      --shield_comparision $6 \
      --shield_value "${11}" \
      --num_gpus ${NUM_GPUS} &

testall.py

@@ -13,11 +13,11 @@ slippery_configs=[f"{abs_path}/slippery_prob_075.yaml",
                   # f"{abs_path}/slippery_prob_1.yaml"
                   ]
 
-slippery_probs=[[0.125, 0.25, 0.75], # 0.75
+slippery_probs=[[0.25, 0.75], # 0.75
                 #[0.1, 0.2, 0.8],     # 0.8
-                [0.075,0.15,0.85],   # 0.85
+                [0.15,0.85],   # 0.85
                 #[0.05, 0.1, 0.9],    # 0.9
-                [0.025,0.05, 0.95],  # 0.95
+                [0.05, 0.95],  # 0.95
                 # [0.01, 0.02, 0.98],  # 0.98
                 # [0.005,0.01, 0.99],  # 0.99
                 #[0, 0, 1]           # 1
@@ -42,12 +42,12 @@ for shield_value in shield_values:
   for sh_comp in comparison_type:
     for probs, config in prob_confs:
       command = f"echo \"Running experiment with shielding full, sh_value:{probs[2]}, sh_comp:{sh_comp}, probvalues:{probs}, config{config}\""    
-      execute_command = f'./syncscript.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} full {sh_comp} {config} {probs[0]} {probs[1]} {probs[2]} {shield_value}'
+      execute_command = f'./syncscript.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} full {sh_comp} {config} {probs[0]} {probs[1]} {0} {shield_value} {1}'
       subprocess.call(execute_command, shell=True)#.decode("utf-8").split('\n')
   
 # loop for unshielded runs
 for probs, config in prob_confs:
   command = f"echo \"Running experiment with shielding none, sh_value:{probs[2]}, sh_comp:{sh_comp}, probvalues:{probs}, config{config}\""    
-  execute_command = f'./syncscript.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} none {sh_comp} {config} {probs[0]} {probs[1]} {probs[2]} {shield_value}'
+  execute_command = f'./syncscript.sh {NUM_TIMESTEPS} {LOGDIR} {"70"} {ENV} none {sh_comp} {config} {probs[0]} {probs[1]} {0} {shield_value} {1}'
   subprocess.call(execute_command, shell=True)#.decode("utf-8").split('\n')