merging mp_dev to main

AutoVerse-ai · Mar 28, 2024 · 610ff06 · 610ff06
1 parent 9c75481
commit 610ff06
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/demo/dryvr_demo/adv_thermo_demo.py b/demo/dryvr_demo/adv_thermo_demo.py
@@ -42,19 +42,8 @@ def run(meas=False):
 
 if __name__ == "__main__":
     input_code_name = "./demo/dryvr_demo/adv_thermo_controller.py"
-    args = (
-        {k: v for k, v in (p.split(":") for p in sys.argv[2].split(","))}
-        if len(sys.argv) > 1
-        else {}
-    )
-
-    dirs = "WSEN"
-    RUN_TIME = float(args.get("time", 3.5))
-    TIME_STEP = float(args.get("step", 0.05))
-    par = int(args.get("par", 8))
 
-    bench = Benchmark(sys.argv, parallel_sim_ahead=par, parallel_ver_ahead=par)
-    print(RUN_TIME, TIME_STEP, par)
+    bench = Benchmark(sys.argv)
     bench = Benchmark(sys.argv)
 
     bench.scenario.add_agent(adv_thermo_agent("test", file_name=input_code_name))

diff --git a/...ghway_brake/vehicle_controller_base_R3.py → demo/highway_brake/vehicle_controller.py b/...ghway_brake/vehicle_controller_base_R3.py → demo/highway_brake/vehicle_controller.py
diff --git a/demo/highway_brake/vehicle_pedestrian_scenario.py b/demo/highway_brake/vehicle_pedestrian_scenario.py
@@ -11,7 +11,7 @@
 if __name__ == "__main__":
     import os 
     script_dir = os.path.realpath(os.path.dirname(__file__))
-    input_code_name = os.path.join(script_dir, "vehicle_controller_base_R3.py")
+    input_code_name = os.path.join(script_dir, "vehicle_controller.py")
     vehicle = VehicleAgent('car', file_name=input_code_name)
     pedestrian = PedestrianAgent('pedestrian')