Merge branch 'develop' of https://github.com/StanfordVL/bddl into dev…

…elop
StanfordVL · May 31, 2023 · 0825fbb · 0825fbb
2 parents 369f796 + e52e41f
commit 0825fbb
Show file tree

Hide file tree

Showing 189 changed files with 1,294 additions and 1,394 deletions.
diff --git a/bddl/activity_definitions/assembling_gift_baskets/problem0.bddl b/bddl/activity_definitions/assembling_gift_baskets/problem0.bddl
@@ -6,7 +6,7 @@
     	floor.n.01_1 - floor.n.01
     	candle.n.01_1 candle.n.01_2 candle.n.01_3 candle.n.01_4 - candle.n.01
     	cookie.n.01_1 cookie.n.01_2 cookie.n.01_3 cookie.n.01_4 - cookie.n.01
-    	parmesan.n.01_1 parmesan.n.01_2 parmesan.n.01_3 parmesan.n.01_4 - parmesan.n.01
+    	swiss_cheese.n.01_1 swiss_cheese.n.01_2 swiss_cheese.n.01_3 swiss_cheese.n.01_4 - swiss_cheese.n.01
     	bow.n.08_1 bow.n.08_2 bow.n.08_3 bow.n.08_4 - bow.n.08
         table.n.02_1 table.n.02_2 - table.n.02
         agent.n.01_1 - agent.n.01
@@ -25,10 +25,10 @@
         (ontop cookie.n.01_2 table.n.02_1) 
         (ontop cookie.n.01_3 table.n.02_1) 
         (ontop cookie.n.01_4 table.n.02_1) 
-        (ontop parmesan.n.01_1 table.n.02_2) 
-        (ontop parmesan.n.01_2 table.n.02_2) 
-        (ontop parmesan.n.01_3 table.n.02_2) 
-        (ontop parmesan.n.01_4 table.n.02_2) 
+        (ontop swiss_cheese.n.01_1 table.n.02_2) 
+        (ontop swiss_cheese.n.01_2 table.n.02_2) 
+        (ontop swiss_cheese.n.01_3 table.n.02_2) 
+        (ontop swiss_cheese.n.01_4 table.n.02_2) 
         (ontop bow.n.08_1 table.n.02_2) 
         (ontop bow.n.08_2 table.n.02_2) 
         (ontop bow.n.08_3 table.n.02_2) 
@@ -48,8 +48,8 @@
             ) 
             (forpairs 
                 (?wicker_basket.n.01 - wicker_basket.n.01) 
-                (?parmesan.n.01 - parmesan.n.01) 
-                (inside ?parmesan.n.01 ?wicker_basket.n.01)
+                (?swiss_cheese.n.01 - swiss_cheese.n.01) 
+                (inside ?swiss_cheese.n.01 ?wicker_basket.n.01)
             ) 
             (forpairs 
                 (?wicker_basket.n.01 - wicker_basket.n.01) 

diff --git a/bddl/activity_definitions/buy_candle_making_supplies/problem0.bddl b/bddl/activity_definitions/buy_candle_making_supplies/problem0.bddl
@@ -3,8 +3,7 @@
 
     (:objects
         shelf.n.01_1 - shelf.n.01
-        wax.n.01_1 - wax.n.01
-        mason_jar.n.01_1 - mason_jar.n.01
+        beeswax.n.01_1 - beeswax.n.01
         candlestick.n.01_1 candlestick.n.01_2 - candlestick.n.01
         shopping_cart.n.01_1 - shopping_cart.n.01
         money.n.01_1 - money.n.01
@@ -14,8 +13,7 @@
     )
 
     (:init 
-        (filled mason_jar.n.01_1 wax.n.01_1) 
-        (ontop mason_jar.n.01_1 shelf.n.01_1)
+        (ontop beeswax.n.01_1 shelf.n.01_1)
         (ontop candlestick.n.01_1 shelf.n.01_1) 
         (inside candlestick.n.01_2 shelf.n.01_1)
         (inside money.n.01_1 shopping_cart.n.01_1) 
@@ -32,7 +30,7 @@
                 (?candlestick.n.01 - candlestick.n.01)
                 (ontop ?candlestick.n.01 ?checkout.n.03_1)
             )
-            (ontop ?mason_jar.n.01_1 ?checkout.n.03_1) 
+            (ontop ?beeswax.n.01_1 ?checkout.n.03_1)
             (ontop ?money.n.01_1 ?checkout.n.03_1)
         )
     )

diff --git a/bddl/activity_definitions/buy_home_use_medical_supplies/problem0.bddl b/bddl/activity_definitions/buy_home_use_medical_supplies/problem0.bddl
@@ -5,7 +5,7 @@
         cash_register.n.01_1 - cash_register.n.01
         checkout.n.03_1 - checkout.n.03
         plastic_bag.n.01_1 - plastic_bag.n.01
-        antihistamine.n.01_1 - antihistamine.n.01
+        bottle__of__antihistamines.n.01_1 - bottle__of__antihistamines.n.01
         shelf.n.01_1 shelf.n.01_2 shelf.n.01_3 - shelf.n.01
         first-aid_kit.n.01_1 - first-aid_kit.n.01
         shopping_cart.n.01_1 - shopping_cart.n.01
@@ -20,7 +20,7 @@
         (ontop cash_register.n.01_1 checkout.n.03_1) 
         (closed cash_register.n.01_1) 
         (ontop plastic_bag.n.01_1 checkout.n.03_1) 
-        (inside antihistamine.n.01_1 shelf.n.01_2) 
+        (inside bottle__of__antihistamines.n.01_1 shelf.n.01_2)
         (inside first-aid_kit.n.01_1 shelf.n.01_1) 
         (inside vitamin_pill__bottle.n.01_1 shelf.n.01_1) 
         (inside bandage.n.01_1 shelf.n.01_3) 
@@ -37,7 +37,7 @@
 
     (:goal 
         (and 
-            (inside ?antihistamine.n.01_1 ?plastic_bag.n.01_1) 
+            (inside ?bottle__of__antihistamines.n.01_1 ?plastic_bag.n.01_1)
             (ontop ?first-aid_kit.n.01_1 ?checkout.n.03_1) 
             (inside ?vitamin_pill__bottle.n.01_1 ?plastic_bag.n.01_1) 
             (inside ?bandage.n.01_1 ?plastic_bag.n.01_1) 

diff --git a/bddl/activity_definitions/buy_natural_beef/problem0.bddl b/bddl/activity_definitions/buy_natural_beef/problem0.bddl
@@ -6,7 +6,6 @@
         checkout.n.03_1 - checkout.n.03
         ground_beef__package.n.01_1 ground_beef__package.n.01_2 ground_beef__package.n.01_3 - ground_beef__package.n.01
         cooler.n.01_1 - cooler.n.01
-        label.n.01_1 label.n.01_2 - label.n.01
         money.n.01_1 money.n.01_2 money.n.01_3 - money.n.01
         floor.n.01_1 - floor.n.01
         shelf.n.01_1 - shelf.n.01
@@ -18,9 +17,7 @@
         (closed cash_register.n.01_1) 
         (ontop ground_beef__package.n.01_1 cooler.n.01_1) 
         (ontop ground_beef__package.n.01_2 cooler.n.01_1) 
-        (ontop ground_beef__package.n.01_3 cooler.n.01_1) 
-        (ontop label.n.01_1 ground_beef__package.n.01_1) 
-        (ontop label.n.01_2 ground_beef__package.n.01_2) 
+        (ontop ground_beef__package.n.01_3 cooler.n.01_1)
         (ontop money.n.01_1 checkout.n.03_1) 
         (ontop money.n.01_2 checkout.n.03_1) 
         (ontop money.n.01_3 checkout.n.03_1) 

diff --git a/bddl/activity_definitions/buy_rechargeable_batteries/problem0.bddl b/bddl/activity_definitions/buy_rechargeable_batteries/problem0.bddl
@@ -4,7 +4,7 @@
     (:objects
         cash_register.n.01_1 - cash_register.n.01
         checkout.n.03_1 - checkout.n.03
-        battery.n.01_1 battery.n.01_2 - battery.n.01
+        battery.n.02_1 battery.n.02_2 - battery.n.02
         shelf.n.01_1 - shelf.n.01
         money.n.01_1 money.n.01_2 money.n.01_3 - money.n.01
         charger.n.02_1 - charger.n.02
@@ -17,8 +17,8 @@
     (:init 
         (ontop cash_register.n.01_1 checkout.n.03_1) 
         (closed cash_register.n.01_1) 
-        (ontop battery.n.01_1 shelf.n.01_1) 
-        (ontop battery.n.01_2 shelf.n.01_1) 
+        (ontop battery.n.02_1 shelf.n.01_1)
+        (ontop battery.n.02_2 shelf.n.01_1)
         (inside money.n.01_1 shopping_cart.n.01_1) 
         (inside money.n.01_2 shopping_cart.n.01_1) 
         (inside money.n.01_3 shopping_cart.n.01_1) 
@@ -35,8 +35,8 @@
     (:goal 
         (and 
             (forall 
-                (?battery.n.01 - battery.n.01)
-                (inside ?battery.n.01 ?sack.n.01_1)
+                (?battery.n.02 - battery.n.02)
+                (inside ?battery.n.02 ?sack.n.01_1)
             )
             (forall 
                 (?money.n.01 - money.n.01) 

diff --git a/bddl/activity_definitions/buying_everyday_consumer_goods/problem0.bddl b/bddl/activity_definitions/buying_everyday_consumer_goods/problem0.bddl
@@ -5,7 +5,7 @@
         cash_register.n.01_1 - cash_register.n.01
         checkout.n.03_1 - checkout.n.03
         credit_card.n.01_1 - credit_card.n.01
-        dairy.n.01_1 dairy.n.01_2 - dairy.n.01
+        dairy_product.n.01_1 dairy_product.n.01_2 - dairy_product.n.01
         shelf.n.01_1 shelf.n.01_2 shelf.n.01_3 - shelf.n.01
         apple.n.01_1 apple.n.01_2 - apple.n.01 
         pineapple.n.02_1 - pineapple.n.02 
@@ -18,8 +18,8 @@
         (ontop cash_register.n.01_1 checkout.n.03_1) 
         (closed cash_register.n.01_1) 
         (ontop credit_card.n.01_1 checkout.n.03_1) 
-        (ontop dairy.n.01_1 shelf.n.01_1) 
-        (ontop dairy.n.01_2 shelf.n.01_1) 
+        (ontop dairy_product.n.01_1 shelf.n.01_1)
+        (ontop dairy_product.n.01_2 shelf.n.01_1)
         (ontop apple.n.01_1 shelf.n.01_2) 
         (ontop pineapple.n.02_1 shelf.n.01_2) 
         (ontop apple.n.01_2 shelf.n.01_3) 
@@ -39,8 +39,8 @@
             (exists 
                 (?sack.n.01 - sack.n.01) 
                 (forall 
-                    (?dairy.n.01 - dairy.n.01)
-                    (inside ?dairy.n.01 ?sack.n.01)
+                    (?dairy_product.n.01 - dairy_product.n.01)
+                    (inside ?dairy_product.n.01 ?sack.n.01)
                 )
             ) 
             (exists 
@@ -59,21 +59,21 @@
             (forall
                 (?apple.n.01 - apple.n.01)
                 (forall 
-                    (?dairy.n.01 - dairy.n.01)
+                    (?dairy_product.n.01 - dairy_product.n.01)
                     (not 
-                        (nextto ?apple.n.01 ?dairy.n.01)
+                        (nextto ?apple.n.01 ?dairy_product.n.01)
                     )
                 )
             )
             (forall
                 (?pineapple.n.02 - pineapple.n.02)
                 (forall 
-                    (?dairy.n.01 - dairy.n.01)
+                    (?dairy_product.n.01 - dairy_product.n.01)
                     (not 
-                        (nextto ?pineapple.n.02 ?dairy.n.01)
+                        (nextto ?pineapple.n.02 ?dairy_product.n.01)
                     )
                 )
             )
         )
     )
-)
+)
diff --git a/bddl/activity_definitions/buying_fast_food/problem0.bddl b/bddl/activity_definitions/buying_fast_food/problem0.bddl
@@ -10,7 +10,7 @@
         hamburger.n.01_1 hamburger.n.01_2 - hamburger.n.01
         shelf.n.01_1 shelf.n.01_2 shelf.n.01_3 - shelf.n.01
         french_fries.n.02_1 french_fries.n.02_2 - french_fries.n.02
-        pop.n.02_1 pop.n.02_2 - pop.n.02
+        can__of__soda.n.01_1 can__of__soda.n.01_2 - can__of__soda.n.01
         package.n.02_1 - package.n.02
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
@@ -24,8 +24,8 @@
         (inside hamburger.n.01_2 shelf.n.01_1) 
         (inside french_fries.n.02_1 shelf.n.01_2)
         (inside french_fries.n.02_2 shelf.n.01_2)
-        (inside pop.n.02_1 shelf.n.01_3) 
-        (inside pop.n.02_2 shelf.n.01_3) 
+        (inside can__of__soda.n.01_1 shelf.n.01_3) 
+        (inside can__of__soda.n.01_2 shelf.n.01_3) 
         (inside package.n.02_1 checkout.n.03_1) 
         (inroom floor.n.01_1 grocery_store) 
         (inroom checkout.n.03_1 grocery_store) 
@@ -44,8 +44,8 @@
                 (inside ?hamburger.n.01 ?package.n.02_1)
             )
             (forall 
-                (?pop.n.02 - pop.n.02)
-                (ontop ?pop.n.02 ?checkout.n.03_1)
+                (?can__of__soda.n.01 - can__of__soda.n.01)
+                (ontop ?can__of__soda.n.01 ?checkout.n.03_1)
             )
             (inside ?french_fries.n.02_1 ?package.n.02_1)
             (ontop ?package.n.02_1 ?checkout.n.03_1)

diff --git a/bddl/activity_definitions/buying_groceries/problem0.bddl b/bddl/activity_definitions/buying_groceries/problem0.bddl
@@ -5,7 +5,7 @@
         cash_register.n.01_1 - cash_register.n.01
         checkout.n.03_1 - checkout.n.03
         plastic_bag.n.01_1 plastic_bag.n.01_2 - plastic_bag.n.01
-        shrimp.n.03_1 - shrimp.n.03
+        prawn.n.01_1 - prawn.n.01
         shelf.n.01_1 shelf.n.01_2 shelf.n.01_3 shelf.n.01_4 - shelf.n.01
         apple_juice__bottle.n.01_1 - apple_juice__bottle.n.01
         milk__carton.n.01_1 - milk__carton.n.01
@@ -23,7 +23,7 @@
         (closed cash_register.n.01_1) 
         (ontop plastic_bag.n.01_1 checkout.n.03_1) 
         (ontop plastic_bag.n.01_2 checkout.n.03_1) 
-        (inside shrimp.n.03_1 shelf.n.01_4) 
+        (inside prawn.n.01_1 shelf.n.01_4)
         (inside apple_juice__bottle.n.01_1 shelf.n.01_1) 
         (inside milk__carton.n.01_1 shelf.n.01_1) 
         (inside peanut_butter__jar.n.01_1 shelf.n.01_2) 
@@ -51,7 +51,7 @@
                 (and 
                     (inside ?milk__carton.n.01_1 ?plastic_bag.n.01) 
                     (inside ?apple_juice__bottle.n.01_1 ?plastic_bag.n.01) 
-                    (inside ?shrimp.n.03_1 ?plastic_bag.n.01)
+                    (inside ?prawn.n.01_1 ?plastic_bag.n.01)
                 )
             ) 
             (exists 

diff --git a/bddl/activity_definitions/carrying_out_garden_furniture/problem0.bddl b/bddl/activity_definitions/carrying_out_garden_furniture/problem0.bddl
@@ -11,8 +11,8 @@
     )
 
     (:init 
-        (ontop lawn_chair.n.01_1 floor.n.01_1) 
-        (ontop lawn_chair.n.01_2 floor.n.01_1) 
+        (ontop lawn_chair.n.01_1 floor.n.01_1)
+        (ontop lawn_chair.n.01_2 floor.n.01_1)
         (ontop barrow.n.03_1 floor.n.01_1) 
         (inroom lawn.n.01_1 garden) 
         (inroom driveway.n.01_1 garden) 
@@ -23,7 +23,7 @@
     (:goal 
         (and 
             (forall 
-                (?lawn_chair.n.01 - lawn_chair.n.01) 
+                (?lawn_chair.n.01 - lawn_chair.n.01)
                 (ontop ?lawn_chair.n.01 ?lawn.n.01_1)
             ) 
             (ontop ?barrow.n.03_1 ?lawn.n.01_1)

diff --git a/bddl/activity_definitions/clean_a_LED_screen/problem0.bddl b/bddl/activity_definitions/clean_a_LED_screen/problem0.bddl
@@ -3,17 +3,17 @@
 
     (:objects
         dust.n.01_1 - dust.n.01
-        screen.n.03_1 - screen.n.03
+        screen.n.01_1 - screen.n.01
         rag.n.01_1 - rag.n.01
         wall.n.01_1 - wall.n.01
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init 
-        (covered screen.n.03_1 dust.n.01_1) 
+        (covered screen.n.01_1 dust.n.01_1) 
         (ontop rag.n.01_1 floor.n.01_1) 
-        (attached screen.n.03_1 wall.n.01_1) 
+        (attached screen.n.01_1 wall.n.01_1) 
         (inroom floor.n.01_1 bathroom) 
         (inroom wall.n.01_1 bathroom) 
         (ontop agent.n.01_1 floor.n.01_1)
@@ -22,7 +22,7 @@
     (:goal 
         (and 
             (not 
-                (covered ?screen.n.03_1 ?dust.n.01_1)
+                (covered ?screen.n.01_1 ?dust.n.01_1)
             ) 
         )
     )

diff --git a/bddl/activity_definitions/clean_a_backpack/problem0.bddl b/bddl/activity_definitions/clean_a_backpack/problem0.bddl
@@ -12,19 +12,21 @@
         sponge.n.01_1 - sponge.n.01
         water.n.06_1 - water.n.06
         detergent.n.02_1 - detergent.n.02
+        detergent__bottle.n.01_1 - detergent__bottle.n.01
         dust.n.01_1 - dust.n.01
         agent.n.01_1 - agent.n.01
     )
 
-    (:init 
-        (ontop backpack.n.01_1 hand_towel.n.01_1) 
-        (ontop bucket.n.01_1 floor.n.01_1) 
+    (:init
+        (filled detergent__bottle.n.01_1 detergent.n.02_1)
+        (ontop detergent__bottle.n.01_1 floor.n.01_1)
+        (ontop backpack.n.01_1 hand_towel.n.01_1)
+        (ontop bucket.n.01_1 floor.n.01_1)
         (ontop rag.n.01_1 clothes_dryer.n.01_1)
         (ontop hand_towel.n.01_1 washer.n.03_1)
         (ontop sponge.n.01_1 clothes_dryer.n.01_1)
         (filled bucket.n.01_1 water.n.06_1) 
-        (filled bucket.n.01_1 detergent.n.02_1) 
-        (covered backpack.n.01_1 dust.n.01_1) 
+        (covered backpack.n.01_1 dust.n.01_1)
         (inroom floor.n.01_1 utility_room) 
         (inroom washer.n.03_1 utility_room) 
         (inroom clothes_dryer.n.01_1 utility_room)

diff --git a/bddl/activity_definitions/clean_a_candle_jar/problem0.bddl b/bddl/activity_definitions/clean_a_candle_jar/problem0.bddl
@@ -5,7 +5,7 @@
         mason_jar.n.01_1 - mason_jar.n.01
         sink.n.01_1 - sink.n.01
         paper_towel.n.01_1 - paper_towel.n.01
-        wax.n.01_1 - wax.n.01
+        wax_remnant.n.01_1 - wax_remnant.n.01
         table_knife.n.01_1 - table_knife.n.01
         countertop.n.01_1 - countertop.n.01
         liquid_soap.n.01_1 - liquid_soap.n.01
@@ -18,7 +18,7 @@
     (:init 
         (ontop mason_jar.n.01_1 countertop.n.01_1) 
         (ontop paper_towel.n.01_1 countertop.n.01_1)
-        (covered mason_jar.n.01_1 wax.n.01_1) 
+        (covered mason_jar.n.01_1 wax_remnant.n.01_1) 
         (ontop table_knife.n.01_1 countertop.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)
@@ -32,7 +32,7 @@
     (:goal 
         (and 
             (not
-                (covered ?mason_jar.n.01_1 ?wax.n.01_1)
+                (covered ?mason_jar.n.01_1 ?wax_remnant.n.01_1)
             )
         )
     )

diff --git a/bddl/activity_definitions/clean_a_leather_belt/problem0.bddl b/bddl/activity_definitions/clean_a_leather_belt/problem0.bddl
@@ -6,8 +6,8 @@
         sink.n.01_1 - sink.n.01
         polish.n.03_1 - polish.n.03
         polish__bottle.n.01_1 - polish__bottle.n.01
-        cotton_ball.n.01_1 - cotton_ball.n.01
         cabinet.n.01_1 - cabinet.n.01
+        dishtowel.n.01_1 - dishtowel.n.01
         clothes_dryer.n.01_1 - clothes_dryer.n.01
         dust.n.01_1 - dust.n.01
         water.n.06_1 - water.n.06
@@ -17,9 +17,9 @@
 
     (:init
         (ontop belt.n.02_1 clothes_dryer.n.01_1)
+        (ontop dishtowel.n.01_1 clothes_dryer.n.01_1)
         (filled polish__bottle.n.01_1 polish.n.03_1) 
         (inside polish__bottle.n.01_1 cabinet.n.01_1)
-        (inside cotton_ball.n.01_1 cabinet.n.01_1) 
         (covered belt.n.02_1 dust.n.01_1)
         (insource sink.n.01_1 water.n.06_1) 
         (inroom sink.n.01_1 utility_room) 
@@ -37,4 +37,4 @@
             (covered ?belt.n.02_1 ?polish.n.03_1)
         )
     )
-)
+)