Merge branch '273_fixing_merge_conflicts' into 'master'
273 fixing merge conflicts Closes #273 See merge request flatland/flatland!262
No related branches found
No related tags found
Showing
- README.md 3 additions, 3 deletionsREADME.md
- changelog.md 1 addition, 0 deletionschangelog.md
- examples/complex_rail_benchmark.py 2 additions, 4 deletionsexamples/complex_rail_benchmark.py
- examples/custom_observation_example_01_SimpleObs.py 1 addition, 4 deletionsexamples/custom_observation_example_01_SimpleObs.py
- examples/custom_observation_example_02_SingleAgentNavigationObs.py 3 additions, 6 deletions...custom_observation_example_02_SingleAgentNavigationObs.py
- examples/custom_observation_example_03_ObservePredictions.py 3 additions, 6 deletionsexamples/custom_observation_example_03_ObservePredictions.py
- examples/custom_railmap_example.py 1 addition, 4 deletionsexamples/custom_railmap_example.py
- examples/flatland_2_0_example.py 2 additions, 1 deletionexamples/flatland_2_0_example.py
- examples/introduction_flatland_2_1.py 4 additions, 4 deletionsexamples/introduction_flatland_2_1.py
- examples/simple_example_1.py 2 additions, 5 deletionsexamples/simple_example_1.py
- examples/simple_example_2.py 2 additions, 3 deletionsexamples/simple_example_2.py
- examples/training_example.py 2 additions, 5 deletionsexamples/training_example.py
- flatland/cli.py 5 additions, 10 deletionsflatland/cli.py
- flatland/envs/flatland_envs_rail_env_utils.py 36 additions, 0 deletionsflatland/envs/flatland_envs_rail_env_utils.py
- flatland/envs/grid4_generators_utils.py 2 additions, 1 deletionflatland/envs/grid4_generators_utils.py
- flatland/envs/malfunction_generators.py 148 additions, 0 deletionsflatland/envs/malfunction_generators.py
- flatland/envs/rail_env.py 43 additions, 68 deletionsflatland/envs/rail_env.py
- flatland/envs/rail_env_utils.py 2 additions, 5 deletionsflatland/envs/rail_env_utils.py
- flatland/envs/rail_generators.py 2 additions, 2 deletionsflatland/envs/rail_generators.py
- flatland/envs/schedule_generators.py 1 addition, 1 deletionflatland/envs/schedule_generators.py
Loading
Please register or sign in to comment