solved merge conflicts. This closes #273
No related branches found
No related tags found
Showing
- changelog.md 3 additions, 0 deletionschangelog.md
- docs/tutorials/01_gettingstarted.rst 0 additions, 3 deletionsdocs/tutorials/01_gettingstarted.rst
- flatland/envs/agent_utils.py 49 additions, 69 deletionsflatland/envs/agent_utils.py
- flatland/envs/predictions.py 2 additions, 2 deletionsflatland/envs/predictions.py
- flatland/envs/rail_env.py 50 additions, 35 deletionsflatland/envs/rail_env.py
- flatland/envs/schedule_generators.py 8 additions, 14 deletionsflatland/envs/schedule_generators.py
- flatland/utils/editor.py 38 additions, 55 deletionsflatland/utils/editor.py
- flatland/utils/rendertools.py 4 additions, 5 deletionsflatland/utils/rendertools.py
- tests/test_distance_map.py 10 additions, 6 deletionstests/test_distance_map.py
- tests/test_flatland_core_transition_map.py 15 additions, 13 deletionstests/test_flatland_core_transition_map.py
- tests/test_flatland_envs_observations.py 25 additions, 8 deletionstests/test_flatland_envs_observations.py
- tests/test_flatland_envs_predictions.py 31 additions, 22 deletionstests/test_flatland_envs_predictions.py
- tests/test_flatland_envs_rail_env.py 18 additions, 20 deletionstests/test_flatland_envs_rail_env.py
- tests/test_flatland_envs_rail_env_shortest_paths.py 11 additions, 2 deletionstests/test_flatland_envs_rail_env_shortest_paths.py
- tests/test_flatland_malfunction.py 16 additions, 14 deletionstests/test_flatland_malfunction.py
- tests/test_generators.py 7 additions, 6 deletionstests/test_generators.py
- tests/test_utils.py 2 additions, 1 deletiontests/test_utils.py
Loading
Please register or sign in to comment