Skip to content

Commit

Permalink
Merge pull request #312 from una-auxme/283-feature-rename-repository-…
Browse files Browse the repository at this point in the history
…to-paf-instead-of-paf23

Updated all occurences of name paf
  • Loading branch information
JulianTrommer authored Oct 7, 2024
2 parents ca15e73 + 17ed54a commit 69f79be
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Praktikum Autonomes Fahren 2023 - PAF23
# Praktikum Autonomes Fahren - PAF

This repository contains the source code for the "Praktikum Autonomes Fahren" at the Chair of Mechatronics from the University of Augsburg in the winter semester of 2023/2024.
The goal of the project is to develop a self-driving car that can navigate through a simulated environment.
Expand Down
2 changes: 1 addition & 1 deletion build/config-comlipy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# comlipy config file (commit naming)
global:
help: 'Help: https://github.com/ll7/paf22/blob/main/doc/developement/commit.md'
help: 'Help: https://github.com/una-auxme/paf/blob/main/doc/02_development/03_commit.md'

rules:
scope-min-length:
Expand Down
2 changes: 1 addition & 1 deletion build/docker-compose_cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include:

services:
agent:
image: ghcr.io/una-auxme/paf23:${AGENT_VERSION:-latest}
image: ghcr.io/una-auxme/paf:${AGENT_VERSION:-latest}
init: true
tty: true
logging:
Expand Down
2 changes: 1 addition & 1 deletion build/docker/agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN apt-get install wget unzip

# Download Carla PythonAPI (alternative to getting it from the Carla-Image, which is commented out above)
# If the PythonAPI/Carla version changes, either update the link, or refer to the comment at the top of this file.
RUN wget https://github.com/una-auxme/paf23/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip -O PythonAPI.zip \
RUN wget https://github.com/una-auxme/paf/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip -O PythonAPI.zip \
&& unzip PythonAPI.zip \
&& rm PythonAPI.zip \
&& mkdir -p /opt/carla \
Expand Down
2 changes: 1 addition & 1 deletion build/docker/agent/Dockerfile_Submission
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN apt-get update \
# install dependencies for libgit2 and Carla PythonAPI
RUN apt-get install wget unzip

RUN wget https://github.com/una-auxme/paf23/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip -O PythonAPI.zip \
RUN wget https://github.com/una-auxme/paf/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip -O PythonAPI.zip \
&& unzip PythonAPI.zip \
&& rm PythonAPI.zip \
&& mkdir -p /opt/carla \
Expand Down
6 changes: 3 additions & 3 deletions code/agent/src/agent/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@


def get_entry_point():
return 'PAF22Agent'
return 'PAFAgent'


class PAF22Agent(ROS1Agent):
class PAFAgent(ROS1Agent):

def setup(self, path_to_conf_file):
self.track = Track.MAP
Expand Down Expand Up @@ -88,4 +88,4 @@ def sensors(self):
return sensors

def destroy(self):
super(PAF22Agent, self).destroy()
super(PAFAgent, self).destroy()
6 changes: 3 additions & 3 deletions code/perception/src/position_heading_filter_debug_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def __init__(self):
self.control_loop_rate = self.get_param("control_loop_rate", "0.05")

# carla attributes
CARLA_HOST = os.environ.get('CARLA_HOST', 'paf23-carla-simulator-1')
CARLA_HOST = os.environ.get('CARLA_HOST', 'paf-carla-simulator-1')
CARLA_PORT = int(os.environ.get('CARLA_PORT', '2000'))
self.client = carla.Client(CARLA_HOST, CARLA_PORT)
self.world = None
Expand Down Expand Up @@ -189,7 +189,7 @@ def save_position_data(self):
"""
This method saves the current location errors in a csv file.
in the folders of
paf23/doc/06_perception/00_Experiments/kalman_datasets
paf/doc/06_perception/00_Experiments/kalman_datasets
It does this for a limited amount of time.
"""
# stop saving data when max is reached
Expand Down Expand Up @@ -222,7 +222,7 @@ def save_heading_data(self):
"""
This method saves the current heading errors in a csv file.
in the folders of
paf23/doc/06_perception/00_Experiments/kalman_datasets
paf/doc/06_perception/00_Experiments/kalman_datasets
It does this for a limited amount of time.
"""
# if rospy.get_time() > 45 stop saving data:
Expand Down
2 changes: 1 addition & 1 deletion code/planning/src/local_planner/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def spawn_car(distance):
Args:
distance (float): distance
"""
CARLA_HOST = os.environ.get('CARLA_HOST', 'paf23-carla-simulator-1')
CARLA_HOST = os.environ.get('CARLA_HOST', 'paf-carla-simulator-1')
CARLA_PORT = int(os.environ.get('CARLA_PORT', '2000'))

client = carla.Client(CARLA_HOST, CARLA_PORT)
Expand Down
2 changes: 1 addition & 1 deletion doc/01_general/03_commands.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ⌨️ Available commands

A specific `b5` workflow for gpu installation in this project is specified in an issue comment: <https://github.com/una-auxme/paf23/issues/260#issuecomment-2196852330>
A specific `b5` workflow for gpu installation in this project is specified in an issue comment: <https://github.com/una-auxme/paf/issues/260#issuecomment-2196852330>

## General commands

Expand Down
2 changes: 1 addition & 1 deletion doc/02_development/12_discord_webhook.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Author: Lennart Luttkus, 15.11.2023

The discord bot has access to the `#gitupdates` text channel on our discord server.
It is an Integration as a Webhook.
Settings for this webhook can be found in the repository settings <https://github.com/una-auxme/paf23/settings/hooks>.
Settings for this webhook can be found in the repository settings <https://github.com/una-auxme/paf/settings/hooks>.
The Webhook post updates from the repository in the `#gitupdates` channel.
Helpful tutorial can be found here: <https://youtu.be/vbzzvzO51-4>
4 changes: 2 additions & 2 deletions doc/03_research/01_acting/04_paf21_2_and_pylot_acting.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

![Untitled](../../00_assets/research_assets/stanley_controller.png)

### [List of Inputs/Outputs](https://github.com/una-auxme/paf23/blob/main/doc/03_research/01_acting/02_acting_implementation.md#list-of-inputsoutputs)
### [List of Inputs/Outputs](https://github.com/una-auxme/paf/blob/main/doc/03_research/01_acting/02_acting_implementation.md#list-of-inputsoutputs)

- Subscribes to:
- [nav_msgs/Odometry Message](http://docs.ros.org/en/noetic/api/nav_msgs/html/msg/Odometry.html) : to get the current position and heading
Expand All @@ -25,7 +25,7 @@
- Publishes:
- [CarlaEgoVehicleControl.msg](https://carla.readthedocs.io/projects/ros-bridge/en/latest/ros_msgs/#carlaegovehiclecontrolmsg) : to actually control the vehicles throttle, steering

### [Challenges](https://github.com/una-auxme/paf23/blob/main/doc/03_research/01_acting/02_acting_implementation.md#challenges)
### [Challenges](https://github.com/una-auxme/paf/blob/main/doc/03_research/01_acting/02_acting_implementation.md#challenges)

A short list of challenges for the implementation of a basic acting domain and how they these could be tackled based on the requirements mentioned above.

Expand Down
4 changes: 2 additions & 2 deletions doc/03_research/02_perception/05-autoware-perception.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 1.Architecture

![image](https://github.com/una-auxme/paf23/assets/102369315/6b3fb964-e650-442a-a674-8e0471d931a9)
![image](https://github.com/una-auxme/paf/assets/102369315/6b3fb964-e650-442a-a674-8e0471d931a9)

Focus on:

Expand All @@ -16,7 +16,7 @@ Focus on:

Autowares perception is very complex and uses a variety of mechnaism to gather as much information as possible about the surroundings of the car.

![image](https://github.com/una-auxme/paf23/assets/102369315/23f9699e-85c7-44c6-b9fa-a603dc73afcf)
![image](https://github.com/una-auxme/paf/assets/102369315/23f9699e-85c7-44c6-b9fa-a603dc73afcf)

For the perception Autoware mainly uses the following Sensors:

Expand Down
2 changes: 1 addition & 1 deletion doc/03_research/02_perception/06_paf_21_1_perception.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 1. Architecture

![image](https://github.com/una-auxme/paf23/assets/102369315/07328c78-83d7-425c-802e-8cc49430e6c1)
![image](https://github.com/una-auxme/paf/assets/102369315/07328c78-83d7-425c-802e-8cc49430e6c1)

### **Key Features**

Expand Down
12 changes: 6 additions & 6 deletions doc/03_research/02_perception/LIDAR_data.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ LIDAR-Data comes in Pointclouds from a specific LIDAR-Topic.
`rospy.Subscriber(rospy.get_param('~source_topic', "/carla/hero/LIDAR"),
PointCloud2, self.callback)`

Read more about the LIDAR-Sensor [here](https://github.com/una-auxme/paf23/blob/main/doc/06_perception/03_lidar_distance_utility.md)
Read more about the LIDAR-Sensor [here](https://github.com/una-auxme/paf/blob/main/doc/06_perception/03_lidar_distance_utility.md)

## Processing

The goal is to identify Objects and their distance. Therefor we need to calculate distances from the pointcloud data.
To do this the lidar-distance node first converts pointcloud data to an array, which contains cartesian coordinates.

`paf23-agent-1 | (76.12445 , -1.6572031e+01, 13.737187 , 0.7287409 )`
`paf-agent-1 | (76.12445 , -1.6572031e+01, 13.737187 , 0.7287409 )`

`paf23-agent-1 | (71.9434 , -1.8718828e+01, 13.107929 , 0.7393809 )`
`paf-agent-1 | (71.9434 , -1.8718828e+01, 13.107929 , 0.7393809 )`

`paf23-agent-1 | (-0.3482422 , -1.6367188e-02, -0.20128906, 0.99839103)`
`paf-agent-1 | (-0.3482422 , -1.6367188e-02, -0.20128906, 0.99839103)`

`paf23-agent-1 | (-0.3486328 , -1.4062500e-02, -0.20152344, 0.99838954)`
`paf-agent-1 | (-0.3486328 , -1.4062500e-02, -0.20152344, 0.99838954)`

`paf23-agent-1 | (-0.35070312, -2.3828126e-03, -0.2025 , 0.99838144)`
`paf-agent-1 | (-0.35070312, -2.3828126e-03, -0.2025 , 0.99838144)`

The first three values of each row correspon to x, y, z.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IMAGE_BASE_FOLDER = '/home/maxi/paf23/code/output/12-dev/rgb/center'
IMAGE_BASE_FOLDER = '/home/maxi/paf/code/output/12-dev/rgb/center'

IMAGES_FOR_TEST = {
'start': '1600.png',
Expand Down
4 changes: 2 additions & 2 deletions pc_setup_user.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cd
mkdir git
cd git
git clone https://github.com/una-auxme/paf23.git
git clone https://github.com/una-auxme/paf.git

cd paf23
cd paf
./dc-run-file.sh build/docker-compose.yaml

0 comments on commit 69f79be

Please sign in to comment.