Merge pull request #260 from StanfordVL/melt-cook-mutually-exclusive

Melt cook mutually exclusive
StanfordVL · Feb 23, 2024 · 249a682 · 249a682
2 parents c009ba4 + 8ac4045
commit 249a682
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/bddl/activity_definitions/make_baked_pears/problem0.bddl b/bddl/activity_definitions/make_baked_pears/problem0.bddl
@@ -7,7 +7,6 @@
         cooked__red_wine.n.01_1 - cooked__red_wine.n.01
         granulated_sugar.n.01_1 - granulated_sugar.n.01
         granulated_sugar__sack.n.01_1 - granulated_sugar__sack.n.01
-        cooked__granulated_sugar.n.01_1 - cooked__granulated_sugar.n.01
         wooden_spoon.n.02_1 - wooden_spoon.n.02
         wine_bottle.n.01_1 - wine_bottle.n.01
     	oven.n.01_1 - oven.n.01
@@ -48,7 +47,6 @@
         (inroom cabinet.n.01_1 kitchen) 
         (inroom floor.n.01_1 kitchen) 
         (future cooked__red_wine.n.01_1)
-        (future cooked__granulated_sugar.n.01_1)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 
@@ -58,18 +56,12 @@
                 (real ?cooked__red_wine.n.01_1)
                 (real ?red_wine.n.01_1)
             )
-            (or
-                (real ?cooked__granulated_sugar.n.01_1)
-                (real ?granulated_sugar.n.01_1)
-            )
+            (real ?granulated_sugar.n.01_1)
             (forall 
                 (?pear.n.01 - pear.n.01)
                 (and
                     (cooked ?pear.n.01)
-                    (or 
-                        (covered ?pear.n.01 ?cooked__granulated_sugar.n.01_1)
-                        (covered ?pear.n.01 ?granulated_sugar.n.01_1)
-                    )
+                    (covered ?pear.n.01 ?granulated_sugar.n.01_1)
                     (or 
                         (covered ?pear.n.01 ?cooked__red_wine.n.01_1)
                         (covered ?pear.n.01 ?red_wine.n.01_1)

diff --git a/bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl b/bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl
@@ -3,7 +3,6 @@
 
     (:objects
         melted__butter.n.01_1 - melted__butter.n.01
-        cooked__melted__butter.n.01_1 - cooked__melted__butter.n.01
         lemon-pepper_seasoning.n.01_1 - lemon-pepper_seasoning.n.01
         cooked__lemon-pepper_seasoning.n.01_1 - cooked__lemon-pepper_seasoning.n.01
         chicken_wing.n.01_1 chicken_wing.n.01_2 chicken_wing.n.01_3 chicken_wing.n.01_4 chicken_wing.n.01_5 chicken_wing.n.01_6 chicken_wing.n.01_7 chicken_wing.n.01_8 - chicken_wing.n.01
@@ -74,7 +73,6 @@
         (ontop frying_pan.n.01_1 countertop.n.01_2) 
         (future cooked__lemon-pepper_seasoning.n.01_1) 
         (future cooked__olive_oil.n.01_1) 
-        (future cooked__melted__butter.n.01_1) 
         (future cooked__salt.n.01_1) 
         (inroom floor.n.01_1 kitchen) 
         (inroom countertop.n.01_1 kitchen) 
@@ -94,10 +92,7 @@
                 (real ?olive_oil.n.01_1) 
                 (real ?cooked__olive_oil.n.01_1)
             ) 
-            (or 
-                (real ?melted__butter.n.01_1) 
-                (real ?cooked__melted__butter.n.01_1)
-            ) 
+            (real ?melted__butter.n.01_1) 
             (or 
                 (real ?salt.n.02_1) 
                 (real ?cooked__salt.n.01_1)
@@ -114,10 +109,7 @@
                         (covered ?chicken_wing.n.01 ?olive_oil.n.01_1) 
                         (covered ?chicken_wing.n.01 ?cooked__olive_oil.n.01_1)
                     ) 
-                    (or 
-                        (covered ?chicken_wing.n.01 ?melted__butter.n.01_1) 
-                        (covered ?chicken_wing.n.01 ?cooked__melted__butter.n.01_1)
-                    ) 
+                    (covered ?chicken_wing.n.01 ?melted__butter.n.01_1) 
                     (or 
                         (covered ?chicken_wing.n.01 ?salt.n.02_1) 
                         (covered ?chicken_wing.n.01 ?cooked__salt.n.01_1)

diff --git a/bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl b/bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl
@@ -91,10 +91,7 @@
             (forpairs 
                 (?half__feta.n.01 - half__feta.n.01)
                 (?bowl.n.01 - bowl.n.01)
-                (and
-                    (cooked ?half__feta.n.01)
-                    (inside ?half__feta.n.01 ?bowl.n.01)
-                )
+                (inside ?half__feta.n.01 ?bowl.n.01)
             )
         )
     )