Merge pull request #56 from StanfordVL/fix/bddl-errors

Fix/bddl errors
StanfordVL · Jul 28, 2023 · 5328f71 · 5328f71
2 parents 903224a + ecda787
commit 5328f71
Show file tree

Hide file tree

Showing 31 changed files with 65 additions and 75 deletions.
diff --git a/bddl/activity_definitions/buy_food_for_camping/problem0.bddl b/bddl/activity_definitions/buy_food_for_camping/problem0.bddl
@@ -41,8 +41,7 @@
     )
 
     (:goal 
-        (and 
-            (open ?cash_register.n.01_1) 
+        (and
             (forall 
                 (?water_bottle.n.01 - water_bottle.n.01) 
                 (ontop ?water_bottle.n.01 ?checkout.n.03_1)
@@ -66,7 +65,7 @@
             (ontop ?canned_food.n.01_1 ?checkout.n.03_1) 
             (forall 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
             )
 

diff --git a/bddl/activity_definitions/buy_meat_from_a_butcher/problem0.bddl b/bddl/activity_definitions/buy_meat_from_a_butcher/problem0.bddl
@@ -41,18 +41,17 @@
     )
 
     (:goal 
-        (and 
-            (open ?cash_register.n.01_1) 
+        (and
             (forn 
                 (5) 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
             ) 
             (forn 
                 (1) 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?checkout.n.03_1)
+                (nextto ?money.n.01 ?checkout.n.03_1)
 
             ) 
             (forall 

diff --git a/bddl/activity_definitions/buy_natural_beef/problem0.bddl b/bddl/activity_definitions/buy_natural_beef/problem0.bddl
@@ -29,13 +29,12 @@
     )
 
     (:goal 
-        (and 
-            (open ?cash_register.n.01_1) 
+        (and
             (ontop ?pack__of__ground_beef.n.01_1 ?checkout.n.03_1)
             (ontop ?pack__of__ground_beef.n.01_2 ?checkout.n.03_1)
             (forall 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
             ) 
             (not 

diff --git a/bddl/activity_definitions/buy_natural_supplements/problem0.bddl b/bddl/activity_definitions/buy_natural_supplements/problem0.bddl
@@ -31,8 +31,7 @@
     )
 
     (:goal 
-        (and 
-            (open ?cash_register.n.01_1) 
+        (and
             (ontop ?sack.n.01_1 ?checkout.n.03_1) 
             (forall 
                 (?bottle__of__supplements.n.01 - bottle__of__supplements.n.01) 
@@ -41,7 +40,7 @@
             ) 
             (forall 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
             )
 

diff --git a/bddl/activity_definitions/buy_school_supplies/problem0.bddl b/bddl/activity_definitions/buy_school_supplies/problem0.bddl
@@ -42,8 +42,7 @@
     )
 
     (:goal 
-        (and 
-            (open ?cash_register.n.01_1) 
+        (and
             (ontop ?bottle__of__glue.n.01_1 ?checkout.n.03_1) 
             (ontop ?notebook.n.01_1 ?checkout.n.03_1) 
             (ontop ?notebook.n.01_2 ?checkout.n.03_1) 
@@ -54,7 +53,7 @@
             (nextto ?eraser.n.01_1 ?pencil_box.n.01_1) 
             (forall 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
             )
 

diff --git a/bddl/activity_definitions/buy_used_gardening_equipment/problem0.bddl b/bddl/activity_definitions/buy_used_gardening_equipment/problem0.bddl
@@ -39,10 +39,9 @@
         (and 
             (forall 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
-            ) 
-            (open ?cash_register.n.01_1) 
+            )
             (ontop ?trowel.n.01_1 ?checkout.n.03_1) 
             (ontop ?watering_can.n.01_1 ?checkout.n.03_1) 
             (ontop ?pruner.n.02_1 ?checkout.n.03_1) 

diff --git a/bddl/activity_definitions/buying_gardening_supplies/problem0.bddl b/bddl/activity_definitions/buying_gardening_supplies/problem0.bddl
@@ -51,11 +51,9 @@
             (ontop ?pot_plant.n.01_1 ?checkout.n.03_1) 
             (ontop ?pot_plant.n.01_2 ?checkout.n.03_1) 
             (ontop ?pot_plant.n.01_3 ?shelf.n.01_3)
-
-            (open ?cash_register.n.01_1) 
             (forall 
                 (?money.n.01 - money.n.01) 
-                (ontop ?money.n.01 ?cash_register.n.01_1)
+                (nextto ?money.n.01 ?cash_register.n.01_1)
 
             ) 
         )

diff --git a/bddl/activity_definitions/clean_a_baseball_glove/problem0.bddl b/bddl/activity_definitions/clean_a_baseball_glove/problem0.bddl
@@ -15,8 +15,8 @@
     )
 
     (:init 
-        (inside baseball_glove.n.01_1 sink.n.01_1) 
-        (inside rag.n.01_1 sink.n.01_1) 
+        (ontop baseball_glove.n.01_1 sink.n.01_1)
+        (ontop rag.n.01_1 sink.n.01_1)
         (filled disinfectant__bottle.n.01_2 saddle_soap.n.01_1) 
         (not 
             (covered baseball_glove.n.01_1 disinfectant.n.01_1)

diff --git a/bddl/activity_definitions/clean_a_blender/problem0.bddl b/bddl/activity_definitions/clean_a_blender/problem0.bddl
@@ -15,7 +15,7 @@
     )
 
     (:init 
-        (inside blender.n.01_1 sink.n.01_1) 
+        (ontop blender.n.01_1 sink.n.01_1)
         (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1)
         (ontop liquid_soap__bottle.n.01_1 countertop.n.01_1)
         (ontop sponge.n.01_1 countertop.n.01_1) 

diff --git a/bddl/activity_definitions/clean_a_hot_water_dispenser/problem0.bddl b/bddl/activity_definitions/clean_a_hot_water_dispenser/problem0.bddl
@@ -12,7 +12,7 @@
 
     (:init 
         (covered sink.n.01_1 dust.n.01_1) 
-        (inside rag.n.01_1 sink.n.01_1) 
+        (ontop rag.n.01_1 sink.n.01_1)
         (insource sink.n.01_1 water.n.06_1)
         (inroom floor.n.01_1 kitchen) 
         (inroom sink.n.01_1 kitchen) 

diff --git a/bddl/activity_definitions/clean_a_kitchen_sink/problem0.bddl b/bddl/activity_definitions/clean_a_kitchen_sink/problem0.bddl
@@ -21,9 +21,9 @@
         (covered sink.n.01_1 crumb.n.03_1) 
         (ontop sponge.n.01_1 countertop.n.01_1)
         (ontop compost_bin.n.01_1 floor.n.01_1)
-        (inside spinach.n.02_1 sink.n.01_1) 
-        (inside spinach.n.02_2 sink.n.01_1) 
-        (inside spinach.n.02_3 sink.n.01_1) 
+        (ontop spinach.n.02_1 sink.n.01_1)
+        (ontop spinach.n.02_2 sink.n.01_1)
+        (ontop spinach.n.02_3 sink.n.01_1)
         (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1) 
         (ontop liquid_soap__bottle.n.01_1 countertop.n.01_1)
         (insource sink.n.01_1 water.n.06_1) 

diff --git a/bddl/activity_definitions/clean_a_kitchen_table/problem0.bddl b/bddl/activity_definitions/clean_a_kitchen_table/problem0.bddl
@@ -43,7 +43,7 @@
             )
             (or
                 (inside ?chopping_board.n.01_1 ?sink.n.01_1)
-                (nextto ?chopping_board.n.01_1 ?sink.n.01_1)
+                (ontop ?chopping_board.n.01_1 ?sink.n.01_1)
             )
         )
     )

diff --git a/bddl/activity_definitions/clean_a_loofah_or_natural_sponge/problem0.bddl b/bddl/activity_definitions/clean_a_loofah_or_natural_sponge/problem0.bddl
@@ -17,8 +17,8 @@
         (covered loofa.n.01_1 stain.n.01_1)
         (insource bleaching_agent__atomizer.n.01_1 bleaching_agent.n.01_1)
         (ontop bleaching_agent__atomizer.n.01_1 floor.n.01_1)
-        (inside loofa.n.01_1 sink.n.01_1)
-        (inside rag.n.01_1 sink.n.01_1) 
+        (ontop loofa.n.01_1 sink.n.01_1)
+        (ontop rag.n.01_1 sink.n.01_1)
         (insource sink.n.01_1 water.n.06_1) 
         (inroom sink.n.01_1 bathroom) 
         (inroom floor.n.01_1 bathroom) 

diff --git a/bddl/activity_definitions/clean_a_mousepad/problem0.bddl b/bddl/activity_definitions/clean_a_mousepad/problem0.bddl
@@ -14,7 +14,7 @@
     (:init 
         (covered mousepad.n.01_1 dust.n.01_1) 
         (ontop rag.n.01_1 mousepad.n.01_1) 
-        (inside mousepad.n.01_1 sink.n.01_1) 
+        (ontop mousepad.n.01_1 sink.n.01_1)
         (insource sink.n.01_1 water.n.06_1) 
         (inroom sink.n.01_1 bathroom) 
         (inroom floor.n.01_1 bathroom) 

diff --git a/bddl/activity_definitions/clean_a_razor_blade/problem0.bddl b/bddl/activity_definitions/clean_a_razor_blade/problem0.bddl
@@ -20,7 +20,7 @@
         (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1) 
         (ontop liquid_soap__bottle.n.01_1 floor.n.01_1)
         (ontop rag.n.01_1 floor.n.01_1) 
-        (inside razor.n.01_1 sink.n.01_1) 
+        (ontop razor.n.01_1 sink.n.01_1)
         (insource sink.n.01_1 water.n.06_1) 
         (inroom sink.n.01_1 bathroom) 
         (inroom floor.n.01_1 bathroom) 

diff --git a/bddl/activity_definitions/clean_an_electric_kettle/problem0.bddl b/bddl/activity_definitions/clean_an_electric_kettle/problem0.bddl
@@ -31,7 +31,7 @@
 
     (:goal 
         (and 
-            (inside ?kettle.n.01_1 ?sink.n.01_1) 
+            (ontop ?kettle.n.01_1 ?sink.n.01_1)
             (not 
                 (covered ?kettle.n.01_1 ?stain.n.01_1)
             )

diff --git a/bddl/activity_definitions/clean_an_electric_razor/problem0.bddl b/bddl/activity_definitions/clean_an_electric_razor/problem0.bddl
@@ -10,22 +10,20 @@
     	hair.n.04_1 - hair.n.04
         lotion.n.01_1 - lotion.n.01
     	water.n.06_1 - water.n.06
-        wall.n.01_1 - wall.n.01
     	floor.n.01_1 - floor.n.01
     	agent.n.01_1 - agent.n.01
     )
 
     (:init 
-        (inside razor.n.01_1 sink.n.01_1) 
+        (ontop razor.n.01_1 sink.n.01_1)
         (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1) 
         (ontop liquid_soap__bottle.n.01_1 floor.n.01_1)
         (ontop tissue.n.02_1 floor.n.01_1) 
         (covered razor.n.01_1 hair.n.04_1)
         (covered razor.n.01_1 lotion.n.01_1) 
         (insource sink.n.01_1 water.n.06_1) 
         (inroom sink.n.01_1 bathroom) 
-        (inroom floor.n.01_1 bathroom) 
-        (inroom wall.n.01_1 bathroom)
+        (inroom floor.n.01_1 bathroom)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/clean_rubber_bathmats/problem0.bddl b/bddl/activity_definitions/clean_rubber_bathmats/problem0.bddl
@@ -16,7 +16,7 @@
     )
 
     (:init 
-        (inside mat.n.01_1 sink.n.01_1)
+        (ontop mat.n.01_1 sink.n.01_1)
         (ontop scrub_brush.n.01_1 floor.n.01_1) 
         (filled detergent__bottle.n.01_1 detergent.n.02_1) 
         (ontop detergent__bottle.n.01_1 floor.n.01_1) 

diff --git a/bddl/activity_definitions/clean_your_house_after_a_wild_party/problem0.bddl b/bddl/activity_definitions/clean_your_house_after_a_wild_party/problem0.bddl
@@ -33,7 +33,7 @@
         (ontop plate.n.04_2 floor.n.01_2) 
         (ontop plate.n.04_3 coffee_table.n.01_1) 
         (ontop cup.n.01_1 coffee_table.n.01_1) 
-        (inside cup.n.01_2 sink.n.01_1) 
+        (ontop cup.n.01_2 sink.n.01_1)
         (ontop cup.n.01_3 floor.n.01_1) 
         (ontop recycling_bin.n.01_1 floor.n.01_2) 
         (ontop recycling_bin.n.01_2 floor.n.01_1) 

diff --git a/bddl/activity_definitions/cleaning_bathrooms/problem0.bddl b/bddl/activity_definitions/cleaning_bathrooms/problem0.bddl
@@ -19,7 +19,7 @@
         (covered bathtub.n.01_1 stain.n.01_1) 
         (covered toilet.n.02_1 stain.n.01_1) 
         (covered floor.n.01_1 stain.n.01_1) 
-        (inside bar_soap.n.01_1 sink.n.01_1) 
+        (ontop bar_soap.n.01_1 sink.n.01_1)
         (inside scrub_brush.n.01_1 bathtub.n.01_1)
         (ontop bucket.n.01_1 floor.n.01_1) 
         (ontop rag.n.01_1 floor.n.01_1) 

diff --git a/bddl/activity_definitions/cleaning_tools_and_equipment/problem0.bddl b/bddl/activity_definitions/cleaning_tools_and_equipment/problem0.bddl
@@ -25,7 +25,7 @@
         (covered drill.n.01_1 adhesive_material.n.01_1) 
         (covered drill.n.01_1 dust.n.01_1) 
         (inside rag.n.01_1 cabinet.n.01_1) 
-        (inside toothbrush.n.01_1 sink.n.01_1)
+        (ontop toothbrush.n.01_1 sink.n.01_1)
         (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1) 
         (inside liquid_soap__bottle.n.01_1 cabinet.n.01_1)
         (ontop bucket.n.01_1 floor.n.01_1) 

diff --git a/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl b/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl
@@ -24,10 +24,10 @@
         (ontop cup.n.01_2 floor.n.01_1) 
         (ontop cup.n.01_3 electric_refrigerator.n.01_1) 
         (ontop cup.n.01_4 dishwasher.n.01_1) 
-        (inside hotdog.n.02_1 sink.n.01_1) 
-        (inside bottle__of__apple_juice.n.01_1 sink.n.01_1) 
+        (ontop hotdog.n.02_1 sink.n.01_1)
+        (ontop bottle__of__apple_juice.n.01_1 sink.n.01_1)
         (ontop broom.n.01_1 floor.n.01_1) 
-        (inside sponge.n.01_1 sink.n.01_1) 
+        (ontop sponge.n.01_1 sink.n.01_1)
         (not 
             (covered sponge.n.01_1 water.n.06_1)
         ) 

diff --git a/bddl/activity_definitions/cook_bacon/problem0.bddl b/bddl/activity_definitions/cook_bacon/problem0.bddl
@@ -3,7 +3,7 @@
 
     (:objects
         bacon.n.01_1 bacon.n.01_2 bacon.n.01_3 bacon.n.01_4 bacon.n.01_5 bacon.n.01_6 - bacon.n.01
-        aluminum_foil.n.01_1 - aluminum_foil.n.01
+        tray.n.01_1 - tray.n.01
         electric_refrigerator.n.01_1 - electric_refrigerator.n.01 
         stove.n.01_1 - stove.n.01
         griddle.n.01_1 - griddle.n.01
@@ -12,12 +12,12 @@
     )
 
     (:init 
-        (ontop bacon.n.01_1 aluminum_foil.n.01_1) 
-        (ontop bacon.n.01_2 aluminum_foil.n.01_1) 
-        (ontop bacon.n.01_3 aluminum_foil.n.01_1) 
-        (ontop bacon.n.01_4 aluminum_foil.n.01_1) 
-        (ontop bacon.n.01_5 aluminum_foil.n.01_1) 
-        (ontop bacon.n.01_6 aluminum_foil.n.01_1) 
+        (ontop bacon.n.01_1 tray.n.01_1) 
+        (ontop bacon.n.01_2 tray.n.01_1) 
+        (ontop bacon.n.01_3 tray.n.01_1) 
+        (ontop bacon.n.01_4 tray.n.01_1) 
+        (ontop bacon.n.01_5 tray.n.01_1) 
+        (ontop bacon.n.01_6 tray.n.01_1) 
         (not 
             (cooked bacon.n.01_1)
         ) 
@@ -36,7 +36,7 @@
         (not 
             (cooked bacon.n.01_6)
         ) 
-        (inside aluminum_foil.n.01_1 electric_refrigerator.n.01_1)
+        (inside tray.n.01_1 electric_refrigerator.n.01_1)
         (ontop griddle.n.01_1 stove.n.01_1)
         (inroom stove.n.01_1 kitchen) 
         (inroom electric_refrigerator.n.01_1 kitchen) 

diff --git a/bddl/activity_definitions/dispose_of_batteries/problem0.bddl b/bddl/activity_definitions/dispose_of_batteries/problem0.bddl
@@ -16,7 +16,7 @@
         (inside hand_blower.n.01_1 cabinet.n.01_1)
         (ontop battery.n.02_2 floor.n.01_1)
         (ontop razor.n.01_1 cabinet.n.01_1)
-        (inside ashcan.n.01_1 floor.n.01_1) 
+        (ontop ashcan.n.01_1 floor.n.01_1) 
         (inroom cabinet.n.01_1 bedroom) 
         (inroom floor.n.01_1 bedroom) 
         (ontop agent.n.01_1 floor.n.01_1)

diff --git a/bddl/activity_definitions/drying_dishes/problem0.bddl b/bddl/activity_definitions/drying_dishes/problem0.bddl
@@ -24,10 +24,10 @@
         (covered saucer.n.02_2 water.n.06_1) 
         (covered platter.n.01_1 water.n.06_1) 
         (ontop dishtowel.n.01_1 countertop.n.01_1) 
-        (inside plate.n.04_1 sink.n.01_1)
-        (inside plate.n.04_2 sink.n.01_1)
-        (inside plate.n.04_3 sink.n.01_1)
-        (inside plate.n.04_4 sink.n.01_1)
+        (ontop plate.n.04_1 sink.n.01_1)
+        (ontop plate.n.04_2 sink.n.01_1)
+        (ontop plate.n.04_3 sink.n.01_1)
+        (ontop plate.n.04_4 sink.n.01_1)
         (ontop saucer.n.02_1 countertop.n.01_1) 
         (ontop saucer.n.02_2 countertop.n.01_1) 
         (ontop platter.n.01_1 countertop.n.01_1) 

diff --git a/bddl/activity_definitions/serving_food_at_a_homeless_shelter/problem0.bddl b/bddl/activity_definitions/serving_food_at_a_homeless_shelter/problem0.bddl
@@ -45,12 +45,12 @@
         (ontop water_bottle.n.01_1 breakfast_table.n.01_1) 
         (ontop water_bottle.n.01_2 breakfast_table.n.01_1) 
         (ontop tupperware.n.01_1 breakfast_table.n.01_1)
-        (inside ladle.n.01_1 casserole.n.02_1) 
-        (inside ladle.n.01_2 casserole.n.02_2) 
-        (inside ladle.n.01_3 casserole.n.02_3) 
-        (inside ladle.n.01_4 casserole.n.02_4) 
-        (inside ladle.n.01_5 casserole.n.02_5) 
-        (inside ladle.n.01_6 casserole.n.02_6) 
+        (ontop ladle.n.01_1 casserole.n.02_1) 
+        (ontop ladle.n.01_2 casserole.n.02_2) 
+        (ontop ladle.n.01_3 casserole.n.02_3) 
+        (ontop ladle.n.01_4 casserole.n.02_4) 
+        (ontop ladle.n.01_5 casserole.n.02_5) 
+        (ontop ladle.n.01_6 casserole.n.02_6) 
         (ontop plate.n.04_1 breakfast_table.n.01_2)
         (ontop plate.n.04_2 breakfast_table.n.01_2)
         (ontop bowl.n.01_1 breakfast_table.n.01_2)

diff --git a/bddl/activity_definitions/wash_baby_bottles/problem0.bddl b/bddl/activity_definitions/wash_baby_bottles/problem0.bddl
@@ -23,7 +23,7 @@
         (not 
             (covered bottle.n.03_2 disinfectant.n.01_1)
         ) 
-        (inside bottle.n.03_3 sink.n.01_1) 
+        (ontop bottle.n.03_3 sink.n.01_1)
         (not 
             (covered bottle.n.03_3 disinfectant.n.01_1)
         ) 

diff --git a/bddl/activity_definitions/washing_bowls/problem0.bddl b/bddl/activity_definitions/washing_bowls/problem0.bddl
@@ -17,9 +17,9 @@
     )
 
     (:init 
-        (inside bowl.n.01_1 sink.n.01_1) 
-        (inside bowl.n.01_2 sink.n.01_1) 
-        (inside sponge.n.01_1 sink.n.01_1) 
+        (ontop bowl.n.01_1 sink.n.01_1)
+        (ontop bowl.n.01_2 sink.n.01_1)
+        (ontop sponge.n.01_1 sink.n.01_1)
         (covered bowl.n.01_1 stain.n.01_1) 
         (covered bowl.n.01_1 milk.n.01_1)
         (covered bowl.n.01_2 stain.n.01_1) 

diff --git a/bddl/activity_definitions/washing_plates/problem0.bddl b/bddl/activity_definitions/washing_plates/problem0.bddl
@@ -17,7 +17,7 @@
     )
 
     (:init 
-        (inside dishtowel.n.01_1 sink.n.01_1) 
+        (ontop dishtowel.n.01_1 sink.n.01_1)
         (ontop scrub_brush.n.01_1 countertop.n.01_1) 
         (covered plate.n.04_1 breadcrumb.n.01_1) 
         (covered plate.n.04_2 breadcrumb.n.01_1)