Skip to content

Commit

Permalink
fix: pr comments
Browse files Browse the repository at this point in the history
  • Loading branch information
robertik10 committed Dec 4, 2023
1 parent 2d7a574 commit 6ceee18
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions build/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ 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:
Expand Down
2 changes: 1 addition & 1 deletion code/agent/config/rviz_config.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Visualization Manager:
Offset:
X: 0
Y: 0
Z: 0 #39
Z: 39
Pose Color: 255; 85; 255
Pose Style: None
Queue Size: 10
Expand Down
17 changes: 12 additions & 5 deletions code/perception/src/dataset_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,26 +246,33 @@ def create_argparse():
help='set up an empty world and spawn ego vehicle',
default=False
)
argparser.add_argument(
'--town',
metavar='T',
default='Town12',
help='town to load'
)
return argparser


if __name__ == '__main__':
towns = ["Town01", "Town02", "Town03", "Town04", "Town05", "Town06",
"Town07", "Town10", "Town11", "Town12"]
town = towns[2]
towns = {"Town01", "Town02", "Town03", "Town04", "Town05", "Town06",
"Town07", "Town10", "Town11", "Town12"}
argparser = create_argparse()
args = argparser.parse_args()
town = args.town
output_dir = args.output_dir
host = args.host
port = args.port
use_empty_world = args.use_empty_world

client = carla.Client(host, port)
client.set_timeout(30)
world = client.load_world(town)
world = client.load_world(town) if use_empty_world else client.get_world()
world.wait_for_tick()

output_dir = os.path.join(output_dir, town[-2:])
output_dir = os.path.join(output_dir, world.get_map().name[-2:])
print("Saving images to {}".format(output_dir))

if use_empty_world:
ego_vehicle = setup_empty_world(client)
Expand Down
1 change: 0 additions & 1 deletion code/perception/src/sensor_filter_debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from xml.etree import ElementTree as eTree
# import carl____a remove ___ to use
# import rospy
# from carla_msgs.msg import CarlaLo

GPS_RUNNING_AVG_ARGS: int = 10

Expand Down
1 change: 0 additions & 1 deletion code/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ scipy==1.10.0
xmltodict==0.13.0
py-trees==2.1.6
numpy==1.23.5
pymap3d==3.0.0
1 change: 0 additions & 1 deletion doc/06_perception/11_kalman_filter.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ The measurement matrix H is defined as:
[0, 0, 0, 0, 0, 1]
The process covariance matrix Q is defined as:
Q = np.diag([0.005, 0.005, 0.001, 0.0001])

```

Then 3 Steps are run in the frequency of the `control_loop_rate`:
Expand Down

0 comments on commit 6ceee18

Please sign in to comment.