From 5ff4b42c0ee7ba2d4b5bb80a95f5a745317c49d4 Mon Sep 17 00:00:00 2001
From: ebuehrle <43623224+ebuehrle@users.noreply.github.com>
Date: Wed, 8 Sep 2021 20:45:45 +0200
Subject: [PATCH] Fix imports

---
 scratch/etienne/intersimple/data/generate.sh              | 8 ++++----
 scratch/etienne/intersimple/gail_image.py                 | 2 +-
 scratch/etienne/intersimple/ppo_speed_image_lowres.py     | 2 +-
 .../etienne/intersimple/ppo_speed_image_lowres_random.py  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scratch/etienne/intersimple/data/generate.sh b/scratch/etienne/intersimple/data/generate.sh
index ef44050..bef27c7 100644
--- a/scratch/etienne/intersimple/data/generate.sh
+++ b/scratch/etienne/intersimple/data/generate.sh
@@ -1,4 +1,4 @@
-#python -m intersimple.expert --env=IntersimpleReward --min_timesteps=200 --env_args='{agent:51}' --path='NormalizedIntersimpleExpert_IntersimpleRewardAgent51.pkl'
-#python -m intersimple.expert --env=IntersimpleReward --min_timesteps=200 --env_args='{agent:51}' --policy_args='{mu:0.005}' --path='NormalizedIntersimpleExpert_IntersimpleRewardAgent51Mu.005.pkl'
-#python -m intersimple.expert --env=IntersimpleReward --min_timesteps=200 --env_args='{agent:51}' --policy_args='{mu:0.001}' --path='NormalizedIntersimpleExpert_IntersimpleRewardAgent51Mu.001.pkl'
-python -m intersimple.expert --env=NRasterized --min_timesteps=200 --env_args='{agent:51,width:36,height:36,m_per_px:2}' --policy_args='{mu:0.001}' --path='NormalizedIntersimpleExpertMu.001_NRasterizedAgent51w36h36mppx2.pkl'
+#python -m expert --env=IntersimpleReward --min_timesteps=200 --env_args='{agent:51}' --path='NormalizedIntersimpleExpert_IntersimpleRewardAgent51.pkl'
+#python -m expert --env=IntersimpleReward --min_timesteps=200 --env_args='{agent:51}' --policy_args='{mu:0.005}' --path='NormalizedIntersimpleExpert_IntersimpleRewardAgent51Mu.005.pkl'
+#python -m expert --env=IntersimpleReward --min_timesteps=200 --env_args='{agent:51}' --policy_args='{mu:0.001}' --path='NormalizedIntersimpleExpert_IntersimpleRewardAgent51Mu.001.pkl'
+python -m expert --env=NRasterized --min_timesteps=200 --env_args='{agent:51,width:36,height:36,m_per_px:2}' --policy_args='{mu:0.001}' --path='NormalizedIntersimpleExpertMu.001_NRasterizedAgent51w36h36mppx2.pkl'
diff --git a/scratch/etienne/intersimple/gail_image.py b/scratch/etienne/intersimple/gail_image.py
index 2054ae6..a1ea3d5 100644
--- a/scratch/etienne/intersimple/gail_image.py
+++ b/scratch/etienne/intersimple/gail_image.py
@@ -10,7 +10,7 @@ from imitation.algorithms import adversarial, bc
 from imitation.data import rollout
 from imitation.util import logger
 
-from intersimple.intersimple import NRasterized
+from intersim.envs.intersimple import NRasterized
 
 from gail.discriminator import CnnDiscriminator
 
diff --git a/scratch/etienne/intersimple/ppo_speed_image_lowres.py b/scratch/etienne/intersimple/ppo_speed_image_lowres.py
index dbf4ec1..3549440 100644
--- a/scratch/etienne/intersimple/ppo_speed_image_lowres.py
+++ b/scratch/etienne/intersimple/ppo_speed_image_lowres.py
@@ -1,6 +1,6 @@
 # %%
 from stable_baselines3 import PPO
-from intersimple.intersimple import NRasterized, speed_reward
+from intersim.envs.intersimple import NRasterized, speed_reward
 import functools
 
 model_name = "ppo_speed_image_lowres"
diff --git a/scratch/etienne/intersimple/ppo_speed_image_lowres_random.py b/scratch/etienne/intersimple/ppo_speed_image_lowres_random.py
index 64ea9be..3b362bd 100644
--- a/scratch/etienne/intersimple/ppo_speed_image_lowres_random.py
+++ b/scratch/etienne/intersimple/ppo_speed_image_lowres_random.py
@@ -1,6 +1,6 @@
 # %%
 from stable_baselines3 import PPO
-from intersimple.intersimple import NRasterizedRandomAgent, speed_reward
+from intersim.envs.intersimple import NRasterizedRandomAgent, speed_reward
 import functools
 
 model_name = "ppo_speed_image_lowres_random"