data processing

ethz-coss · Jan 25, 2023 · ee50ea5 · ee50ea5
1 parent 251265e
commit ee50ea5
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/figs/11_11.pdf b/figs/11_11.pdf
diff --git a/figs/11_6.pdf b/figs/11_6.pdf
diff --git a/figs/22_11.pdf b/figs/22_11.pdf
diff --git a/figs/22_22.pdf b/figs/22_22.pdf
diff --git a/figs/32_16.pdf b/figs/32_16.pdf
diff --git a/figs/32_32.pdf b/figs/32_32.pdf
diff --git a/intersection_switching/data_process.py b/intersection_switching/data_process.py
@@ -99,14 +99,14 @@
                 #     print("wait: ", avg_wait, var_wait)
                 #     print("stops: ", avg_stops, var_stops)
 
-            if vote == [0.0, 0.5, 0.5]:
-                print(vote, traffic[0], traffic[1])
-                print("wait: ", np.mean(avg_total_waits), np.std(avg_total_waits))
-                print("stops: ", np.mean(avg_total_stops), np.std(avg_total_stops))
-                print("speeds: ", np.mean(avg_total_speeds), np.std(avg_total_speeds))
-
-                plt.scatter(avg_total_waits, avg_total_stops)
-                plt.show()
+            # if vote == [0.0, 0.5, 0.5]:
+            #     print(vote, traffic[0], traffic[1])
+            #     print("wait: ", np.mean(avg_total_waits), np.std(avg_total_waits))
+            #     print("stops: ", np.mean(avg_total_stops), np.std(avg_total_stops))
+            #     print("speeds: ", np.mean(avg_total_speeds), np.std(avg_total_speeds))
+
+            #     plt.scatter(avg_total_waits, avg_total_stops)
+            #     plt.show()
 
 
             result = [np.mean(avg_total_speeds), np.mean(avg_total_stops), np.mean(avg_total_waits)]

diff --git a/intersection_switching/run_vote.py b/intersection_switching/run_vote.py
@@ -35,7 +35,7 @@
 for vote in vote_types:
     for traffic in traffic_conditions:
         for i in range(100):
-            os.system("python runner.py --sim_config '../scenarios/loop_intersection/rings.config' --num_sim_steps 3600 --eps_start 0 --eps_end 0 --lr 0.0005 --mode vote --agents_type learning --num_episodes 1 --replay False --mfd False --n_vehs " + str(traffic[0]) + " " + str(traffic[1]) + " --vote_weights " + str(vote[0]) + " " + str(vote[1]) + " " + str(vote[2]) + " --vote_type majority --path '../runs/proportional_100/'")
+            os.system("python runner.py --sim_config '../scenarios/loop_intersection/rings.config' --num_sim_steps 3600 --eps_start 0 --eps_end 0 --lr 0.0005 --mode vote --agents_type learning --num_episodes 1 --replay False --mfd False --n_vehs " + str(traffic[0]) + " " + str(traffic[1]) + " --vote_weights " + str(vote[0]) + " " + str(vote[1]) + " " + str(vote[2]) + " --vote_type proportional --path '../runs/proportional_100/'")
 
 
         # os.system("sbatch -n 8 --wrap \"python runner.py --sim_config '../scenarios/loop_intersection/rings.config' --num_sim_steps 3600 --eps_start 0 --lr 0.0005 --mode vote --agents_type learning --num_episodes 1 --replay True --mfd False " + " --n_vehs " + str(traffic[0]) + " " + str(traffic[1]) + " --vote_weights " + vote_weights[0] + " " + vote_weights[1] + " " + vote_weights[2] + " " + "\"" )