Merge branch 'master' into 188_refining_generator (bd052de6) · Commits · yoogottamk / 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

bd052de6

Commit bd052de6 authored 5 years ago by Erik Nygren

:bullettrain_front:

Downloads
- Plain Diff

Merge branch 'master' into 188_refining_generator

# Conflicts:
#	examples/simple_example_city_railway_generator.py

parents 03b13140 f3b309d4

No related branches found

No related tags found

No related merge requests found

Changes 69

Hide whitespace changes

Inline Side-by-side

Showing

make_docs.py 22 additions, 9 deletions

make_docs.py
requirements_continuous_integration.txt 1 addition, 1 deletion

requirements_continuous_integration.txt
setup.py 1 addition, 1 deletion

setup.py
tests/test_flatland_core_transition_map.py 26 additions, 0 deletions

tests/test_flatland_core_transition_map.py
tests/test_flatland_envs_env_utils.py 5 additions, 0 deletions

tests/test_flatland_envs_env_utils.py
tests/test_flatland_envs_predictions.py 20 additions, 3 deletions

tests/test_flatland_envs_predictions.py
tests/test_flatland_envs_rail_env.py 0 additions, 1 deletion

tests/test_flatland_envs_rail_env.py
tests/test_flatland_envs_rail_env_shortest_paths.py 194 additions, 0 deletions

tests/test_flatland_envs_rail_env_shortest_paths.py
tests/test_flatland_malfunction.py 48 additions, 11 deletions

tests/test_flatland_malfunction.py

with 317 additions and 26 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