Merge branch 'main' into 116-update-cuda-and-requirements

.gitignore

@@ -11,3 +11,5 @@ code/output
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
+
+*.tsv

build/docker-compose.yml

@@ -26,6 +26,10 @@ services:
     # image: carlasim/carla:0.9.14
     image: ghcr.io/una-auxme/paf23:leaderboard-2.0
     init: true
+    deploy:
+      resources:
+        limits:
+          memory: 16G
     expose:
       - 2000
       - 2001
@@ -57,8 +61,9 @@ services:
     tty: true
     shm_size: 2gb
     #command: bash -c "sleep 10 && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/opt/leaderboard/leaderboard/autoagents/npc_agent.py --host=carla-simulator --track=SENSORS"
-    command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch"
-    #command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/workspace/code/agent/src/agent/agent.py --host=carla-simulator --track=MAP"
+    #command: bash -c "sleep 10 && roslaunch agent/launch/dev.launch"
+    command: bash -c "sleep 10 && sudo chown -R carla:carla ../code/ && sudo chmod -R a+w ../code/ && python3 /opt/leaderboard/leaderboard/leaderboard_evaluator.py --debug=0 --routes=/opt/leaderboard/data/routes_devtest.xml --agent=/workspace/code/agent/src/agent/agent.py --host=carla-simulator --track=MAP"
+
     logging:
       driver: "local"
     environment:

code/acting/launch/acting.launch

@@ -1,4 +1,4 @@
-<!-- TODO: Insert components of acting component-->
+<!---->
 <launch>
     <arg name="role_name" default="hero" />
     <arg name="control_loop_rate" default="0.1" />
@@ -28,33 +28,31 @@
         <param name="control_loop_rate" value="$(arg control_loop_rate)" />
         <param name="role_name" value="$(arg role_name)" />
     </node>
-    
-    <node pkg="acting" type="DummyTrajectoryPublisher.py" name="DummyTrajectoryPublisher" output="screen">
-        <param name="control_loop_rate" value="1" />
+
+    <!--node pkg="acting" type="Acting_DebuggerNode.py" name="Acting_Debugger" output="screen">
+        <param name="control_loop_rate" value="0.05" />
         <param name="role_name" value="$(arg role_name)" />
-    </node>
-
+    </node-->
 
     <node pkg="acting" type="MainFramePublisher.py" name="MainFramePublisher" output="screen">
         <param name="control_loop_rate" value="0.05" />
         <param name="role_name" value="$(arg role_name)" />
     </node>
 
-    <!--node pkg="acting" type="DummyTrajectorySub.py" name="DummyTrajectorySub" output="screen">
-        <param name="control_loop_rate" value="1" />
-        <param name="role_name" value="$(arg role_name)" />
-    </node-->
-
-   <!--node pkg="acting" type="acc_distance_publisher_dummy.py" name="AccDistancePublisherDummy" output="screen">
+    <node pkg="acting" type="acc_distance_publisher_dummy.py" name="AccDistancePublisherDummy" output="screen">
         <param name="role_name" value="$(arg role_name)" />
-        <param name="enabled" value="True" /> <!set to True to publish dummy velocities for testing>
-   </node-->
+        <param name="enabled" value="False" /> <!-- set to True to publish dummy velocities for testing-->
+    </node>
 
     <node pkg="acting" type="acc.py" name="Acc" output="screen">
         <param name="control_loop_rate" value="$(arg control_loop_rate)" />
         <param name="role_name" value="$(arg role_name)" />
     </node>
 
-    <!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot" args="/carla/hero/Speed /paf/hero/stanley_debug/cross_err" -->
-
+    <!-- Some plot nodes for debugging speed/steering etc. -->
+    <!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot_speed" args="/carla/hero/Speed /paf/hero/max_velocity /paf/hero/throttle /paf/hero/brake"/-->
+    <!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot_steering" args="/paf/hero/pure_pursuit_steer /carla/hero/vehicle_control_cmd/steer /paf/hero/pure_p_debug/l_distance"/-->
+    <!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot_trajectoryfollowing" args="/paf/hero/current_x /paf/hero/current_target_wp"/-->
+    <!--node pkg="rqt_plot" type="rqt_plot" output="screen" name="rqt_plot_CONTROLLER" args="/paf/hero/controller"/-->
+
 </launch>