From 03f9b70a6bec45ddf513ec06718ad3900e98cc39 Mon Sep 17 00:00:00 2001
From: Jaeyoung Lee <jyounglee@yonsei.ac.kr>
Date: Wed, 10 Jul 2019 19:04:02 -0400
Subject: [PATCH] Refactoring (env -> worlds)

---
 high_level_policy_main.py                           |   4 ++--
 low_level_policy_main.py                            |   4 ++--
 mcts.py                                             |   4 ++--
 options/simple_intersection/maneuver_base.py        |   6 +++---
 options/simple_intersection/maneuvers.py            |   6 +++---
 ppo2_training.py                                    |   4 ++--
 {env => worlds}/__init__.py                         |   0
 {env => worlds}/env_base.py                         |   0
 {env => worlds}/road_env.py                         |   0
 {env => worlds}/simple_intersection/__init__.py     |   0
 {env => worlds}/simple_intersection/constants.py    |   0
 {env => worlds}/simple_intersection/features.py     |   0
 .../simple_intersection/graphics/background.png     | Bin
 .../simple_intersection/graphics/car_agent.png      | Bin
 .../simple_intersection/graphics/ego_vehicle.png    | Bin
 .../simple_intersection/graphics/ego_vehicle.svg    |   0
 .../simple_intersection/graphics/other_vehicle.svg  |   0
 .../simple_intersection/graphics/road_texture.png   | Bin
 .../simple_intersection/road_geokinemetry.py        |   0
 .../simple_intersection/road_networks.py            |   0
 {env => worlds}/simple_intersection/shapes.py       |   0
 .../simple_intersection/simple_intersection_env.py  |   2 +-
 {env => worlds}/simple_intersection/utilities.py    |   0
 .../simple_intersection/vehicle_networks.py         |   0
 {env => worlds}/simple_intersection/vehicles.py     |   0
 25 files changed, 15 insertions(+), 15 deletions(-)
 rename {env => worlds}/__init__.py (100%)
 rename {env => worlds}/env_base.py (100%)
 rename {env => worlds}/road_env.py (100%)
 rename {env => worlds}/simple_intersection/__init__.py (100%)
 rename {env => worlds}/simple_intersection/constants.py (100%)
 rename {env => worlds}/simple_intersection/features.py (100%)
 rename {env => worlds}/simple_intersection/graphics/background.png (100%)
 rename {env => worlds}/simple_intersection/graphics/car_agent.png (100%)
 rename {env => worlds}/simple_intersection/graphics/ego_vehicle.png (100%)
 rename {env => worlds}/simple_intersection/graphics/ego_vehicle.svg (100%)
 rename {env => worlds}/simple_intersection/graphics/other_vehicle.svg (100%)
 rename {env => worlds}/simple_intersection/graphics/road_texture.png (100%)
 rename {env => worlds}/simple_intersection/road_geokinemetry.py (100%)
 rename {env => worlds}/simple_intersection/road_networks.py (100%)
 rename {env => worlds}/simple_intersection/shapes.py (100%)
 rename {env => worlds}/simple_intersection/simple_intersection_env.py (99%)
 rename {env => worlds}/simple_intersection/utilities.py (100%)
 rename {env => worlds}/simple_intersection/vehicle_networks.py (100%)
 rename {env => worlds}/simple_intersection/vehicles.py (100%)

diff --git a/high_level_policy_main.py b/high_level_policy_main.py
index 45893b4..b6183c0 100644
--- a/high_level_policy_main.py
+++ b/high_level_policy_main.py
@@ -1,5 +1,5 @@
-from env.simple_intersection import SimpleIntersectionEnv
-from env.simple_intersection.constants import *
+from worlds.simple_intersection import SimpleIntersectionEnv
+from worlds.simple_intersection.constants import *
 from options.options_loader import OptionsGraph
 from backends.kerasrl_learner import DQNLearner
 import os
diff --git a/low_level_policy_main.py b/low_level_policy_main.py
index d5cded2..80cff3b 100644
--- a/low_level_policy_main.py
+++ b/low_level_policy_main.py
@@ -1,5 +1,5 @@
-from env.simple_intersection import SimpleIntersectionEnv
-from env.simple_intersection.constants import *
+from worlds.simple_intersection import SimpleIntersectionEnv
+from worlds.simple_intersection.constants import *
 from options.options_loader import OptionsGraph
 from backends.kerasrl_learner import DDPGLearner
 from rl.callbacks import Callback
diff --git a/mcts.py b/mcts.py
index 7efab0b..8fd842e 100644
--- a/mcts.py
+++ b/mcts.py
@@ -1,5 +1,5 @@
-from env.simple_intersection import SimpleIntersectionEnv
-from env.simple_intersection.constants import DT
+from worlds.simple_intersection import SimpleIntersectionEnv
+from worlds.simple_intersection.constants import DT
 from options.options_loader import OptionsGraph
 from backends import DDPGLearner, DQNLearner, MCTSLearner
 import numpy as np
diff --git a/options/simple_intersection/maneuver_base.py b/options/simple_intersection/maneuver_base.py
index c680f33..9f09d0d 100644
--- a/options/simple_intersection/maneuver_base.py
+++ b/options/simple_intersection/maneuver_base.py
@@ -1,8 +1,8 @@
 import numpy as np
 import gym
-import env.simple_intersection.road_geokinemetry as rd
-from env.simple_intersection.constants import DT, MAX_ACCELERATION, MAX_STEERING_ANGLE_RATE, MAX_STEERING_ANGLE
-from env import EpisodicEnvBase
+import worlds.simple_intersection.road_geokinemetry as rd
+from worlds.simple_intersection.constants import DT, MAX_ACCELERATION, MAX_STEERING_ANGLE_RATE, MAX_STEERING_ANGLE
+from worlds import EpisodicEnvBase
 
 
 class ManeuverBase(EpisodicEnvBase):
diff --git a/options/simple_intersection/maneuvers.py b/options/simple_intersection/maneuvers.py
index b532dcc..1702cd5 100644
--- a/options/simple_intersection/maneuvers.py
+++ b/options/simple_intersection/maneuvers.py
@@ -1,7 +1,7 @@
 from .maneuver_base import ManeuverBase
-from env.simple_intersection.constants import *
-import env.simple_intersection.road_geokinemetry as rd
-from env.simple_intersection.features import extract_ego_features, extract_other_veh_features
+from worlds.simple_intersection.constants import *
+import worlds.simple_intersection.road_geokinemetry as rd
+from worlds.simple_intersection.features import extract_ego_features, extract_other_veh_features
 from verifier.simple_intersection import LTLProperty
 
 import numpy as np
diff --git a/ppo2_training.py b/ppo2_training.py
index 269b7fd..4560238 100644
--- a/ppo2_training.py
+++ b/ppo2_training.py
@@ -1,5 +1,5 @@
-from env.simple_intersection import SimpleIntersectionEnv
-from env.simple_intersection.constants import *
+from worlds.simple_intersection import SimpleIntersectionEnv
+from worlds.simple_intersection.constants import *
 from options.options_loader import OptionsGraph
 from backends.baselines_learner import PPO2Agent
 
diff --git a/env/__init__.py b/worlds/__init__.py
similarity index 100%
rename from env/__init__.py
rename to worlds/__init__.py
diff --git a/env/env_base.py b/worlds/env_base.py
similarity index 100%
rename from env/env_base.py
rename to worlds/env_base.py
diff --git a/env/road_env.py b/worlds/road_env.py
similarity index 100%
rename from env/road_env.py
rename to worlds/road_env.py
diff --git a/env/simple_intersection/__init__.py b/worlds/simple_intersection/__init__.py
similarity index 100%
rename from env/simple_intersection/__init__.py
rename to worlds/simple_intersection/__init__.py
diff --git a/env/simple_intersection/constants.py b/worlds/simple_intersection/constants.py
similarity index 100%
rename from env/simple_intersection/constants.py
rename to worlds/simple_intersection/constants.py
diff --git a/env/simple_intersection/features.py b/worlds/simple_intersection/features.py
similarity index 100%
rename from env/simple_intersection/features.py
rename to worlds/simple_intersection/features.py
diff --git a/env/simple_intersection/graphics/background.png b/worlds/simple_intersection/graphics/background.png
similarity index 100%
rename from env/simple_intersection/graphics/background.png
rename to worlds/simple_intersection/graphics/background.png
diff --git a/env/simple_intersection/graphics/car_agent.png b/worlds/simple_intersection/graphics/car_agent.png
similarity index 100%
rename from env/simple_intersection/graphics/car_agent.png
rename to worlds/simple_intersection/graphics/car_agent.png
diff --git a/env/simple_intersection/graphics/ego_vehicle.png b/worlds/simple_intersection/graphics/ego_vehicle.png
similarity index 100%
rename from env/simple_intersection/graphics/ego_vehicle.png
rename to worlds/simple_intersection/graphics/ego_vehicle.png
diff --git a/env/simple_intersection/graphics/ego_vehicle.svg b/worlds/simple_intersection/graphics/ego_vehicle.svg
similarity index 100%
rename from env/simple_intersection/graphics/ego_vehicle.svg
rename to worlds/simple_intersection/graphics/ego_vehicle.svg
diff --git a/env/simple_intersection/graphics/other_vehicle.svg b/worlds/simple_intersection/graphics/other_vehicle.svg
similarity index 100%
rename from env/simple_intersection/graphics/other_vehicle.svg
rename to worlds/simple_intersection/graphics/other_vehicle.svg
diff --git a/env/simple_intersection/graphics/road_texture.png b/worlds/simple_intersection/graphics/road_texture.png
similarity index 100%
rename from env/simple_intersection/graphics/road_texture.png
rename to worlds/simple_intersection/graphics/road_texture.png
diff --git a/env/simple_intersection/road_geokinemetry.py b/worlds/simple_intersection/road_geokinemetry.py
similarity index 100%
rename from env/simple_intersection/road_geokinemetry.py
rename to worlds/simple_intersection/road_geokinemetry.py
diff --git a/env/simple_intersection/road_networks.py b/worlds/simple_intersection/road_networks.py
similarity index 100%
rename from env/simple_intersection/road_networks.py
rename to worlds/simple_intersection/road_networks.py
diff --git a/env/simple_intersection/shapes.py b/worlds/simple_intersection/shapes.py
similarity index 100%
rename from env/simple_intersection/shapes.py
rename to worlds/simple_intersection/shapes.py
diff --git a/env/simple_intersection/simple_intersection_env.py b/worlds/simple_intersection/simple_intersection_env.py
similarity index 99%
rename from env/simple_intersection/simple_intersection_env.py
rename to worlds/simple_intersection/simple_intersection_env.py
index f310fc0..5b1994e 100644
--- a/env/simple_intersection/simple_intersection_env.py
+++ b/worlds/simple_intersection/simple_intersection_env.py
@@ -2,7 +2,7 @@ import pyglet
 import gym
 from copy import deepcopy
 
-from env import RoadEnv, EpisodicEnvBase
+from worlds import RoadEnv, EpisodicEnvBase
 
 from .vehicles import Vehicle
 from .utilities import calculate_s, calculate_v_max
diff --git a/env/simple_intersection/utilities.py b/worlds/simple_intersection/utilities.py
similarity index 100%
rename from env/simple_intersection/utilities.py
rename to worlds/simple_intersection/utilities.py
diff --git a/env/simple_intersection/vehicle_networks.py b/worlds/simple_intersection/vehicle_networks.py
similarity index 100%
rename from env/simple_intersection/vehicle_networks.py
rename to worlds/simple_intersection/vehicle_networks.py
diff --git a/env/simple_intersection/vehicles.py b/worlds/simple_intersection/vehicles.py
similarity index 100%
rename from env/simple_intersection/vehicles.py
rename to worlds/simple_intersection/vehicles.py
-- 
GitLab