From ee91911e19f513e84a06048077538107192b0b38 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Tue, 27 Aug 2019 14:07:05 +0200
Subject: [PATCH] #141 different agent classes

---
 RLLib_training/RailEnvRLLibWrapper.py                | 2 +-
 scoring/utils/misc_utils.py                          | 4 ++--
 sequential_agent/run_test.py                         | 4 ++--
 torch_training/multi_agent_inference.py              | 2 +-
 torch_training/multi_agent_training.py               | 6 +++---
 torch_training/multi_agent_two_time_step_training.py | 6 +++---
 torch_training/render_agent_behavior.py              | 4 ++--
 torch_training/training_navigation.py                | 4 ++--
 utils/misc_utils.py                                  | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/RLLib_training/RailEnvRLLibWrapper.py b/RLLib_training/RailEnvRLLibWrapper.py
index 9898000..eb9bbd6 100644
--- a/RLLib_training/RailEnvRLLibWrapper.py
+++ b/RLLib_training/RailEnvRLLibWrapper.py
@@ -2,8 +2,8 @@ import numpy as np
 from ray.rllib.env.multi_agent_env import MultiAgentEnv
 from ray.rllib.utils.seed import seed as set_seed
 
-from flatland.envs.generators import complex_rail_generator, random_rail_generator
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator, random_rail_generator
 
 
 class RailEnvRLLibWrapper(MultiAgentEnv):
diff --git a/scoring/utils/misc_utils.py b/scoring/utils/misc_utils.py
index 924f216..e6f9195 100644
--- a/scoring/utils/misc_utils.py
+++ b/scoring/utils/misc_utils.py
@@ -3,11 +3,11 @@ import time
 
 import numpy as np
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator, rail_from_file
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator, rail_from_file
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 
 # Time factor to test the max time allowed for an env.
diff --git a/sequential_agent/run_test.py b/sequential_agent/run_test.py
index ee4e9ed..31b21e8 100644
--- a/sequential_agent/run_test.py
+++ b/sequential_agent/run_test.py
@@ -1,10 +1,10 @@
 import numpy as np
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 from sequential_agent.simple_order_agent import OrderedAgent
 
diff --git a/torch_training/multi_agent_inference.py b/torch_training/multi_agent_inference.py
index 96f791d..6e62687 100644
--- a/torch_training/multi_agent_inference.py
+++ b/torch_training/multi_agent_inference.py
@@ -8,8 +8,8 @@ from observation_builders.observations import TreeObsForRailEnv
 from predictors.predictions import ShortestPathPredictorForRailEnv
 
 import torch_training.Nets
-from flatland.envs.generators import rail_from_file
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import rail_from_file
 from flatland.utils.rendertools import RenderTool
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import normalize_observation
diff --git a/torch_training/multi_agent_training.py b/torch_training/multi_agent_training.py
index ef0cae7..1e545ec 100644
--- a/torch_training/multi_agent_training.py
+++ b/torch_training/multi_agent_training.py
@@ -11,12 +11,12 @@ from importlib_resources import path
 
 # Import Torch and utility functions to normalize observation
 import torch_training.Nets
-# Import Flatland/ Observations and Predictors
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+# Import Flatland/ Observations and Predictors
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import normalize_observation
 
diff --git a/torch_training/multi_agent_two_time_step_training.py b/torch_training/multi_agent_two_time_step_training.py
index f41495d..d0aafa3 100644
--- a/torch_training/multi_agent_two_time_step_training.py
+++ b/torch_training/multi_agent_two_time_step_training.py
@@ -11,12 +11,12 @@ from importlib_resources import path
 
 # Import Torch and utility functions to normalize observation
 import torch_training.Nets
-# Import Flatland/ Observations and Predictors
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+# Import Flatland/ Observations and Predictors
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import norm_obs_clip, split_tree
 
diff --git a/torch_training/render_agent_behavior.py b/torch_training/render_agent_behavior.py
index 38bd009..3b48d6f 100644
--- a/torch_training/render_agent_behavior.py
+++ b/torch_training/render_agent_behavior.py
@@ -6,11 +6,11 @@ import torch
 from importlib_resources import path
 
 import torch_training.Nets
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 from torch_training.dueling_double_dqn import Agent
 from utils.observation_utils import norm_obs_clip, split_tree
diff --git a/torch_training/training_navigation.py b/torch_training/training_navigation.py
index 40e5a68..623beb5 100644
--- a/torch_training/training_navigation.py
+++ b/torch_training/training_navigation.py
@@ -8,10 +8,10 @@ import numpy as np
 import torch
 from dueling_double_dqn import Agent
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from flatland.utils.rendertools import RenderTool
 from utils.observation_utils import norm_obs_clip, split_tree
 
diff --git a/utils/misc_utils.py b/utils/misc_utils.py
index 6e23af2..19c704b 100644
--- a/utils/misc_utils.py
+++ b/utils/misc_utils.py
@@ -5,10 +5,10 @@ from collections import deque
 import numpy as np
 from line_profiler import LineProfiler
 
-from flatland.envs.agent_generators import complex_rail_generator_agents_placer
-from flatland.envs.generators import complex_rail_generator
 from flatland.envs.observations import GlobalObsForRailEnv
 from flatland.envs.rail_env import RailEnv
+from flatland.envs.rail_generators import complex_rail_generator
+from flatland.envs.schedule_generators import complex_rail_generator_agents_placer
 from utils.observation_utils import norm_obs_clip, split_tree
 
 
-- 
GitLab