From 3c84ba483ba5283a209f141c80fee1251eb238fd Mon Sep 17 00:00:00 2001
From: Steffen Illium <steffen.illium@ifi.lmu.de>
Date: Wed, 24 Nov 2021 17:59:02 +0100
Subject: [PATCH] param update
---
reload_agent.py | 5 ++---
studies/e_1.py | 12 +++++-------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/reload_agent.py b/reload_agent.py
index ac66fc1..2a7a94c 100644
--- a/reload_agent.py
+++ b/reload_agent.py
@@ -50,9 +50,8 @@ if __name__ == '__main__':
rew, done_bool = 0, False
while not done_bool:
if n_agents > 1:
- actions = [model.predict(
- np.stack([env_state[i][j] for i in range(env_state.shape[0])]),
- deterministic=determin)[0] for j, model in enumerate(models)]
+ actions = [model.predict(env_state[model_idx], deterministic=True)[0]
+ for model_idx, model in enumerate(models)]
else:
actions = models[0].predict(env_state, deterministic=determin)[0]
env_state, step_r, done_bool, info_obj = env.step(actions)
diff --git a/studies/e_1.py b/studies/e_1.py
index 62ed7d4..aea573e 100644
--- a/studies/e_1.py
+++ b/studies/e_1.py
@@ -121,8 +121,7 @@ def load_model_run_baseline(seed_path, env_to_run):
if done_bool:
break
print(f'Factory run {episode} done, reward is:\n {rew}')
- monitored_env_factory.save_run(filepath=seed_path / f'{ood_monitor_file}.pick')
-
+ monitored_env_factory.save_run(filepath=seed_path / f'{baseline_monitor_file}.pick')
def load_model_run_study(seed_path, env_to_run, additional_kwargs_dict):
@@ -147,9 +146,8 @@ def load_model_run_study(seed_path, env_to_run, additional_kwargs_dict):
rew, done_bool = 0, False
while not done_bool:
try:
- actions = [model.predict(
- np.stack([env_state[i][j] for i in range(env_state.shape[0])]),
- deterministic=True)[0] for j, model in enumerate(models)]
+ actions = [model.predict(env_state[model_idx], deterministic=True)[0]
+ for model_idx, model in enumerate(models)]
except ValueError as e:
print(e)
print('Env_Kwargs are:\n')
@@ -205,7 +203,7 @@ if __name__ == '__main__':
frames_to_stack = 3
# Define a global studi save path
- start_time = 'obs_stack_3_gae_0.25_n_steps_16' # int(time.time())
+ start_time = 'adam_no_weight_decay' # int(time.time())
study_root_path = Path(__file__).parent.parent / 'study_out' / f'{Path(__file__).stem}_{start_time}'
# Define Global Env Parameters
@@ -228,7 +226,7 @@ if __name__ == '__main__':
spawn_frequency=30, n_drop_off_locations=2,
max_agent_inventory_capacity=15)
factory_kwargs = dict(n_agents=1, max_steps=400, parse_doors=True,
- level_name='rooms', record_episodes=False, doors_have_area=True,
+ level_name='rooms', doors_have_area=True,
verbose=False,
mv_prop=move_props,
obs_prop=obs_props,