Commit 08a30dbb authored by Dipam Chakraborty's avatar Dipam Chakraborty
Browse files

merge import fix

parent 6d9793bb
Pipeline #8497 failed with stages
in 6 minutes and 50 seconds
...@@ -5,14 +5,11 @@ import random ...@@ -5,14 +5,11 @@ import random
from typing import List, Optional, Dict, Tuple from typing import List, Optional, Dict, Tuple
<<<<<<< HEAD
from flatland.utils.rendertools import RenderTool, AgentRenderVariant
=======
import numpy as np import numpy as np
from gym.utils import seeding from gym.utils import seeding
from dataclasses import dataclass from dataclasses import dataclass
>>>>>>> env-step-facelift from flatland.utils.rendertools import RenderTool, AgentRenderVariant
from flatland.core.env import Environment from flatland.core.env import Environment
from flatland.core.env_observation_builder import ObservationBuilder from flatland.core.env_observation_builder import ObservationBuilder
from flatland.core.grid.grid4 import Grid4Transitions from flatland.core.grid.grid4 import Grid4Transitions
...@@ -752,7 +749,7 @@ class RailEnv(Environment): ...@@ -752,7 +749,7 @@ class RailEnv(Environment):
print("Could Not close window due to:",e) print("Could Not close window due to:",e)
self.renderer = None self.renderer = None
@dataclass(repr=True) @dataclass(repr=True)
class AgentTransitionData: class AgentTransitionData:
""" Class for keeping track of temporary agent data for position update """ """ Class for keeping track of temporary agent data for position update """
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment