diff --git a/.gitignore b/.gitignore index 98af37ec3..f24b20352 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,6 @@ examples/debug.py examples/test.py # NumPy saves and videos -files/logs/*.npy -files/videos/*.mp4 results/ tmp/ diff --git a/README.md b/README.md index 0dbd807ed..a8ab018f8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a minimalist refactoring of the original `gym-pybullet-drones` repositor > **NOTE**: if you prefer to access the original codebase, presented at IROS in 2021, please `git checkout [paper|master]` after cloning the repo, and refer to the corresponding `README.md`'s. -formation flight control info +formation flight control info ## Installation diff --git a/files/logs/foo.txt b/files/logs/foo.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/files/readme_images/2020.gif b/files/readme_images/2020.gif deleted file mode 100644 index 92bc0fe11..000000000 Binary files a/files/readme_images/2020.gif and /dev/null differ diff --git a/files/readme_images/dep.gif b/files/readme_images/dep.gif deleted file mode 100644 index ff67941dd..000000000 Binary files a/files/readme_images/dep.gif and /dev/null differ diff --git a/files/readme_images/downwash.gif b/files/readme_images/downwash.gif deleted file mode 100644 index 3ed4372f4..000000000 Binary files a/files/readme_images/downwash.gif and /dev/null differ diff --git a/files/readme_images/downwash.png b/files/readme_images/downwash.png deleted file mode 100644 index 34e19a8d2..000000000 Binary files a/files/readme_images/downwash.png and /dev/null differ diff --git a/files/readme_images/rgb.gif b/files/readme_images/rgb.gif deleted file mode 100644 index 26c2017cd..000000000 Binary files a/files/readme_images/rgb.gif and /dev/null differ diff --git a/files/readme_images/seg.gif b/files/readme_images/seg.gif deleted file mode 100644 index 9b4e0ccae..000000000 Binary files a/files/readme_images/seg.gif and /dev/null differ diff --git a/gym_pybullet_drones/assets/beta.txt b/gym_pybullet_drones/assets/beta-presets-bak.txt similarity index 100% rename from gym_pybullet_drones/assets/beta.txt rename to gym_pybullet_drones/assets/beta-presets-bak.txt diff --git a/gym_pybullet_drones/assets/beta.csv b/gym_pybullet_drones/assets/beta-traj.csv similarity index 100% rename from gym_pybullet_drones/assets/beta.csv rename to gym_pybullet_drones/assets/beta-traj.csv diff --git a/files/videos/ffmpeg_png2mp4.sh b/gym_pybullet_drones/assets/ffmpeg_png2mp4.sh similarity index 100% rename from files/videos/ffmpeg_png2mp4.sh rename to gym_pybullet_drones/assets/ffmpeg_png2mp4.sh diff --git a/files/readme_images/helix.gif b/gym_pybullet_drones/assets/helix.gif similarity index 100% rename from files/readme_images/helix.gif rename to gym_pybullet_drones/assets/helix.gif diff --git a/files/readme_images/helix.png b/gym_pybullet_drones/assets/helix.png similarity index 100% rename from files/readme_images/helix.png rename to gym_pybullet_drones/assets/helix.png diff --git a/gym_pybullet_drones/envs/BaseAviary.py b/gym_pybullet_drones/envs/BaseAviary.py index 5d9a3a39a..70b0a40a4 100755 --- a/gym_pybullet_drones/envs/BaseAviary.py +++ b/gym_pybullet_drones/envs/BaseAviary.py @@ -61,7 +61,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obstacles : bool, optional Whether to add obstacles to the simulation. user_debug_gui : bool, optional diff --git a/gym_pybullet_drones/envs/BaseRLAviary.py b/gym_pybullet_drones/envs/BaseRLAviary.py index 865baed20..0d9a38da1 100644 --- a/gym_pybullet_drones/envs/BaseRLAviary.py +++ b/gym_pybullet_drones/envs/BaseRLAviary.py @@ -54,7 +54,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obs : ObservationType, optional The type of observation space (kinematic information or vision) act : ActionType, optional diff --git a/gym_pybullet_drones/envs/BetaAviary.py b/gym_pybullet_drones/envs/BetaAviary.py index 6cf6caee6..e4d37a2e4 100644 --- a/gym_pybullet_drones/envs/BetaAviary.py +++ b/gym_pybullet_drones/envs/BetaAviary.py @@ -59,7 +59,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obstacles : bool, optional Whether to add obstacles to the simulation. user_debug_gui : bool, optional diff --git a/gym_pybullet_drones/envs/CtrlAviary.py b/gym_pybullet_drones/envs/CtrlAviary.py index 3dc127217..b3ba8efee 100644 --- a/gym_pybullet_drones/envs/CtrlAviary.py +++ b/gym_pybullet_drones/envs/CtrlAviary.py @@ -47,7 +47,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obstacles : bool, optional Whether to add obstacles to the simulation. user_debug_gui : bool, optional diff --git a/gym_pybullet_drones/envs/HoverAviary.py b/gym_pybullet_drones/envs/HoverAviary.py index 9908f3f50..eb020c6a4 100644 --- a/gym_pybullet_drones/envs/HoverAviary.py +++ b/gym_pybullet_drones/envs/HoverAviary.py @@ -41,7 +41,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obs : ObservationType, optional The type of observation space (kinematic information or vision) act : ActionType, optional diff --git a/gym_pybullet_drones/envs/LeaderFollowerAviary.py b/gym_pybullet_drones/envs/LeaderFollowerAviary.py index c6a523ff4..2f5ada492 100644 --- a/gym_pybullet_drones/envs/LeaderFollowerAviary.py +++ b/gym_pybullet_drones/envs/LeaderFollowerAviary.py @@ -47,7 +47,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obs : ObservationType, optional The type of observation space (kinematic information or vision) act : ActionType, optional diff --git a/gym_pybullet_drones/envs/VelocityAviary.py b/gym_pybullet_drones/envs/VelocityAviary.py index c522c80df..56416ef8b 100644 --- a/gym_pybullet_drones/envs/VelocityAviary.py +++ b/gym_pybullet_drones/envs/VelocityAviary.py @@ -49,7 +49,7 @@ def __init__(self, gui : bool, optional Whether to use PyBullet's GUI. record : bool, optional - Whether to save a video of the simulation in folder `files/videos/`. + Whether to save a video of the simulation. obstacles : bool, optional Whether to add obstacles to the simulation. user_debug_gui : bool, optional diff --git a/gym_pybullet_drones/examples/beta.py b/gym_pybullet_drones/examples/beta.py index f7da8dd5e..7f47a4841 100644 --- a/gym_pybullet_drones/examples/beta.py +++ b/gym_pybullet_drones/examples/beta.py @@ -88,7 +88,7 @@ def run( ) #### Run the simulation #################################### - with open("../assets/beta.csv", mode='r') as csv_file: + with open("../assets/beta-traj.csv", mode='r') as csv_file: csv_reader = csv.DictReader(csv_file) trajectory1 = iter([{ "pos": np.array([ diff --git a/pypi_description.md b/pypi_description.md index 31acb7dcc..c60fe2e9f 100644 --- a/pypi_description.md +++ b/pypi_description.md @@ -1,6 +1,6 @@ # gym-pybullet-drones -[Simple](https://en.wikipedia.org/wiki/KISS_principle) OpenAI [Gym environment](https://gym.openai.com/envs/#classic_control) based on [PyBullet](https://github.com/bulletphysics/bullet3) for multi-agent reinforcement learning with quadrotors +[Simple](https://en.wikipedia.org/wiki/KISS_principle) OpenAI [Gym environment](https://gym.openai.com/envs/#classic_control) based on [PyBullet](https://github.com/bulletphysics/bullet3) for multi-agent reinforcement learning with quadrotors Find the project's published results at [Learning to Fly—a Gym Environment with PyBullet Physics for Reinforcement Learning of Multi-agent Quadcopter Control](https://ieeexplore.ieee.org/abstract/document/9635857).