Merge pull request #68 from StanfordVL/benjamin-scene-assignment-fixes

Benjamin scene assignment fixes
StanfordVL · Aug 19, 2023 · fac0435 · fac0435
2 parents 7e25b47 + c12dba1
commit fac0435
Show file tree

Hide file tree

Showing 16 changed files with 101 additions and 100 deletions.
diff --git a/bddl/activity_definitions/clean_piano_keys/problem0.bddl b/bddl/activity_definitions/clean_piano_keys/problem0.bddl
@@ -4,18 +4,18 @@
     (:objects
         piano.n.01_1 - piano.n.01
         rag.n.01_1 - rag.n.01
-        shelf.n.01_1 - shelf.n.01
         dust.n.01_1 - dust.n.01
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
+        cabinet.n.01_1 - cabinet.n.01
     )
 
     (:init 
         (covered piano.n.01_1 dust.n.01_1)
-        (inside rag.n.01_1 shelf.n.01_1) 
+        (inside rag.n.01_1 cabinet.n.01_1) 
         (inroom floor.n.01_1 living_room) 
-        (inroom shelf.n.01_1 living_room) 
         (inroom piano.n.01_1 living_room) 
+        (inroom cabinet.n.01_1 utility_room)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/clean_up_your_desk/problem0.bddl b/bddl/activity_definitions/clean_up_your_desk/problem0.bddl
@@ -12,7 +12,7 @@
         pencil.n.01_1 - pencil.n.01
         pen.n.01_1 pen.n.01_2 - pen.n.01
         stapler.n.01_1 - stapler.n.01
-        bookcase.n.01_1 - bookcase.n.01
+        shelf.n.01_1 - shelf.n.01
         tray.n.01_1 - tray.n.01
         paperback_book.n.01_1 paperback_book.n.01_2 - paperback_book.n.01
         pencil_box.n.01_1 - pencil_box.n.01
@@ -32,14 +32,14 @@
         (ontop pencil.n.01_1 desk.n.01_1) 
         (ontop pen.n.01_1 swivel_chair.n.01_1)
         (ontop pen.n.01_2 floor.n.01_1) 
-        (ontop stapler.n.01_1 bookcase.n.01_1) 
+        (ontop stapler.n.01_1 shelf.n.01_1) 
         (ontop laptop.n.01_1 desk.n.01_1) 
         (ontop tray.n.01_1 desk.n.01_1) 
         (ontop paperback_book.n.01_1 desk.n.01_1) 
         (ontop paperback_book.n.01_2 swivel_chair.n.01_1)
         (ontop pencil_box.n.01_1 desk.n.01_1)
         (inroom cabinet.n.01_1 private_office) 
-        (inroom bookcase.n.01_1 private_office) 
+        (inroom shelf.n.01_1 private_office) 
         (inroom desk.n.01_1 private_office) 
         (inroom swivel_chair.n.01_1 private_office)
         (inroom floor.n.01_1 private_office)
@@ -59,7 +59,7 @@
             (forall 
                 (?folder.n.02 - folder.n.02) 
                 (or
-                    (inside ?folder.n.02 ?bookcase.n.01_1)
+                    (inside ?folder.n.02 ?shelf.n.01_1)
                     (ontop ?folder.n.02 ?desk.n.01_1)
                     (ontop ?folder.n.02 ?folder.n.02_1)
                     (ontop ?folder.n.02 ?folder.n.02_2)
@@ -71,7 +71,7 @@
             ) 
             (forall 
                 (?paperback_book.n.01 - paperback_book.n.01) 
-                (inside ?paperback_book.n.01 ?bookcase.n.01_1)
+                (inside ?paperback_book.n.01 ?shelf.n.01_1)
             ) 
             (inside ?pencil.n.01_1 ?pencil_box.n.01_1) 
             (inside ?shears.n.01_1 ?pencil_box.n.01_1) 

diff --git a/bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl b/bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl
@@ -8,20 +8,20 @@
     	floor.n.01_1 - floor.n.01
     	rag.n.01_1 - rag.n.01
     	bucket.n.01_1 - bucket.n.01
-        table.n.02_1 - table.n.02
+        countertop.n.01_1 - countertop.n.01
         sink.n.01_1 - sink.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init 
-        (inroom grill.n.02_1 garage)
+        (inroom grill.n.02_1 garden)
         (covered grill.n.02_1 stain.n.01_1) 
         (covered grill.n.02_1 dust.n.01_1) 
-        (ontop bucket.n.01_1 table.n.02_1) 
-        (ontop rag.n.01_1 table.n.02_1) 
+        (ontop bucket.n.01_1 countertop.n.01_1) 
+        (ontop rag.n.01_1 countertop.n.01_1) 
         (inroom floor.n.01_1 garage) 
-        (inroom table.n.02_1 storage_room) 
-        (inroom sink.n.01_1 storage_room)
+        (inroom countertop.n.01_1 utility_room) 
+        (inroom sink.n.01_1 utility_room)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/cleaning_restaurant_table/problem0.bddl b/bddl/activity_definitions/cleaning_restaurant_table/problem0.bddl
@@ -5,12 +5,11 @@
         dinner_napkin.n.01_1 - dinner_napkin.n.01
         hand_towel.n.01_1 - hand_towel.n.01
         breadcrumb.n.01_1 - breadcrumb.n.01
-        breakfast_table.n.01_1 - breakfast_table.n.01
+        breakfast_table.n.01_1 breakfast_table.n.01_2 - breakfast_table.n.01
         rag.n.01_1 - rag.n.01
         bowl.n.01_1 - bowl.n.01
         disinfectant.n.01_1 - disinfectant.n.01
         disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01
-        kitchen_table.n.01_1 - kitchen_table.n.01
         ashcan.n.01_1 - ashcan.n.01
         water.n.06_1 - water.n.06
         sink.n.01_1 - sink.n.01
@@ -28,13 +27,13 @@
         (covered breakfast_table.n.01_1 breadcrumb.n.01_1)
         (ontop ashcan.n.01_1 floor.n.01_2)
         (filled disinfectant__bottle.n.01_1 disinfectant.n.01_1) 
-        (ontop disinfectant__bottle.n.01_1 kitchen_table.n.01_1)
-        (ontop hand_towel.n.01_1 kitchen_table.n.01_1)
+        (ontop disinfectant__bottle.n.01_1 breakfast_table.n.01_2)
+        (ontop hand_towel.n.01_1 breakfast_table.n.01_2)
         (insource sink.n.01_1 water.n.06_1) 
         (inroom breakfast_table.n.01_1 dining_room) 
         (inroom sink.n.01_1 kitchen) 
         (inroom floor.n.01_2 kitchen)
-        (inroom kitchen_table.n.01_1 kitchen)
+        (inroom breakfast_table.n.01_2 kitchen)
         (inroom floor.n.01_1 dining_room) 
         (ontop agent.n.01_1 floor.n.01_1) 
     )
@@ -49,4 +48,4 @@
             )
         )
     )
-)
+)
diff --git a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl
@@ -21,7 +21,7 @@
         (ontop detergent__bottle.n.01_1 floor.n.01_1)
         (inroom shelf.n.01_1 garage) 
         (inroom floor.n.01_1 garage) 
-        (inroom sink.n.01_1 storage_room)
+        (inroom sink.n.01_1 utility_room)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/cook_arepas/problem0.bddl b/bddl/activity_definitions/cook_arepas/problem0.bddl
@@ -8,6 +8,8 @@
     	griddle.n.01_1 - griddle.n.01
     	floor.n.01_1 - floor.n.01
     	agent.n.01_1 - agent.n.01
+        countertop.n.01_1 - countertop.n.01
+        stove.n.01_1 - stove.n.01
     )
 
     (:init 
@@ -16,7 +18,9 @@
         (not 
             (cooked arepa.n.01_1)
         ) 
-        (inroom griddle.n.01_1 kitchen) 
+        (ontop griddle.n.01_1 countertop.n.01_1) 
+        (inroom countertop.n.01_1 kitchen) 
+        (inroom stove.n.01_1 kitchen) 
         (inroom electric_refrigerator.n.01_1 kitchen) 
         (inroom floor.n.01_1 kitchen) 
         (ontop agent.n.01_1 floor.n.01_1)
@@ -26,6 +30,7 @@
         (and 
             (ontop ?arepa.n.01_1 ?griddle.n.01_1) 
             (cooked ?arepa.n.01_1)
+            (ontop griddle.n.01_1 countertop.n.01_1) 
         )
     )
 )
diff --git a/bddl/activity_definitions/donating_clothing/problem0.bddl b/bddl/activity_definitions/donating_clothing/problem0.bddl
@@ -3,7 +3,7 @@
 
     (:objects
         sweater.n.01_1 - sweater.n.01
-        chest_of_drawers.n.01_1 - chest_of_drawers.n.01
+        wardrobe.n.01_1 - wardrobe.n.01
         boot.n.01_1 boot.n.01_2 - boot.n.01
         floor.n.01_1 - floor.n.01
         sandal.n.01_1 sandal.n.01_2 - sandal.n.01
@@ -14,14 +14,14 @@
     )
 
     (:init 
-        (inroom chest_of_drawers.n.01_1 closet)
-        (inside sweater.n.01_1 chest_of_drawers.n.01_1) 
+        (inroom wardrobe.n.01_1 closet)
+        (inside sweater.n.01_1 wardrobe.n.01_1) 
         (ontop boot.n.01_1 floor.n.01_1) 
         (ontop boot.n.01_2 floor.n.01_1) 
         (ontop sandal.n.01_1 floor.n.01_1) 
         (ontop sandal.n.01_2 floor.n.01_1) 
-        (inside dress.n.01_1 chest_of_drawers.n.01_1) 
-        (inside jersey.n.03_1 chest_of_drawers.n.01_1) 
+        (inside dress.n.01_1 wardrobe.n.01_1) 
+        (inside jersey.n.03_1 wardrobe.n.01_1) 
         (ontop carton.n.02_1 floor.n.01_1) 
         (inroom floor.n.01_1 closet) 
         (ontop agent.n.01_1 floor.n.01_1)

diff --git a/bddl/activity_definitions/getting_package_from_post_office/problem0.bddl b/bddl/activity_definitions/getting_package_from_post_office/problem0.bddl
@@ -3,7 +3,7 @@
 
     (:objects
         keyboard.n.01_1 - keyboard.n.01
-        shelf.n.01_1 shelf.n.01_2 - shelf.n.01
+        cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01
         desk.n.01_1 - desk.n.01
         package.n.02_1 package.n.02_2 - package.n.02
         magazine.n.02_1 - magazine.n.02
@@ -16,18 +16,18 @@
 
     (:init 
         (ontop keyboard.n.01_1 desk.n.01_1) 
-        (inside package.n.02_1 shelf.n.01_1) 
-        (inside package.n.02_2 shelf.n.01_1) 
-        (inside magazine.n.02_1 shelf.n.01_2) 
-        (inside letter.n.01_1 shelf.n.01_2) 
+        (inside package.n.02_1 cabinet.n.01_1) 
+        (inside package.n.02_2 cabinet.n.01_1) 
+        (inside magazine.n.02_1 cabinet.n.01_2) 
+        (inside letter.n.01_1 cabinet.n.01_2) 
         (ontop postage.n.02_1 desk.n.01_1) 
         (ontop postage.n.02_2 desk.n.01_1) 
-        (inside mail.n.04_1 shelf.n.01_2) 
-        (inside mail.n.04_2 shelf.n.01_2) 
+        (inside mail.n.04_1 cabinet.n.01_2) 
+        (inside mail.n.04_2 cabinet.n.01_2) 
         (inroom floor.n.01_1 shared_office) 
         (inroom desk.n.01_1 private_office)
-        (inroom shelf.n.01_1 shared_office)
-        (inroom shelf.n.01_2 shared_office)
+        (inroom cabinet.n.01_1 shared_office)
+        (inroom cabinet.n.01_2 shared_office)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl b/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl
@@ -11,8 +11,7 @@
         wineglass.n.01_1 wineglass.n.01_2 wineglass.n.01_3 wineglass.n.01_4 - wineglass.n.01
         water_glass.n.02_1 water_glass.n.02_2 water_glass.n.02_3 water_glass.n.02_4 - water_glass.n.02
         armchair.n.01_1 armchair.n.01_2 armchair.n.01_3 armchair.n.01_4 - armchair.n.01
-        breakfast_table.n.01_1 - breakfast_table.n.01
-        kitchen_table.n.01_1 - kitchen_table.n.01
+        breakfast_table.n.01_1 breakfast_table.n.01_2 - breakfast_table.n.01
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
     )
@@ -22,14 +21,14 @@
         (ontop plate.n.04_2 plate.n.04_1) 
         (ontop plate.n.04_3 plate.n.04_2) 
         (ontop plate.n.04_4 plate.n.04_3) 
-        (ontop wineglass.n.01_1 kitchen_table.n.01_1) 
-        (ontop wineglass.n.01_2 kitchen_table.n.01_1) 
-        (ontop wineglass.n.01_3 kitchen_table.n.01_1) 
-        (ontop wineglass.n.01_4 kitchen_table.n.01_1) 
-        (ontop water_glass.n.02_1 kitchen_table.n.01_1)
-        (ontop water_glass.n.02_2 kitchen_table.n.01_1)
-        (ontop water_glass.n.02_3 kitchen_table.n.01_1)
-        (ontop water_glass.n.02_4 kitchen_table.n.01_1)
+        (ontop wineglass.n.01_1 breakfast_table.n.01_2) 
+        (ontop wineglass.n.01_2 breakfast_table.n.01_2) 
+        (ontop wineglass.n.01_3 breakfast_table.n.01_2) 
+        (ontop wineglass.n.01_4 breakfast_table.n.01_2) 
+        (ontop water_glass.n.02_1 breakfast_table.n.01_2)
+        (ontop water_glass.n.02_2 breakfast_table.n.01_2)
+        (ontop water_glass.n.02_3 breakfast_table.n.01_2)
+        (ontop water_glass.n.02_4 breakfast_table.n.01_2)
         (inside tablefork.n.01_1 cabinet.n.01_1) 
         (inside tablefork.n.01_2 cabinet.n.01_1) 
         (inside tablefork.n.01_3 cabinet.n.01_1) 
@@ -42,18 +41,18 @@
         (inside tablespoon.n.02_2 cabinet.n.01_1)
         (inside tablespoon.n.02_3 cabinet.n.01_1)
         (inside tablespoon.n.02_4 cabinet.n.01_1)
-        (ontop dinner_napkin.n.01_1 kitchen_table.n.01_1)
-        (ontop dinner_napkin.n.01_2 kitchen_table.n.01_1)
-        (ontop dinner_napkin.n.01_3 kitchen_table.n.01_1)
-        (ontop dinner_napkin.n.01_4 kitchen_table.n.01_1)
+        (ontop dinner_napkin.n.01_1 breakfast_table.n.01_2)
+        (ontop dinner_napkin.n.01_2 breakfast_table.n.01_2)
+        (ontop dinner_napkin.n.01_3 breakfast_table.n.01_2)
+        (ontop dinner_napkin.n.01_4 breakfast_table.n.01_2)
         (inroom breakfast_table.n.01_1 dining_room) 
         (inroom cabinet.n.01_1 kitchen) 
         (inroom floor.n.01_1 kitchen) 
         (inroom armchair.n.01_1 dining_room)
         (inroom armchair.n.01_2 dining_room)
         (inroom armchair.n.01_3 dining_room)
         (inroom armchair.n.01_4 dining_room)
-        (inroom kitchen_table.n.01_1 kitchen)
+        (inroom breakfast_table.n.01_2 kitchen)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 
@@ -112,4 +111,4 @@
             )
         )
     )
-)
+)
diff --git a/bddl/activity_definitions/picking_up_books_at_library/problem0.bddl b/bddl/activity_definitions/picking_up_books_at_library/problem0.bddl
@@ -5,7 +5,6 @@
         paperback_book.n.01_1 paperback_book.n.01_2 - paperback_book.n.01
         desk.n.01_1 - desk.n.01
         book.n.02_1 book.n.02_2 - book.n.02
-        shelf.n.01_1 - shelf.n.01
         backpack.n.01_1 - backpack.n.01
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
@@ -14,12 +13,11 @@
     (:init 
         (ontop paperback_book.n.01_1 desk.n.01_1) 
         (ontop paperback_book.n.01_2 desk.n.01_1) 
-        (ontop book.n.02_1 shelf.n.01_1) 
-        (ontop book.n.02_2 shelf.n.01_1) 
+        (ontop book.n.02_1 desk.n.01_1) 
+        (ontop book.n.02_2 desk.n.01_1) 
         (ontop backpack.n.01_1 desk.n.01_1) 
         (inroom floor.n.01_1 private_office) 
         (inroom desk.n.01_1 private_office) 
-        (inroom shelf.n.01_1 private_office) 
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl b/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl
@@ -26,7 +26,7 @@
         (attached hanger.n.02_5 wardrobe.n.01_1)
         (attached hanger.n.02_6 wardrobe.n.01_1)
         (inroom floor.n.01_1 closet) 
-        (inroom desk.n.01_1 closet) 
+        (inroom desk.n.01_1 bedroom) 
         (inroom wardrobe.n.01_1 closet) 
         (ontop agent.n.01_1 floor.n.01_1)
     )

diff --git a/bddl/activity_definitions/repairs_to_furniture/problem0.bddl b/bddl/activity_definitions/repairs_to_furniture/problem0.bddl
@@ -2,25 +2,25 @@
     (:domain omnigibson)
 
     (:objects
-        worktable.n.01_1 - worktable.n.01
+        desk.n.01_1 - desk.n.01
         incision.n.01_1 - incision.n.01
         emery_paper.n.01_1 - emery_paper.n.01
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init 
-        (covered worktable.n.01_1 incision.n.01_1) 
-        (ontop emery_paper.n.01_1 worktable.n.01_1)
+        (covered desk.n.01_1 incision.n.01_1) 
+        (ontop emery_paper.n.01_1 desk.n.01_1)
         (inroom floor.n.01_1 garage) 
-        (inroom worktable.n.01_1 garage) 
+        (inroom desk.n.01_1 garage) 
         (ontop agent.n.01_1 floor.n.01_1)
     )
 
     (:goal 
         (and 
             (not 
-                (covered ?worktable.n.01_1 ?incision.n.01_1)
+                (covered ?desk.n.01_1 ?incision.n.01_1)
             )
         )
     )