tests/test_speed_classes.py

@@ -2,30 +2,28 @@
 import numpy as np
 
 from flatland.envs.rail_env import RailEnv
-from flatland.envs.rail_generators import complex_rail_generator
-from flatland.envs.schedule_generators import speed_initialization_helper, complex_schedule_generator
+from flatland.envs.rail_generators import sparse_rail_generator
+from flatland.envs.line_generators import speed_initialization_helper, sparse_line_generator
 
 
 def test_speed_initialization_helper():
-    np.random.seed(1)
+    random_generator = np.random.RandomState()
+    random_generator.seed(10)
     speed_ratio_map = {1: 0.3, 2: 0.4, 3: 0.3}
-    actual_speeds = speed_initialization_helper(10, speed_ratio_map)
+    actual_speeds = speed_initialization_helper(10, speed_ratio_map, np_random=random_generator)
 
     # seed makes speed_initialization_helper deterministic -> check generated speeds.
-    assert actual_speeds == [2, 3, 1, 2, 1, 1, 1, 2, 2, 2]
+    assert actual_speeds == [3, 1, 2, 3, 2, 1, 1, 3, 1, 1]
 
 
 def test_rail_env_speed_intializer():
     speed_ratio_map = {1: 0.3, 2: 0.4, 3: 0.1, 5: 0.2}
 
-    env = RailEnv(width=50,
-                  height=50,
-                  rail_generator=complex_rail_generator(nr_start_goal=10, nr_extra=1, min_dist=8, max_dist=99999,
-                                                        seed=1),
-                  schedule_generator=complex_schedule_generator(),
+    env = RailEnv(width=50, height=50,
+                  rail_generator=sparse_rail_generator(), line_generator=sparse_line_generator(),
                   number_of_agents=10)
     env.reset()
-    actual_speeds = list(map(lambda agent: agent.speed_data['speed'], env.agents))
+    actual_speeds = list(map(lambda agent: agent.speed_counter.speed, env.agents))
 
     expected_speed_set = set(speed_ratio_map.keys())
 

tests/test_utils.py

@@ -5,10 +5,15 @@ import numpy as np
 from attr import attrs, attrib
 
 from flatland.core.grid.grid4 import Grid4TransitionsEnum
-from flatland.envs.agent_utils import EnvAgent, RailAgentStatus
+from flatland.envs.agent_utils import EnvAgent
+from flatland.envs.malfunction_generators import MalfunctionParameters, malfunction_from_params
 from flatland.envs.rail_env import RailEnvActions, RailEnv
+from flatland.envs.rail_generators import RailGenerator
+from flatland.envs.line_generators import LineGenerator
 from flatland.utils.rendertools import RenderTool
-
+from flatland.envs.persistence import RailEnvPersister
+from flatland.envs.step_utils.states import TrainState
+from flatland.envs.step_utils.speed_counter import SpeedCounter
 
 @attrs
 class Replay(object):
@@ -18,7 +23,7 @@ class Replay(object):
     malfunction = attrib(default=0, type=int)
     set_malfunction = attrib(default=None, type=Optional[int])
     reward = attrib(default=None, type=Optional[float])
-    status = attrib(default=None, type=Optional[RailAgentStatus])
+    state = attrib(default=None, type=Optional[TrainState])
 
 
 @attrs
@@ -38,7 +43,8 @@ def set_penalties_for_replay(env: RailEnv):
     env.invalid_action_penalty = -29
 
 
-def run_replay_config(env: RailEnv, test_configs: List[ReplayConfig], rendering: bool = False, activate_agents=True):
+def run_replay_config(env: RailEnv, test_configs: List[ReplayConfig], rendering: bool = False, activate_agents=True, 
+                      skip_reward_check=False, set_ready_to_depart=False, skip_action_required_check=False):
     """
     Runs the replay configs and checks assertions.
 
@@ -83,8 +89,19 @@ def run_replay_config(env: RailEnv, test_configs: List[ReplayConfig], rendering:
                 agent.initial_direction = test_config.initial_direction
                 agent.direction = test_config.initial_direction
                 agent.target = test_config.target
-                agent.speed_data['speed'] = test_config.speed
-            env.reset(False, False, activate_agents)
+                agent.speed_counter = SpeedCounter(speed=test_config.speed)
+            env.reset(False, False)
+
+            if set_ready_to_depart:
+                # Set all agents to ready to depart
+                for i_agent in range(len(env.agents)):
+                    env.agents[i_agent].earliest_departure = 0
+                    env.agents[i_agent]._set_state(TrainState.READY_TO_DEPART)
+
+            elif activate_agents:
+                for a_idx in range(len(env.agents)):
+                    env.agents[a_idx].position =  env.agents[a_idx].initial_position
+                    env.agents[a_idx]._set_state(TrainState.MOVING)
 
         def _assert(a, actual, expected, msg):
             print("[{}] verifying {} on agent {}: actual={}, expected={}".format(step, msg, a, actual, expected))
@@ -98,19 +115,22 @@ def run_replay_config(env: RailEnv, test_configs: List[ReplayConfig], rendering:
         for a, test_config in enumerate(test_configs):
             agent: EnvAgent = env.agents[a]
             replay = test_config.replay[step]
-
+            # if not agent.position == replay.position:
+                # import pdb; pdb.set_trace()   
             _assert(a, agent.position, replay.position, 'position')
             _assert(a, agent.direction, replay.direction, 'direction')
-            if replay.status is not None:
-                _assert(a, agent.status, replay.status, 'status')
+            if replay.state is not None:
+                _assert(a, agent.state, replay.state, 'state')
 
             if replay.action is not None:
-                assert info_dict['action_required'][
-                           a] == True or agent.status == RailAgentStatus.READY_TO_DEPART, "[{}] agent {} expecting action_required={} or agent status READY_TO_DEPART".format(
+                if not skip_action_required_check:    
+                    assert info_dict['action_required'][
+                           a] == True or agent.state == TrainState.READY_TO_DEPART, "[{}] agent {} expecting action_required={} or agent status READY_TO_DEPART".format(
                     step, a, True)
                 action_dict[a] = replay.action
             else:
-                assert info_dict['action_required'][
+                if not skip_action_required_check:
+                    assert info_dict['action_required'][
                            a] == False, "[{}] agent {} expecting action_required={}, but found {}".format(
                     step, a, False, info_dict['action_required'][a])
 
@@ -118,16 +138,34 @@ def run_replay_config(env: RailEnv, test_configs: List[ReplayConfig], rendering:
                 # As we force malfunctions on the agents we have to set a positive rate that the env
                 # recognizes the agent as potentially malfuncitoning
                 # We also set next malfunction to infitiy to avoid interference with our tests
-                agent.malfunction_data['malfunction'] = replay.set_malfunction
-                agent.malfunction_data['moving_before_malfunction'] = agent.moving
-                agent.malfunction_data['fixed'] = False
-            _assert(a, agent.malfunction_data['malfunction'], replay.malfunction, 'malfunction')
+                env.agents[a].malfunction_handler._set_malfunction_down_counter(replay.set_malfunction)
+            _assert(a, agent.malfunction_handler.malfunction_down_counter, replay.malfunction, 'malfunction')
         print(step)
         _, rewards_dict, _, info_dict = env.step(action_dict)
+        # import pdb; pdb.set_trace()
         if rendering:
             renderer.render_env(show=True, show_observations=True)
 
         for a, test_config in enumerate(test_configs):
             replay = test_config.replay[step]
 
-            _assert(a, rewards_dict[a], replay.reward, 'reward')
+            if not skip_reward_check:
+                _assert(a, rewards_dict[a], replay.reward, 'reward')
+
+def create_and_save_env(file_name: str, line_generator: LineGenerator, rail_generator: RailGenerator):
+    stochastic_data = MalfunctionParameters(malfunction_rate=1000,  # Rate of malfunction occurence
+                                            min_duration=15,  # Minimal duration of malfunction
+                                            max_duration=50  # Max duration of malfunction
+                                            )
+
+    env = RailEnv(width=30,
+                  height=30,
+                  rail_generator=rail_generator,
+                  line_generator=line_generator,
+                  number_of_agents=10,
+                  malfunction_generator_and_process_data=malfunction_from_params(stochastic_data),
+                  remove_agents_at_target=True)
+    env.reset(True, True)
+    #env.save(file_name)
+    RailEnvPersister.save(env, file_name)
+    return env

tox.ini

 [tox]
-envlist = py36, py37, examples, notebooks, flake8, docs, coverage
+envlist = py37, py38, examples, docs, coverage
 
 
 [travis]
 python =
+    3.8: py38
     3.7: py37
-    3.6: py36
 
 [flake8]
 max-line-length = 120
 ignore = E121 E126 E123 E128 E133 E226 E241 E242 E704 W291 W293 W391 W503 W504 W505
 
 [testenv:flake8]
-basepython = python
+basepython = python3.7
 passenv = DISPLAY
 deps =
     -r{toxinidir}/requirements_dev.txt
@@ -21,16 +21,13 @@ commands =
     flake8 flatland tests examples benchmarks
 
 [testenv:docs]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 whitelist_externals = make
 passenv =
     DISPLAY
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
     graphviz
 conda_channels :
@@ -44,8 +41,7 @@ commands =
     make docs
 
 [testenv:coverage]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 whitelist_externals = make
 passenv =
     DISPLAY
@@ -53,8 +49,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -67,8 +61,7 @@ commands =
     python make_coverage.py
 
 [testenv:benchmarks]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
@@ -81,14 +74,13 @@ whitelist_externals = sh
 deps =
     -r{toxinidir}/requirements_dev.txt
     -r{toxinidir}/requirements_continuous_integration.txt
-changedir = {toxinidir}    
+changedir = {toxinidir}
 commands =
     python --version
     python {toxinidir}/benchmarks/benchmark_all_examples.py
 
 [testenv:profiling]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
@@ -98,8 +90,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -107,14 +97,13 @@ conda_channels :
 deps =
     -r{toxinidir}/requirements_dev.txt
     -r{toxinidir}/requirements_continuous_integration.txt
-changedir = {toxinidir}    
+changedir = {toxinidir}
 commands =
     python {toxinidir}/benchmarks/profile_all_examples.py
 
 [testenv:examples]
 ; TODO should examples be run with py36 and py37??
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
@@ -124,8 +113,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -139,10 +126,10 @@ commands =
 
 [testenv:notebooks]
 ; TODO should examples be run with py36 and py37??
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 setenv =
-    PYTHONPATH = {toxinidir}
+    PYTHONPATH = {envdir}
+    ;{toxinidir}
 passenv =
     DISPLAY
     XAUTHORITY
@@ -150,12 +137,12 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 whitelist_externals = sh
+            bash
+            pwd
 deps =
     -r{toxinidir}/requirements_dev.txt
     -r{toxinidir}/requirements_continuous_integration.txt
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -163,6 +150,8 @@ conda_channels :
 ; run tests from subfolder to ensure that resources are accessed via resources and not via relative paths
 changedir = {envtmpdir}/6f59bc68108c3895b1828abdd04b9a06
 commands =
+    bash -c "pwd"
+    bash -c "echo $PYTHONPATH"
     python -m jupyter nbextension install --py --sys-prefix widgetsnbextension
     python -m jupyter nbextension enable --py --sys-prefix widgetsnbextension
     python -m jupyter nbextension install --py --sys-prefix jpy_canvas
@@ -170,8 +159,7 @@ commands =
     python {toxinidir}/notebooks/run_all_notebooks.py
 
 [testenv:start_jupyter]
-; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
-basepython = python3.6
+basepython = python3.7
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
@@ -185,8 +173,6 @@ deps =
     -r{toxinidir}/requirements_dev.txt
     -r{toxinidir}/requirements_continuous_integration.txt
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -199,7 +185,9 @@ commands =
     python -m jupyter nbextension enable --py --sys-prefix jpy_canvas
     python -m jupyter notebook
 
-[testenv]
+[testenv:py37]
+platform = linux|linux2|darwin
+basepython = python3.7
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
@@ -209,8 +197,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge
@@ -223,9 +209,11 @@ commands =
     python --version
     python -m pytest --basetemp={envtmpdir} {toxinidir}
 
-[testenv:py37]
-; exclude py37 from Windows because of incompatibility the pycairo installed through conda for py37
+
+
+[testenv:py38]
 platform = linux|linux2|darwin
+basepython = python3.8
 setenv =
     PYTHONPATH = {toxinidir}
 passenv =
@@ -235,8 +223,6 @@ passenv =
     HTTP_PROXY
     HTTPS_PROXY
 conda_deps =
-    cairosvg
-    pycairo
     tk
 conda_channels :
     conda-forge