From cf18e049dc4bc521e7ba537a080fa71268741e6c Mon Sep 17 00:00:00 2001 From: LauraRuis Date: Tue, 19 Apr 2022 14:49:33 +0100 Subject: [PATCH 1/4] change dynamics to automatically begin cooking if recipe is done --- src/overcooked_ai_py/mdp/overcooked_mdp.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/overcooked_ai_py/mdp/overcooked_mdp.py b/src/overcooked_ai_py/mdp/overcooked_mdp.py index fb6cd925..e69c91a1 100644 --- a/src/overcooked_ai_py/mdp/overcooked_mdp.py +++ b/src/overcooked_ai_py/mdp/overcooked_mdp.py @@ -1197,6 +1197,10 @@ def resolve_interacts(self, new_state, joint_action, events_infos): soup.add_ingredient(obj) shaped_reward[player_idx] += self.reward_shaping_params["PLACEMENT_IN_POT_REW"] + # Start cooking without extra INTERACT action if recipe is done + if self.soup_to_be_cooked_at_location(new_state, i_pos) and soup.is_full and soup.is_valid: + soup.begin_cooking() + # Log potting self.log_object_potting(events_infos, new_state, old_soup, soup, obj.name, player_idx) if obj.name == Recipe.ONION: From 9a847159c195c92c30dc48479e18019f4a54d3d1 Mon Sep 17 00:00:00 2001 From: Akbir Date: Tue, 19 Apr 2022 14:59:49 +0100 Subject: [PATCH 2/4] add default recipe config --- src/overcooked_ai_py/mdp/overcooked_mdp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/overcooked_ai_py/mdp/overcooked_mdp.py b/src/overcooked_ai_py/mdp/overcooked_mdp.py index e69c91a1..047cd452 100644 --- a/src/overcooked_ai_py/mdp/overcooked_mdp.py +++ b/src/overcooked_ai_py/mdp/overcooked_mdp.py @@ -22,7 +22,8 @@ class Recipe: def __new__(cls, ingredients): if not cls._configured: - raise ValueError("Recipe class must be configured before recipes can be created") + cls.configure({}) + # raise ValueError("Recipe class must be configured before recipes can be created") # Some basic argument verification if not ingredients or not hasattr(ingredients, '__iter__') or len(ingredients) == 0: raise ValueError("Invalid input recipe. Must be ingredients iterable with non-zero length") From 72ad8c4142c630c8a48a602bab7761e916765b7e Mon Sep 17 00:00:00 2001 From: LauraRuis Date: Tue, 19 Apr 2022 15:24:54 +0100 Subject: [PATCH 3/4] add trajcetory key for purpose of testing human data trajectories --- src/overcooked_ai_py/mdp/overcooked_trajectory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overcooked_ai_py/mdp/overcooked_trajectory.py b/src/overcooked_ai_py/mdp/overcooked_trajectory.py index 158a3b24..ff7c60d0 100644 --- a/src/overcooked_ai_py/mdp/overcooked_trajectory.py +++ b/src/overcooked_ai_py/mdp/overcooked_trajectory.py @@ -31,7 +31,7 @@ } """ -TIMESTEP_TRAJ_KEYS = set(["ep_states", "ep_actions", "ep_rewards", "ep_dones", "ep_infos"]) +TIMESTEP_TRAJ_KEYS = set(["ep_states", "ep_actions", "ep_other_actions", "ep_rewards", "ep_dones", "ep_infos"]) EPISODE_TRAJ_KEYS = set(["ep_returns", "ep_lengths", "mdp_params", "env_params"]) DEFAULT_TRAJ_KEYS = set(list(TIMESTEP_TRAJ_KEYS) + list(EPISODE_TRAJ_KEYS) + ["metadatas"]) From 1e8b40869d42a214f3840074ffcd8baf0bd6c726 Mon Sep 17 00:00:00 2001 From: LauraRuis Date: Tue, 19 Apr 2022 15:36:18 +0100 Subject: [PATCH 4/4] add timestep trajectory key for purpose of testing human trajectories in bronson/process_human_data.py --- src/overcooked_ai_py/mdp/overcooked_trajectory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overcooked_ai_py/mdp/overcooked_trajectory.py b/src/overcooked_ai_py/mdp/overcooked_trajectory.py index 158a3b24..ff7c60d0 100644 --- a/src/overcooked_ai_py/mdp/overcooked_trajectory.py +++ b/src/overcooked_ai_py/mdp/overcooked_trajectory.py @@ -31,7 +31,7 @@ } """ -TIMESTEP_TRAJ_KEYS = set(["ep_states", "ep_actions", "ep_rewards", "ep_dones", "ep_infos"]) +TIMESTEP_TRAJ_KEYS = set(["ep_states", "ep_actions", "ep_other_actions", "ep_rewards", "ep_dones", "ep_infos"]) EPISODE_TRAJ_KEYS = set(["ep_returns", "ep_lengths", "mdp_params", "env_params"]) DEFAULT_TRAJ_KEYS = set(list(TIMESTEP_TRAJ_KEYS) + list(EPISODE_TRAJ_KEYS) + ["metadatas"])