Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A major (performance) update on the submodule: srl-zoo; fixes several issues #50

Closed
wants to merge 79 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
853d53d
fix issue: image rotated by 90 degrees
ncble May 17, 2019
92ec263
fix issue: pb with old gym.space.prng(seed)
ncble May 19, 2019
0972b8a
fix issue (srl_zoo): image rotated by 90 degrees
ncble May 19, 2019
20874b8
resolve submodules commit
ncble May 19, 2019
26006cb
include submodules
ncble May 20, 2019
8457456
merge
ncble May 20, 2019
f32793e
fix issue: sac/deepq/ddpg have no --policy arg
ncble May 21, 2019
0ca9326
change branch
ncble May 21, 2019
63d335e
pass image shape to the input of SRLNeuralNetwork
ncble May 22, 2019
1a1c289
add gan to srl-zoo
ncble May 22, 2019
96ceb4c
update srl_zoo
ncble May 23, 2019
6679d77
merge with new master (1ab1bd366825f98f0282d05e32a3de0cbf7f0f9a)
ncble May 24, 2019
be06349
update srl_zoo
ncble May 24, 2019
8ddcac6
update gitignore
ncble May 25, 2019
be996b0
Merge branch 'adv_srl' of https://github.com/ncble/robotics-rl-srl in…
ncble May 25, 2019
bad2039
Omnirobot requires python=2.7 incompatible with current python env
ncble May 26, 2019
dfe18d4
full update for Omnirobot (new env)
ncble May 27, 2019
5d94eb5
fix training bug (valid set is used during training) in srl-zoo
ncble May 27, 2019
476bc82
new feature: add image shape to args for RL training
ncble May 28, 2019
e2f1cb7
add 'img_shape' to rl_baselines/train.py|replay/enjoy_baseline.py (en…
ncble May 28, 2019
e72eb6e
add img_shape to all envs
ncble May 28, 2019
8dd43f9
update srl-zoo
ncble May 29, 2019
695e5fd
multi-runs: raw pixels with different resolutions
ncble May 29, 2019
8f77ecf
Merge branch 'adv_srl' of https://github.com/ncble/robotics-rl-srl in…
ncble May 29, 2019
1c548c7
update srl_zoo
ncble May 30, 2019
0a9f5d3
update srl_zoo
ncble May 31, 2019
3b724e4
update srl_zoo(ASRL)
ncble May 31, 2019
735d4a1
add newsrl_model gan and unet(temporary)
ncble Jun 2, 2019
b0b405e
update srl_zoo
ncble Jun 4, 2019
5313117
new feature: enable srl model weights path in terminal
ncble Jun 5, 2019
5bdf62a
merge adv_srl to master
ncble Jun 5, 2019
41eac60
register several new srl models
ncble Jun 6, 2019
dc7c27c
update environment.yml
ncble Jun 6, 2019
4e9dd36
fix kuka img-shape
ncble Jun 7, 2019
2aada7b
register new srl models
ncble Jun 11, 2019
8346bac
compare losses plot for 10 models (before: less than 8)
ncble Jun 11, 2019
58e4431
(new) auto generate reward w.r.t timesteps latex table: replay/postpr…
ncble Jun 13, 2019
5a73f67
add new srl model
ncble Jun 18, 2019
81fe95e
remove split module, integrate it into SRLModules
ncble Jun 19, 2019
d1b51d6
update srl_zoo; register new SRL model
ncble Jun 20, 2019
c6d4c23
update debug srl_zoo
ncble Jun 21, 2019
48b951a
clean comments
ncble Jun 21, 2019
d104d9d
update srl
ncble Jun 21, 2019
e5b858e
test new srl models
ncble Jun 25, 2019
8ca32b1
fix autoencoder activation
ncble Jun 28, 2019
3821e18
fix false ground_truth in mobile_robot envs; add arg: --relative-pos
ncble Jun 29, 2019
d2a4a95
(SOTA)
ncble Jun 30, 2019
4dc6f7e
refine plot_pipeline
ncble Jul 1, 2019
2299635
fix relative pos for kuka_button env
ncble Jul 1, 2019
f4aa6a4
register new srl model to KukaButton
ncble Jul 2, 2019
a135eb0
register new srl model to KukaButton
ncble Jul 2, 2019
9dea4cc
update srl_zoo
ncble Jul 5, 2019
6d95e22
update srl_zoo
ncble Jul 5, 2019
d7366ed
register new srl model
ncble Jul 5, 2019
e604cb6
register new srl model for omnirobot
ncble Jul 6, 2019
c41eb5e
update srl_zoo (resnet gan)
ncble Jul 8, 2019
e55278b
merge srl_zoo (debug2_tempo)
ncble Jul 11, 2019
212ee8f
merge debug2_tempo
ncble Jul 11, 2019
cd55b93
register new srl model (this registration should be remove in the fut…
ncble Jul 13, 2019
9a9bbc2
register new srl model: this should be removed in the future
ncble Jul 14, 2019
9b36e90
add Labyrinth environment
ncble Jul 16, 2019
ecc093e
add mobile_robot_extreme environment
ncble Jul 16, 2019
24f0c11
minor bugs
ncble Jul 17, 2019
4ce10bd
discret reward (gt reward) for srl training
ncble Jul 17, 2019
80fdd49
remove ugly self._reward, self._termination functions (cause bugs)
ncble Jul 18, 2019
c694749
add new environment MobileRobotX (extreme fast, 20 times faster than …
ncble Jul 18, 2019
8633608
add random target to Labyrinth; fix color MobileX; add new env
ncble Jul 18, 2019
b38c958
quick fix for spcls num_classes (we should use new class design)
ncble Jul 19, 2019
a72fe0d
enable omnirobot and any triplet imgs (background, robot, target) in …
ncble Jul 19, 2019
77675da
add new srl model (this registration really should be removed in the …
ncble Jul 19, 2019
a6a35cf
Merge remote-tracking branch 'origin/labyrinth'
ncble Jul 19, 2019
4814ea5
change some params in MobileX
ncble Jul 22, 2019
60887c8
register color for post-processing
ncble Jul 22, 2019
02371a6
clean code for 'supervised' learning
ncble Jul 22, 2019
3a3830b
register debug; clean code
ncble Jul 23, 2019
af82fd3
add envs Labyrinth-v1 v2 v3
ncble Jul 26, 2019
1361bc5
use png instead of jpg/jpeg extension for saving images
ncble Aug 4, 2019
4ba094c
enable any image shape for dataset_generator.py
ncble Aug 5, 2019
71243d9
clean config/sr_models.yaml (this config file should be remove in the…
ncble Aug 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ logs_real/
.pytest_cache/
docker/environment.yml
_build/

.vscode/
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "srl_zoo"]
path = srl_zoo
branch = master
url = https://github.com/araffin/srl-zoo.git
branch = adv_srl
url = https://github.com/ncble/srl-zoo.git
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ All the environments we propose follow the OpenAI Gym interface. We also extende

### Available Environments

| **Kuka environment** | **Mobile Robot environment** | **Racing car environment** |
| -------------------------- | ---------------------------------- | -------------------------------- |
| <img src="imgs/kuka.gif"/> | <img src="imgs/mobile_robot.gif"/> | <img src="imgs/racing_car.gif"/> |
| **Kuka environment** | **Mobile Robot environment** | **Racing car environment** | **Omnidirectional robot environment** |
| -------------------------- | ---------------------------------- | -------------------------------- | ------------------------------------------- |
| <img src="imgs/kuka.gif"/> | <img src="imgs/mobile_robot.gif"/> | <img src="imgs/racing_car.gif"/> | <img src="imgs/omnirobot.gif"/> |


| **Name** | **Action space (discrete)** | **Action space (continuous)** | **Rewards** | **ground truth** |
Expand All @@ -126,6 +126,7 @@ All the environments we propose follow the OpenAI Gym interface. We also extende
| **MobileRobot**<br>**1D** | 2 actions (1D cardinal direction) | 1 axis (1D cardinal direction) | 1 when target reached, -1 for a wall hit, otherwise 0 <sup>(2)</sup> | the X position of the robot <sup>(4)</sup> |
| **MobileRobot**<br>**LineTarget** | 4 actions (2D cardinal direction) | 2 axis (2D cardinal direction) | 1 when target reached, -1 for a wall hit, otherwise 0 <sup>(2)</sup> | the X,Y position of the robot <sup>(4)</sup> |
| **CarRacing** | 4 actions (left, right, accelerate, brake) | 3 axis (stearing, accelerate, brake) | -100 when out of bounds, otherwise -0.1 | the X,Y position of the car <sup>(4)</sup> |
| **OmniRobot** | 4 actions (2D cardinal direction) | 2 axis (2D cardinal direction) | 1 when target reached, -1 for a wall hit, otherwise 0 <sup>(2)</sup> | the X,Y position of the robot <sup>(4)</sup> |

<sub><sup>1. The action space can use 6 axis arm joints control with the `--joints` flag</sup></sub><br>
<sup><sup>2. The reward can be the euclidian distance to the target with the `--shape-reward` flag</sup></sup><br>
Expand All @@ -150,6 +151,8 @@ the available environments are:
- Baxter-v0: A bridge to use a baxter robot with ROS (in simulation, it uses Gazebo)
- Robobo: A Robobo robot that must reach a target position.
- RoboboGymEnv-v0: A bridge to use a Robobo robot with ROS.
- OmniRobot: An Omnidirectional robot on a 2d terrain that must reach a target position (see [Working With Real Robots: OmniRobot](https://github.com/GaspardQin/robotics-rl-srl/tree/master/real_robots))
- OmnirobotEnv-v0: Simulator but also a bridge to use an OmniRobot with ROS.

Please read the [documentation](https://s-rl-toolbox.readthedocs.io/) for more details (e.g. adding a custom environment).

Expand Down
Loading