Merge branch 'master' into 'temp_Update_branch' (14cab240) · Commits · pranjal_dhole / Flatland · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Flatland
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

14cab240

Commit 14cab240 authored 5 years ago by Erik Nygren

:bullettrain_front:

Downloads
- Plain Diff

Merge branch 'master' into 'temp_Update_branch'

# Conflicts:
#   flatland/envs/rail_env.py
#   tests/test_flatland_malfunction.py

parents 39446912 f8ef8acc

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

examples/Simple_Realistic_Railway_Generator.py 0 additions, 613 deletions

examples/Simple_Realistic_Railway_Generator.py
examples/complex_rail_benchmark.py 0 additions, 20 deletions

examples/complex_rail_benchmark.py
examples/custom_observation_example_02_SingleAgentNavigationObs.py 5 additions, 1 deletion

...custom_observation_example_02_SingleAgentNavigationObs.py
examples/custom_railmap_example.py 4 additions, 5 deletions

examples/custom_railmap_example.py
examples/debugging_example_DELETE.py 0 additions, 85 deletions

examples/debugging_example_DELETE.py
flatland/envs/rail_env.py 20 additions, 8 deletions

flatland/envs/rail_env.py
tests/test_flatland_malfunction.py 3 additions, 4 deletions

tests/test_flatland_malfunction.py

with 32 additions and 736 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment