Merge branch 'noetic-port' of https://github.com/pmusau17/Platooning-…

…F1Tenth into noetic-port
pmusau17 · Apr 2, 2022 · 2e2a3ca · 2e2a3ca
2 parents b6deb8a + 4231cd3
commit 2e2a3ca
Show file tree

Hide file tree

Showing 25 changed files with 2,642 additions and 228 deletions.
diff --git a/src/rtreach/logs/aij_experiments/Simplex vs Control Experiments.ipynb b/src/rtreach/logs/aij_experiments/Simplex vs Control Experiments.ipynb
diff --git a/...ions_disparity_extender_2_0_0.5_cones.csv → ...isparity_extender_2_0_0.5_cones_false.csv b/...ions_disparity_extender_2_0_0.5_cones.csv → ...isparity_extender_2_0_0.5_cones_false.csv
diff --git a/...ions_disparity_extender_2_0_1.5_cones.csv → ...isparity_extender_2_0_1.5_cones_false.csv b/...ions_disparity_extender_2_0_1.5_cones.csv → ...isparity_extender_2_0_1.5_cones_false.csv
diff --git a/...ions_disparity_extender_2_5_0.5_cones.csv → ...isparity_extender_2_5_0.5_cones_false.csv b/...ions_disparity_extender_2_5_0.5_cones.csv → ...isparity_extender_2_5_0.5_cones_false.csv
diff --git a/...eriments/collisions_e2e_2_0_0.5_cones.csv → ...ts/collisions_e2e_2_0_0.5_cones_false.csv b/...eriments/collisions_e2e_2_0_0.5_cones.csv → ...ts/collisions_e2e_2_0_0.5_cones_false.csv
@@ -1,4 +1,3 @@
-track_porto, 1524, 0, racecar, porto_track, 1
 track_porto, 1524, 0, porto_track, racecar, 1
 track_porto, 1524, 0, porto_track, racecar, 4
 track_porto, 1524, 0, porto_track, racecar, 5
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_2_0_0.5_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_2_0_0.5_cones_true.csv
@@ -0,0 +1 @@
+track_porto, 1524, 0, racecar, porto_track, 1
diff --git a/...eriments/collisions_e2e_2_0_1.0_cones.csv → ...ts/collisions_e2e_2_0_1.0_cones_false.csv b/...eriments/collisions_e2e_2_0_1.0_cones.csv → ...ts/collisions_e2e_2_0_1.0_cones_false.csv
@@ -3,4 +3,3 @@ track_porto, 1524, 0, porto_track, racecar, 2
 track_porto, 1524, 0, porto_track, racecar, 3
 track_porto, 1524, 0, racecar, porto_track, 4
 track_porto, 1524, 0, porto_track, racecar, 5
-track_porto, 1524, 0, porto_track, racecar, 3
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_2_0_1.0_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_2_0_1.0_cones_true.csv
@@ -0,0 +1,5 @@
+track_porto, 1524, 0, porto_track, racecar, 1
+track_porto, 1524, 0, porto_track, racecar, 2
+track_porto, 1524, 0, porto_track, racecar, 3
+track_porto, 1524, 0, racecar, porto_track, 4
+track_porto, 1524, 0, porto_track, racecar, 5
diff --git a/...eriments/collisions_e2e_2_0_1.5_cones.csv → ...ts/collisions_e2e_2_0_1.5_cones_false.csv b/...eriments/collisions_e2e_2_0_1.5_cones.csv → ...ts/collisions_e2e_2_0_1.5_cones_false.csv
@@ -1,9 +1,5 @@
 track_porto, 1524, 0, racecar, porto_track, 1
 track_porto, 1524, 0, racecar, porto_track, 2
-track_porto, 1524, 0, porto_track, racecar, 4
-track_porto, 1524, 0, porto_track, racecar, 5
-track_porto, 1524, 0, racecar, porto_track, 1
-track_porto, 1524, 0, racecar, porto_track, 2
 track_porto, 1524, 0, porto_track, racecar, 3
 track_porto, 1524, 0, porto_track, racecar, 4
 track_porto, 1524, 0, racecar, porto_track, 5
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_2_0_1.5_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_2_0_1.5_cones_true.csv
@@ -0,0 +1,4 @@
+track_porto, 1524, 0, racecar, porto_track, 1
+track_porto, 1524, 0, racecar, porto_track, 2
+track_porto, 1524, 0, porto_track, racecar, 4
+track_porto, 1524, 0, porto_track, racecar, 5
diff --git a/...eriments/collisions_e2e_2_5_0.5_cones.csv → ...ts/collisions_e2e_2_5_0.5_cones_false.csv b/...eriments/collisions_e2e_2_5_0.5_cones.csv → ...ts/collisions_e2e_2_5_0.5_cones_false.csv
@@ -2,6 +2,3 @@ track_porto, 1524, 5, porto_track, racecar, 1
 track_porto, 1524, 5, racecar, porto_track, 2
 track_porto, 1524, 5, racecar, porto_track, 3
 track_porto, 1524, 5, porto_track, racecar, 4
-track_porto, 1524, 5, racecar, porto_track, 1
-track_porto, 1524, 5, porto_track, racecar, 4
-track_porto, 1524, 5, porto_track, racecar, 5
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_2_5_0.5_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_2_5_0.5_cones_true.csv
@@ -0,0 +1,4 @@
+track_porto, 1524, 5, porto_track, racecar, 1
+track_porto, 1524, 5, racecar, porto_track, 2
+track_porto, 1524, 5, racecar, porto_track, 3
+track_porto, 1524, 5, porto_track, racecar, 4
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_2_5_1.0_cones_false.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_2_5_1.0_cones_false.csv
@@ -0,0 +1,2 @@
+track_porto, 1524, 5, racecar2, racecar, 2
+track_porto, 1524, 5, racecar, porto_track, 3
diff --git a/...eriments/collisions_e2e_2_5_1.0_cones.csv → ...nts/collisions_e2e_2_5_1.0_cones_true.csv b/...eriments/collisions_e2e_2_5_1.0_cones.csv → ...nts/collisions_e2e_2_5_1.0_cones_true.csv
@@ -3,5 +3,3 @@ track_porto, 1524, 5, racecar, racecar2, 2
 track_porto, 1524, 5, racecar, racecar2, 3
 track_porto, 1524, 5, racecar2, racecar, 4
 track_porto, 1524, 5, racecar2, racecar, 5
-track_porto, 1524, 5, racecar2, racecar, 2
-track_porto, 1524, 5, racecar, porto_track, 3
diff --git a/...eriments/collisions_e2e_2_5_1.5_cones.csv → ...ts/collisions_e2e_2_5_1.5_cones_false.csv b/...eriments/collisions_e2e_2_5_1.5_cones.csv → ...ts/collisions_e2e_2_5_1.5_cones_false.csv
@@ -3,7 +3,3 @@ track_porto, 1524, 5, porto_track, racecar, 2
 track_porto, 1524, 5, porto_track, racecar, 3
 track_porto, 1524, 5, Cone44, racecar, 4
 track_porto, 1524, 5, racecar, porto_track, 5
-track_porto, 1524, 5, racecar, porto_track, 1
-track_porto, 1524, 5, porto_track, racecar, 3
-track_porto, 1524, 5, porto_track, racecar, 4
-track_porto, 1524, 5, porto_track, racecar, 5
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_2_5_1.5_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_2_5_1.5_cones_true.csv
@@ -0,0 +1,4 @@
+track_porto, 1524, 5, racecar, porto_track, 1
+track_porto, 1524, 5, porto_track, racecar, 3
+track_porto, 1524, 5, porto_track, racecar, 4
+track_porto, 1524, 5, porto_track, racecar, 5
diff --git a/...eriments/collisions_e2e_3_0_1.0_cones.csv → ...ts/collisions_e2e_3_0_1.0_cones_false.csv b/...eriments/collisions_e2e_3_0_1.0_cones.csv → ...ts/collisions_e2e_3_0_1.0_cones_false.csv
@@ -3,4 +3,3 @@ track_porto, 1524, 0, racecar, racecar3, 2
 track_porto, 1524, 0, racecar, racecar3, 3
 track_porto, 1524, 0, racecar, racecar2, 4
 track_porto, 1524, 0, racecar, racecar2, 5
-track_porto, 1524, 0, racecar, racecar3, 3
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_3_0_1.0_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_3_0_1.0_cones_true.csv
@@ -0,0 +1 @@
+track_porto, 1524, 0, racecar, racecar3, 3
diff --git a/...eriments/collisions_e2e_3_0_1.5_cones.csv → ...ts/collisions_e2e_3_0_1.5_cones_false.csv b/...eriments/collisions_e2e_3_0_1.5_cones.csv → ...ts/collisions_e2e_3_0_1.5_cones_false.csv
diff --git a/...eriments/collisions_e2e_3_5_0.5_cones.csv → ...ts/collisions_e2e_3_5_0.5_cones_false.csv b/...eriments/collisions_e2e_3_5_0.5_cones.csv → ...ts/collisions_e2e_3_5_0.5_cones_false.csv
diff --git a/...eriments/collisions_e2e_3_5_1.0_cones.csv → ...ts/collisions_e2e_3_5_1.0_cones_false.csv b/...eriments/collisions_e2e_3_5_1.0_cones.csv → ...ts/collisions_e2e_3_5_1.0_cones_false.csv
@@ -3,4 +3,3 @@ track_porto, 1524, 5, racecar, racecar3, 2
 track_porto, 1524, 5, racecar3, racecar, 3
 track_porto, 1524, 5, racecar, porto_track, 4
 track_porto, 1524, 5, racecar2, racecar, 5
-track_porto, 1524, 5, racecar, racecar3, 3
diff --git a/src/rtreach/logs/aij_experiments/collisions_e2e_3_5_1.0_cones_true.csv b/src/rtreach/logs/aij_experiments/collisions_e2e_3_5_1.0_cones_true.csv
@@ -0,0 +1 @@
+track_porto, 1524, 5, racecar, racecar3, 3
diff --git a/...eriments/collisions_e2e_3_5_1.5_cones.csv → ...ts/collisions_e2e_3_5_1.5_cones_false.csv b/...eriments/collisions_e2e_3_5_1.5_cones.csv → ...ts/collisions_e2e_3_5_1.5_cones_false.csv
diff --git a/src/rtreach/logs/dynamic_obstacle_uncertainty/DynamicObstacleExperiments.ipynb b/src/rtreach/logs/dynamic_obstacle_uncertainty/DynamicObstacleExperiments.ipynb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		track_porto, 1524, 5, racecar2, racecar, 2
		track_porto, 1524, 5, racecar, porto_track, 3