diff --git a/bddl/activity_definitions/prepare_a_raised_bed_garden/problem0.bddl b/bddl/activity_definitions/prepare_a_raised_bed_garden/problem0.bddl index 8881cf21..7c4f8f6c 100644 --- a/bddl/activity_definitions/prepare_a_raised_bed_garden/problem0.bddl +++ b/bddl/activity_definitions/prepare_a_raised_bed_garden/problem0.bddl @@ -3,11 +3,10 @@ (:objects floor.n.01_1 - floor.n.01 - marigold.n.01_1 marigold.n.01_2 marigold.n.01_3 - marigold.n.01 + marigold.n.01_1 marigold.n.01_2 - marigold.n.01 pot.n.04_1 pot.n.04_2 pot.n.04_3 - pot.n.04 trowel.n.01_1 - trowel.n.01 soil.n.02_1 - soil.n.02 - sack.n.01_1 - sack.n.01 agent.n.01_1 - agent.n.01 ) @@ -18,11 +17,8 @@ (ontop pot.n.04_3 floor.n.01_1) (inside marigold.n.01_1 pot.n.04_3) (inside marigold.n.01_2 pot.n.04_3) - (inside marigold.n.01_3 pot.n.04_3) (ontop trowel.n.01_1 floor.n.01_1) - (ontop sack.n.01_1 floor.n.01_1) - (filled sack.n.01_1 soil.n.02_1) - (inroom floor.n.01_1 garden) + (inroom floor.n.01_1 garden) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl b/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl index fce9e0d9..fbb829b9 100644 --- a/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl +++ b/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl @@ -4,17 +4,17 @@ (:objects bath_towel.n.01_1 - bath_towel.n.01 hand_towel.n.01_1 - hand_towel.n.01 - cabinet.n.01_1 - cabinet.n.01 + bed.n.01_1 - bed.n.01 floor.n.01_1 - floor.n.01 towel_rack.n.01_1 - towel_rack.n.01 agent.n.01_1 - agent.n.01 ) (:init - (inside bath_towel.n.01_1 cabinet.n.01_1) - (inside hand_towel.n.01_1 cabinet.n.01_1) - (inroom floor.n.01_1 bathroom) - (inroom cabinet.n.01_1 bathroom) + (ontop bath_towel.n.01_1 bed.n.01_1) + (ontop hand_towel.n.01_1 bed.n.01_1) + (inroom floor.n.01_1 bedroom) + (inroom bed.n.01_1 bathroom) (inroom towel_rack.n.01_1 bathroom) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl b/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl index 0aad4847..8e3a6aa0 100644 --- a/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl +++ b/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl @@ -24,7 +24,7 @@ (filled bowl.n.01_1 cooked__penne.n.01_1) (filled bowl.n.01_2 cooked__chickpea.n.01_1) (ontop plate.n.04_1 breakfast_table.n.01_1) - (ontop tablefork.n.01_1 plate.n.04_1) + (ontop tablefork.n.01_1 breakfast_table.n.01_1) (ontop napkin.n.01_1 breakfast_table.n.01_1) (ontop tablespoon.n.02_1 breakfast_table.n.01_1) (ontop bap.n.01_1 console_table.n.01_2) diff --git a/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl b/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl index 9413a3e7..159ac355 100644 --- a/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl +++ b/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl @@ -8,13 +8,14 @@ diced__virginia_ham.n.01_1 - diced__virginia_ham.n.01 place_mat.n.01_1 - place_mat.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 - tray.n.01_1 tray.n.01_2 - tray.n.01 + tray.n.01_1 - tray.n.01 teacup.n.02_1 - teacup.n.02 teapot.n.01_1 - teapot.n.01 scone.n.01_1 - scone.n.01 jar__of__jam.n.01_1 - jar__of__jam.n.01 sugar_cookie.n.01_1 - sugar_cookie.n.01 jar__of__honey.n.01_1 - jar__of__honey.n.01 + bowl.n.01_1 bowl.n.01_2 bowl.n.01_3 - bowl.n.01 plate.n.04_1 - plate.n.04 table_knife.n.01_1 table_knife.n.01_2 - table_knife.n.01 tablefork.n.01_1 - tablefork.n.01 @@ -35,10 +36,12 @@ (ontop danish.n.02_1 tray.n.01_1) (ontop scone.n.01_1 tray.n.01_1) (ontop sugar_cookie.n.01_1 tray.n.01_1) - (ontop tray.n.01_2 console_table.n.01_3) - (filled tray.n.01_2 diced__virginia_ham.n.01_1) - (filled tray.n.01_2 diced__cheddar.n.01_1) - (filled tray.n.01_2 diced__cucumber.n.01_1) + (ontop bowl.n.01_1 console_table.n.01_3) + (ontop bowl.n.01_2 console_table.n.01_3) + (ontop bowl.n.01_3 console_table.n.01_3) + (filled bowl.n.01_1 diced__virginia_ham.n.01_1) + (filled bowl.n.01_2 diced__cheddar.n.01_1) + (filled bowl.n.01_3 diced__cucumber.n.01_1) (ontop table_knife.n.01_1 console_table.n.01_4) (ontop table_knife.n.01_2 console_table.n.01_4) (ontop tablefork.n.01_1 console_table.n.01_4) @@ -73,12 +76,7 @@ (?table_knife.n.01 - table_knife.n.01) (touching ?table_knife.n.01 ?jar__of__jam.n.01_1) ) - (ontop ?tray.n.01_1 ?breakfast_table.n.01_1) - (contains ?tray.n.01_2 ?diced__cheddar.n.01_1) - (contains ?tray.n.01_2 ?diced__cucumber.n.01_1) - (contains ?tray.n.01_2 ?diced__virginia_ham.n.01_1) - (nextto ?tray.n.01_2 ?tray.n.01_1) - + (ontop ?tray.n.01_1 ?breakfast_table.n.01_1) (nextto ?teacup.n.02_1 ?plate.n.04_1) (ontop ?teapot.n.01_1 ?breakfast_table.n.01_1) (ontop ?plate.n.04_1 ?place_mat.n.01_1) diff --git a/bddl/activity_definitions/taking_clothes_off_of_the_drying_rack/problem0.bddl b/bddl/activity_definitions/taking_clothes_off_of_the_drying_rack/problem0.bddl index 4ca97045..22953b6e 100644 --- a/bddl/activity_definitions/taking_clothes_off_of_the_drying_rack/problem0.bddl +++ b/bddl/activity_definitions/taking_clothes_off_of_the_drying_rack/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - clothesline.n.01_1 - clothesline.n.01 + coatrack.n.01_1 - coatrack.n.01 blouse.n.01_1 - blouse.n.01 tank_top.n.01_1 - tank_top.n.01 hamper.n.02_1 - hamper.n.02 @@ -11,10 +11,10 @@ ) (:init - (draped blouse.n.01_1 clothesline.n.01_1) - (draped tank_top.n.01_1 clothesline.n.01_1) + (draped blouse.n.01_1 coatrack.n.01_1) + (draped tank_top.n.01_1 coatrack.n.01_1) (ontop hamper.n.02_1 floor.n.01_1) - (ontop clothesline.n.01_1 floor.n.01_1) + (ontop coatrack.n.01_1 floor.n.01_1) (inroom floor.n.01_1 living_room) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl b/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl index ae33d2a8..e8fe3252 100644 --- a/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl +++ b/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl @@ -5,7 +5,7 @@ car.n.01_1 - car.n.01 driveway.n.01_1 - driveway.n.01 floor.n.01_1 - floor.n.01 - grocery.n.02_1 grocery.n.02_2 grocery.n.02_3 grocery.n.02_4 grocery.n.02_5 - grocery.n.02 + grocery.n.02_1 grocery.n.02_2 grocery.n.02_3 - grocery.n.02 cabinet.n.01_1 - cabinet.n.01 agent.n.01_1 - agent.n.01 ) @@ -14,9 +14,7 @@ (ontop car.n.01_1 driveway.n.01_1) (inside grocery.n.02_1 car.n.01_1) (inside grocery.n.02_2 car.n.01_1) - (inside grocery.n.02_3 car.n.01_1) - (inside grocery.n.02_4 car.n.01_1) - (inside grocery.n.02_5 car.n.01_1) + (inside grocery.n.02_3 car.n.01_1) (inroom driveway.n.01_1 garden) (inroom floor.n.01_1 kitchen) (inroom cabinet.n.01_1 kitchen) diff --git a/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl b/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl index b9fdd5bf..6dd5d8ca 100644 --- a/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl +++ b/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl @@ -4,12 +4,11 @@ (:objects rug.n.01_1 - rug.n.01 floor.n.01_1 - floor.n.01 - carton.n.02_1 - carton.n.02 + carton.n.02_1 carton.n.02_2 - carton.n.02 sofa.n.01_1 - sofa.n.01 laptop.n.01_1 - laptop.n.01 videodisk.n.01_1 videodisk.n.01_2 - videodisk.n.01 battery.n.02_1 - battery.n.02 - wire.n.02_1 - wire.n.02 book.n.02_1 - book.n.02 shelf.n.01_1 - shelf.n.01 agent.n.01_1 - agent.n.01 @@ -18,13 +17,13 @@ (:init (ontop rug.n.01_1 floor.n.01_1) (open carton.n.02_1) - (ontop carton.n.02_1 sofa.n.01_1) + (ontop carton.n.02_1 floor.n.01_1) (inside laptop.n.01_1 carton.n.02_1) (inside videodisk.n.01_1 carton.n.02_1) - (inside videodisk.n.01_2 carton.n.02_1) + (inside videodisk.n.01_2 carton.n.02_1) + (ontop carton.n.02_2 floor.n.01_1) (inside battery.n.02_1 carton.n.02_1) - (inside wire.n.02_1 carton.n.02_1) - (inside book.n.02_1 carton.n.02_1) + (inside book.n.02_1 carton.n.02_1) (inroom floor.n.01_1 living_room) (inroom sofa.n.01_1 living_room) (inroom shelf.n.01_1 living_room) @@ -46,9 +45,7 @@ ) ) (ontop ?battery.n.02_1 ?shelf.n.01_1) - (ontop ?wire.n.02_1 ?laptop.n.01_1) (ontop ?book.n.02_1 ?shelf.n.01_1) - ) )