diff --git a/bddl/activity_definitions/assembling_gift_baskets/problem0.bddl b/bddl/activity_definitions/assembling_gift_baskets/problem0.bddl index f9f721bf..6388a8d2 100644 --- 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 index 7bbf22f1..5dea166f 100644 --- 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 index 17d69e83..4b710ff6 100644 --- 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 index 990d015c..c844da1f 100644 --- 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 index be4ef122..e226c205 100644 --- 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 index 54966433..b8a6ed8e 100644 --- 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) ) ) ) ) ) -) \ No newline at end of file +) diff --git a/bddl/activity_definitions/buying_fast_food/problem0.bddl b/bddl/activity_definitions/buying_fast_food/problem0.bddl index 12e57193..5feecea6 100644 --- 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 index f0cd11a2..8628fb38 100644 --- 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 index 34a39d22..9fcaa13e 100644 --- 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 index f167ab12..77f71837 100644 --- a/bddl/activity_definitions/clean_a_LED_screen/problem0.bddl +++ b/bddl/activity_definitions/clean_a_LED_screen/problem0.bddl @@ -3,7 +3,7 @@ (: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 @@ -11,9 +11,9 @@ ) (: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 index 541a8296..4cdb4ac9 100644 --- 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 index 30f4de4f..52bdb22d 100644 --- 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 index fde5e22c..53e15d04 100644 --- 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) ) ) -) \ No newline at end of file +) 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 index cddb797b..d738f9c6 100644 --- a/bddl/activity_definitions/clean_a_loofah_or_natural_sponge/problem0.bddl +++ b/bddl/activity_definitions/clean_a_loofah_or_natural_sponge/problem0.bddl @@ -3,7 +3,7 @@ (:objects stain.n.01_1 - stain.n.01 - loofah.n.02_1 - loofah.n.02 + loofa.n.01_1 - loofa.n.01 water.n.06_1 - water.n.06 rag.n.01_1 - rag.n.01 bleaching_agent.n.01_1 - bleaching_agent.n.01 @@ -14,10 +14,10 @@ ) (:init - (covered loofah.n.02_1 stain.n.01_1) + (covered loofa.n.01_1 stain.n.01_1) (filled bleaching_agent__bottle.n.01_1 bleaching_agent.n.01_1) (ontop bleaching_agent__bottle.n.01_1 floor.n.01_1) - (inside loofah.n.02_1 sink.n.01_1) + (inside loofa.n.01_1 sink.n.01_1) (inside rag.n.01_1 sink.n.01_1) (insource sink.n.01_1 water.n.06_1) (inroom sink.n.01_1 bathroom) @@ -28,7 +28,7 @@ (:goal (and (not - (covered ?loofah.n.02_1 ?stain.n.01_1) + (covered ?loofa.n.01_1 ?stain.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/clean_a_raincoat/problem0.bddl b/bddl/activity_definitions/clean_a_raincoat/problem0.bddl index 36e56929..54d630e4 100644 --- a/bddl/activity_definitions/clean_a_raincoat/problem0.bddl +++ b/bddl/activity_definitions/clean_a_raincoat/problem0.bddl @@ -15,8 +15,8 @@ ) (:init - (covered raincoat.n.01_1 stain.n.01_1) - (ontop raincoat.n.01_1 floor.n.01_1) + (covered raincoat.n.01_1 stain.n.01_1) + (ontop raincoat.n.01_1 floor.n.01_1) (filled detergent__bottle.n.01_1 detergent.n.02_1) (inside detergent__bottle.n.01_1 cabinet.n.01_1) (inroom washer.n.03_1 utility_room) diff --git a/bddl/activity_definitions/clean_an_electric_razor/problem0.bddl b/bddl/activity_definitions/clean_an_electric_razor/problem0.bddl index cd98753b..521fc3a1 100644 --- a/bddl/activity_definitions/clean_an_electric_razor/problem0.bddl +++ b/bddl/activity_definitions/clean_an_electric_razor/problem0.bddl @@ -7,7 +7,7 @@ liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 tissue.n.02_1 - tissue.n.02 - hair.n.01_1 - hair.n.01 + 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 @@ -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 tissue.n.02_1 floor.n.01_1) - (covered razor.n.01_1 hair.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) @@ -32,7 +32,7 @@ (:goal (and (not - (covered ?razor.n.01_1 ?hair.n.01_1) + (covered ?razor.n.01_1 ?hair.n.04_1) ) (not (covered ?razor.n.01_1 ?lotion.n.01_1) diff --git a/bddl/activity_definitions/clean_an_office_chair/problem0.bddl b/bddl/activity_definitions/clean_an_office_chair/problem0.bddl index ed7fa08f..3fba335e 100644 --- a/bddl/activity_definitions/clean_an_office_chair/problem0.bddl +++ b/bddl/activity_definitions/clean_an_office_chair/problem0.bddl @@ -14,7 +14,7 @@ (ontop hand_towel.n.01_1 floor.n.01_1) (covered swivel_chair.n.01_1 dust.n.01_1) (covered swivel_chair.n.01_1 lint.n.01_1) - (inroom swivel_chair.n.01_1 shared_office) + (inroom swivel_chair.n.01_1 shared_office) (inroom floor.n.01_1 shared_office) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/clean_bok_choy/problem0.bddl b/bddl/activity_definitions/clean_bok_choy/problem0.bddl index 89e5427a..0d303514 100644 --- a/bddl/activity_definitions/clean_bok_choy/problem0.bddl +++ b/bddl/activity_definitions/clean_bok_choy/problem0.bddl @@ -5,7 +5,7 @@ chopping_board.n.01_1 - chopping_board.n.01 floor.n.01_1 - floor.n.01 paper_towel.n.01_1 - paper_towel.n.01 - bok_choy.n.01_1 - bok_choy.n.01 + bok_choy.n.02_1 - bok_choy.n.02 countertop.n.01_1 - countertop.n.01 sink.n.01_1 - sink.n.01 water.n.06_1 - water.n.06 @@ -16,8 +16,8 @@ (:init (ontop chopping_board.n.01_1 countertop.n.01_1) (ontop paper_towel.n.01_1 countertop.n.01_1) - (ontop bok_choy.n.01_1 chopping_board.n.01_1) - (covered bok_choy.n.01_1 dirt.n.02_1) + (ontop bok_choy.n.02_1 chopping_board.n.01_1) + (covered bok_choy.n.02_1 dirt.n.02_1) (insource sink.n.01_1 water.n.06_1) (inroom floor.n.01_1 kitchen) (inroom sink.n.01_1 kitchen) @@ -28,7 +28,7 @@ (:goal (and (not - (covered ?bok_choy.n.01_1 ?dirt.n.02_1) + (covered ?bok_choy.n.02_1 ?dirt.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/clean_brass_casings/problem0.bddl b/bddl/activity_definitions/clean_brass_casings/problem0.bddl index 09e34f03..22145c99 100644 --- a/bddl/activity_definitions/clean_brass_casings/problem0.bddl +++ b/bddl/activity_definitions/clean_brass_casings/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - shell.n.08_1 shell.n.08_2 - shell.n.08 + jacket.n.05_1 jacket.n.05_2 - jacket.n.05 stain.n.01_1 - stain.n.01 coffee_table.n.01_1 - coffee_table.n.01 lemon_juice.n.01_1 - lemon_juice.n.01 @@ -13,10 +13,10 @@ ) (:init - (ontop shell.n.08_1 coffee_table.n.01_1) - (covered shell.n.08_1 stain.n.01_1) - (ontop shell.n.08_2 coffee_table.n.01_1) - (covered shell.n.08_2 stain.n.01_1) + (ontop jacket.n.05_1 coffee_table.n.01_1) + (covered jacket.n.05_1 stain.n.01_1) + (ontop jacket.n.05_2 coffee_table.n.01_1) + (covered jacket.n.05_2 stain.n.01_1) (filled lemon_juice__bottle.n.01_1 lemon_juice.n.01_1) (ontop lemon_juice__bottle.n.01_1 coffee_table.n.01_1) (ontop rag.n.01_1 coffee_table.n.01_1) @@ -28,9 +28,9 @@ (:goal (and (forall - (?shell.n.08 - shell.n.08) + (?jacket.n.05 - jacket.n.05) (not - (covered ?shell.n.08 ?stain.n.01_1) + (covered ?jacket.n.05 ?stain.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/clean_cabbage/problem0.bddl b/bddl/activity_definitions/clean_cabbage/problem0.bddl index 405b81f5..27c000a8 100644 --- a/bddl/activity_definitions/clean_cabbage/problem0.bddl +++ b/bddl/activity_definitions/clean_cabbage/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - cabbage.n.03_1 - cabbage.n.03 + head_cabbage.n.02_1 - head_cabbage.n.02 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 wicker_basket.n.01_1 - wicker_basket.n.01 floor.n.01_1 - floor.n.01 @@ -14,10 +14,10 @@ ) (:init - (inside cabbage.n.03_1 electric_refrigerator.n.01_1) + (inside head_cabbage.n.02_1 electric_refrigerator.n.01_1) (ontop wicker_basket.n.01_1 floor.n.01_1) (inside paper_towel.n.01_1 wicker_basket.n.01_1) - (covered cabbage.n.03_1 dirt.n.02_1) + (covered head_cabbage.n.02_1 dirt.n.02_1) (insource sink.n.01_1 water.n.06_1) (inroom electric_refrigerator.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) @@ -28,7 +28,7 @@ (:goal (and (not - (covered ?cabbage.n.03_1 ?dirt.n.02_1) + (covered ?head_cabbage.n.02_1 ?dirt.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/clean_clams/problem0.bddl b/bddl/activity_definitions/clean_clams/problem0.bddl index e5a78a42..c600309d 100644 --- a/bddl/activity_definitions/clean_clams/problem0.bddl +++ b/bddl/activity_definitions/clean_clams/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - clam.n.01_1 clam.n.01_2 - clam.n.01 + clam.n.03_1 clam.n.03_2 - clam.n.03 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 countertop.n.01_1 - countertop.n.01 bowl.n.01_1 - bowl.n.01 @@ -15,10 +15,10 @@ ) (:init - (inside clam.n.01_1 bowl.n.01_1) - (inside clam.n.01_2 bowl.n.01_1) - (covered clam.n.01_1 sand.n.04_1) - (covered clam.n.01_2 sand.n.04_1) + (inside clam.n.03_1 bowl.n.01_1) + (inside clam.n.03_2 bowl.n.01_1) + (covered clam.n.03_1 sand.n.04_1) + (covered clam.n.03_2 sand.n.04_1) (ontop rag.n.01_1 countertop.n.01_1) (ontop bowl.n.01_1 countertop.n.01_1) (insource sink.n.01_1 water.n.06_1) @@ -32,9 +32,9 @@ (:goal (and (forall - (?clam.n.01 - clam.n.01) + (?clam.n.03 - clam.n.03) (not - (covered ?clam.n.01 ?sand.n.04_1) + (covered ?clam.n.03 ?sand.n.04_1) ) ) ) diff --git a/bddl/activity_definitions/clean_copper_wire/problem0.bddl b/bddl/activity_definitions/clean_copper_wire/problem0.bddl index 4895094f..50770b9e 100644 --- a/bddl/activity_definitions/clean_copper_wire/problem0.bddl +++ b/bddl/activity_definitions/clean_copper_wire/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - copper.n.01_1 - copper.n.01 + copper_wire.n.01_1 - copper_wire.n.01 countertop.n.01_1 - countertop.n.01 salt.n.02_1 - salt.n.02 salt__shaker.n.01_1 - salt__shaker.n.01 @@ -18,8 +18,8 @@ ) (:init - (covered copper.n.01_1 rust.n.01_1) - (ontop copper.n.01_1 countertop.n.01_1) + (covered copper_wire.n.01_1 rust.n.01_1) + (ontop copper_wire.n.01_1 countertop.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 countertop.n.01_1) (filled cornstarch__jar.n.01_1 cornstarch.n.01_1) @@ -36,7 +36,7 @@ (:goal (and (not - (covered ?copper.n.01_1 ?rust.n.01_1) + (covered ?copper_wire.n.01_1 ?rust.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/clean_mirrors/problem0.bddl b/bddl/activity_definitions/clean_mirrors/problem0.bddl index ede85585..972a3718 100644 --- a/bddl/activity_definitions/clean_mirrors/problem0.bddl +++ b/bddl/activity_definitions/clean_mirrors/problem0.bddl @@ -16,32 +16,32 @@ floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) - - (:init - (filled vinegar__atomizer.n.01_1 vinegar.n.01_1) - (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1) - (ontop vinegar__atomizer.n.01_1 floor.n.01_1) + + (:init + (filled vinegar__atomizer.n.01_1 vinegar.n.01_1) + (filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1) + (ontop vinegar__atomizer.n.01_1 floor.n.01_1) (ontop liquid_soap__bottle.n.01_1 floor.n.01_1) - (ontop paper_towel.n.01_1 floor.n.01_1) - (covered mirror.n.01_1 dust.n.01_1) + (ontop paper_towel.n.01_1 floor.n.01_1) + (covered mirror.n.01_1 dust.n.01_1) (covered mirror.n.01_1 baby_oil.n.01_1) (covered mirror.n.01_1 toothpaste.n.01_1) - (insource sink.n.01_1 water.n.06_1) - (ontop agent.n.01_1 floor.n.01_1) - (inroom sink.n.01_1 bathroom) - (inroom mirror.n.01_1 bathroom) + (insource sink.n.01_1 water.n.06_1) + (ontop agent.n.01_1 floor.n.01_1) + (inroom sink.n.01_1 bathroom) + (inroom mirror.n.01_1 bathroom) (inroom floor.n.01_1 bathroom) ) - - (:goal - (and - (not + + (:goal + (and + (not (covered ?mirror.n.01_1 ?dust.n.01_1) ) - (not + (not (covered ?mirror.n.01_1 ?baby_oil.n.01_1) ) - (not + (not (covered ?mirror.n.01_1 ?toothpaste.n.01_1) ) ) diff --git a/bddl/activity_definitions/clean_nickel/problem0.bddl b/bddl/activity_definitions/clean_nickel/problem0.bddl index 5861e50f..c9daa479 100644 --- a/bddl/activity_definitions/clean_nickel/problem0.bddl +++ b/bddl/activity_definitions/clean_nickel/problem0.bddl @@ -8,7 +8,7 @@ vinegar.n.01_1 - vinegar.n.01 vinegar__bottle.n.01_1 - vinegar__bottle.n.01 countertop.n.01_1 - countertop.n.01 - nickel.n.01_1 nickel.n.01_2 nickel.n.01_3 - nickel.n.01 + nickel.n.02_1 nickel.n.02_2 nickel.n.02_3 - nickel.n.02 stain.n.01_1 - stain.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 @@ -18,12 +18,12 @@ (ontop rag.n.01_1 countertop.n.01_1) (filled vinegar__bottle.n.01_1 vinegar.n.01_1) (ontop vinegar__bottle.n.01_1 countertop.n.01_1) - (ontop nickel.n.01_1 countertop.n.01_1) - (ontop nickel.n.01_2 countertop.n.01_1) - (ontop nickel.n.01_3 countertop.n.01_1) - (covered nickel.n.01_1 stain.n.01_1) - (covered nickel.n.01_2 stain.n.01_1) - (covered nickel.n.01_3 stain.n.01_1) + (ontop nickel.n.02_1 countertop.n.01_1) + (ontop nickel.n.02_2 countertop.n.01_1) + (ontop nickel.n.02_3 countertop.n.01_1) + (covered nickel.n.02_1 stain.n.01_1) + (covered nickel.n.02_2 stain.n.01_1) + (covered nickel.n.02_3 stain.n.01_1) (insource sink.n.01_1 water.n.06_1) (inroom sink.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) @@ -34,9 +34,9 @@ (:goal (and (forall - (?nickel.n.01 - nickel.n.01) + (?nickel.n.02 - nickel.n.02) (not - (covered ?nickel.n.01 ?stain.n.01_1) + (covered ?nickel.n.02 ?stain.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/clean_out_a_guinea_pigs_hutch/problem0.bddl b/bddl/activity_definitions/clean_out_a_guinea_pigs_hutch/problem0.bddl index 38a3dd84..aa0fb76c 100644 --- a/bddl/activity_definitions/clean_out_a_guinea_pigs_hutch/problem0.bddl +++ b/bddl/activity_definitions/clean_out_a_guinea_pigs_hutch/problem0.bddl @@ -26,7 +26,7 @@ (ontop newspaper.n.03_1 floor.n.01_1) (ontop ashcan.n.01_1 floor.n.01_1) (covered hutch.n.01_1 fecal_matter.n.01_1) - (inside hay.n.01_1 hutch.n.01_1) + (covered hutch.n.01_1 hay.n.01_1) (insource water__atomizer.n.01_1 water.n.06_1) (ontop water__atomizer.n.01_1 floor.n.01_1) (insource vinegar__atomizer.n.01_1 vinegar.n.01_1) @@ -46,7 +46,9 @@ (not (covered ?hutch.n.01_1 ?fecal_matter.n.01_1) ) - (inside ?hay.n.01_1 ?ashcan.n.01_1) + (not + (covered ?hutch.n.01_1 ?hay.n.01_1) + ) (covered ?hutch.n.01_1 ?disinfectant.n.01_1) ) ) diff --git a/bddl/activity_definitions/clean_oysters/problem0.bddl b/bddl/activity_definitions/clean_oysters/problem0.bddl index b08085cd..06f0192b 100644 --- a/bddl/activity_definitions/clean_oysters/problem0.bddl +++ b/bddl/activity_definitions/clean_oysters/problem0.bddl @@ -6,7 +6,7 @@ sink.n.01_1 - sink.n.01 dirt.n.02_1 - dirt.n.02 sand.n.04_1 - sand.n.04 - oyster.n.01_1 oyster.n.01_2 oyster.n.01_3 oyster.n.01_4 oyster.n.01_5 oyster.n.01_6 - oyster.n.01 + huitre.n.01_1 huitre.n.01_2 huitre.n.01_3 huitre.n.01_4 huitre.n.01_5 huitre.n.01_6 - huitre.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 countertop.n.01_1 - countertop.n.01 tupperware.n.01_1 - tupperware.n.01 @@ -18,24 +18,24 @@ (:init (ontop bowl.n.01_1 countertop.n.01_1) - (covered oyster.n.01_1 dirt.n.02_1) - (covered oyster.n.01_2 dirt.n.02_1) - (covered oyster.n.01_3 dirt.n.02_1) - (covered oyster.n.01_4 dirt.n.02_1) - (covered oyster.n.01_5 dirt.n.02_1) - (covered oyster.n.01_6 dirt.n.02_1) - (covered oyster.n.01_1 sand.n.04_1) - (covered oyster.n.01_2 sand.n.04_1) - (covered oyster.n.01_3 sand.n.04_1) - (covered oyster.n.01_4 sand.n.04_1) - (covered oyster.n.01_5 sand.n.04_1) - (covered oyster.n.01_6 sand.n.04_1) - (inside oyster.n.01_1 tupperware.n.01_1) - (inside oyster.n.01_2 tupperware.n.01_1) - (inside oyster.n.01_3 tupperware.n.01_1) - (inside oyster.n.01_4 tupperware.n.01_1) - (inside oyster.n.01_5 tupperware.n.01_1) - (inside oyster.n.01_6 tupperware.n.01_1) + (covered huitre.n.01_1 dirt.n.02_1) + (covered huitre.n.01_2 dirt.n.02_1) + (covered huitre.n.01_3 dirt.n.02_1) + (covered huitre.n.01_4 dirt.n.02_1) + (covered huitre.n.01_5 dirt.n.02_1) + (covered huitre.n.01_6 dirt.n.02_1) + (covered huitre.n.01_1 sand.n.04_1) + (covered huitre.n.01_2 sand.n.04_1) + (covered huitre.n.01_3 sand.n.04_1) + (covered huitre.n.01_4 sand.n.04_1) + (covered huitre.n.01_5 sand.n.04_1) + (covered huitre.n.01_6 sand.n.04_1) + (inside huitre.n.01_1 tupperware.n.01_1) + (inside huitre.n.01_2 tupperware.n.01_1) + (inside huitre.n.01_3 tupperware.n.01_1) + (inside huitre.n.01_4 tupperware.n.01_1) + (inside huitre.n.01_5 tupperware.n.01_1) + (inside huitre.n.01_6 tupperware.n.01_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) (ontop rag.n.01_1 countertop.n.01_1) (insource sink.n.01_1 water.n.06_1) @@ -49,15 +49,15 @@ (:goal (and (forall - (?oyster.n.01 - oyster.n.01) + (?huitre.n.01 - huitre.n.01) (and (not - (covered ?oyster.n.01 ?dirt.n.02_1) + (covered ?huitre.n.01 ?dirt.n.02_1) ) (not - (covered ?oyster.n.01 ?sand.n.04_1) + (covered ?huitre.n.01 ?sand.n.04_1) ) - (inside ?oyster.n.01 ?tupperware.n.01_1) + (inside ?huitre.n.01 ?tupperware.n.01_1) ) ) (inside ?tupperware.n.01_1 ?electric_refrigerator.n.01_1) diff --git a/bddl/activity_definitions/clean_prawns/problem0.bddl b/bddl/activity_definitions/clean_prawns/problem0.bddl index 9d0b22a2..d5ebb3e8 100644 --- a/bddl/activity_definitions/clean_prawns/problem0.bddl +++ b/bddl/activity_definitions/clean_prawns/problem0.bddl @@ -2,22 +2,28 @@ (:domain omnigibson) (:objects - shell.n.02_1 - shell.n.02 - shrimp.n.03_1 - shrimp.n.03 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 - prawn.n.01 + rag.n.01_1 - rag.n.01 bowl.n.01_1 - bowl.n.01 countertop.n.01_1 - countertop.n.01 water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 cabinet.n.01_1 - cabinet.n.01 + sand.n.04_1 - sand.n.04 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) (:init - (attached shell.n.02_1 shrimp.n.03_1) - (ontop bowl.n.01_1 countertop.n.01_1) - (ontop shrimp.n.03_1 bowl.n.01_1) + (ontop bowl.n.01_1 countertop.n.01_1) + (ontop rag.n.01_1 countertop.n.01_1) + (inside prawn.n.01_1 bowl.n.01_1) + (inside prawn.n.01_2 bowl.n.01_1) + (inside prawn.n.01_3 bowl.n.01_1) + (covered prawn.n.01_1 sand.n.04_1) + (covered prawn.n.01_2 sand.n.04_1) + (covered prawn.n.01_3 sand.n.04_1) (insource sink.n.01_1 water.n.06_1) (inroom sink.n.01_1 kitchen) (inroom electric_refrigerator.n.01_1 kitchen) @@ -29,8 +35,11 @@ (:goal (and - (not - (attached ?shell.n.02_1 ?shrimp.n.03_1) + (forall + (?prawn.n.01 - prawn.n.01) + (not + (covered ?prawn.n.01 ?sand.n.04_1) + ) ) ) ) diff --git a/bddl/activity_definitions/clean_quartz/problem0.bddl b/bddl/activity_definitions/clean_quartz/problem0.bddl index ba82617f..6e0bd5f5 100644 --- a/bddl/activity_definitions/clean_quartz/problem0.bddl +++ b/bddl/activity_definitions/clean_quartz/problem0.bddl @@ -4,7 +4,6 @@ (:objects rag.n.01_1 - rag.n.01 countertop.n.01_1 - countertop.n.01 - quartz.n.02_1 - quartz.n.02 dirt.n.02_1 - dirt.n.02 water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 @@ -14,8 +13,7 @@ (:init (ontop rag.n.01_1 countertop.n.01_1) - (ontop quartz.n.02_1 countertop.n.01_1) - (covered quartz.n.02_1 dirt.n.02_1) + (covered countertop.n.01_1 dirt.n.02_1) (insource sink.n.01_1 water.n.06_1) (inroom sink.n.01_1 bathroom) (inroom floor.n.01_1 bathroom) @@ -26,7 +24,7 @@ (:goal (and (not - (covered ?quartz.n.02_1 ?dirt.n.02_1) + (covered ?countertop.n.01_1 ?dirt.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/clean_seashells/problem0.bddl b/bddl/activity_definitions/clean_seashells/problem0.bddl index 85893256..432d7035 100644 --- a/bddl/activity_definitions/clean_seashells/problem0.bddl +++ b/bddl/activity_definitions/clean_seashells/problem0.bddl @@ -3,7 +3,7 @@ (:objects sand.n.04_1 - sand.n.04 - shell.n.02_1 shell.n.02_2 shell.n.02_3 - shell.n.02 + seashell.n.01_1 seashell.n.01_2 seashell.n.01_3 - seashell.n.01 rag.n.01_1 - rag.n.01 countertop.n.01_1 - countertop.n.01 water.n.06_1 - water.n.06 @@ -13,12 +13,12 @@ ) (:init - (covered shell.n.02_1 sand.n.04_1) - (ontop shell.n.02_1 countertop.n.01_1) - (covered shell.n.02_2 sand.n.04_1) - (ontop shell.n.02_2 countertop.n.01_1) - (covered shell.n.02_3 sand.n.04_1) - (ontop shell.n.02_3 countertop.n.01_1) + (covered seashell.n.01_1 sand.n.04_1) + (ontop seashell.n.01_1 countertop.n.01_1) + (covered seashell.n.01_2 sand.n.04_1) + (ontop seashell.n.01_2 countertop.n.01_1) + (covered seashell.n.01_3 sand.n.04_1) + (ontop seashell.n.01_3 countertop.n.01_1) (ontop rag.n.01_1 countertop.n.01_1) (insource sink.n.01_1 water.n.06_1) (inroom sink.n.01_1 bathroom) @@ -30,9 +30,9 @@ (:goal (and (forall - (?shell.n.02 - shell.n.02) + (?seashell.n.01 - seashell.n.01) (not - (covered ?shell.n.02 ?sand.n.04_1) + (covered ?seashell.n.01 ?sand.n.04_1) ) ) ) diff --git a/bddl/activity_definitions/clean_shrimp/problem0.bddl b/bddl/activity_definitions/clean_shrimp/problem0.bddl index 557741cc..1ab455e5 100644 --- a/bddl/activity_definitions/clean_shrimp/problem0.bddl +++ b/bddl/activity_definitions/clean_shrimp/problem0.bddl @@ -3,7 +3,7 @@ (:objects sand.n.04_1 - sand.n.04 - shrimp.n.03_1 shrimp.n.03_2 shrimp.n.03_3 - shrimp.n.03 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 - prawn.n.01 chopping_board.n.01_1 - chopping_board.n.01 oven.n.01_1 - oven.n.01 carving_knife.n.01_1 - carving_knife.n.01 @@ -14,14 +14,14 @@ agent.n.01_1 - agent.n.01 ) - (:init - (ontop shrimp.n.03_2 chopping_board.n.01_1) - (ontop shrimp.n.03_3 chopping_board.n.01_1) - (ontop chopping_board.n.01_1 oven.n.01_1) - (ontop shrimp.n.03_1 chopping_board.n.01_1) - (covered shrimp.n.03_1 sand.n.04_1) - (covered shrimp.n.03_2 sand.n.04_1) - (covered shrimp.n.03_3 sand.n.04_1) + (:init + (ontop chopping_board.n.01_1 oven.n.01_1) + (ontop prawn.n.01_1 chopping_board.n.01_1) + (ontop prawn.n.01_2 chopping_board.n.01_1) + (ontop prawn.n.01_3 chopping_board.n.01_1) + (covered prawn.n.01_1 sand.n.04_1) + (covered prawn.n.01_2 sand.n.04_1) + (covered prawn.n.01_3 sand.n.04_1) (ontop carving_knife.n.01_1 chopping_board.n.01_1) (insource sink.n.01_1 water.n.06_1) (inroom oven.n.01_1 kitchen) @@ -34,9 +34,9 @@ (:goal (and (forall - (?shrimp.n.03 - shrimp.n.03) + (?prawn.n.01 - prawn.n.01) (not - (covered ?shrimp.n.03 ?sand.n.04_1) + (covered ?prawn.n.01 ?sand.n.04_1) ) ) ) diff --git a/bddl/activity_definitions/clean_tweed/problem0.bddl b/bddl/activity_definitions/clean_tweed/problem0.bddl index e90c252a..399d9b2a 100644 --- a/bddl/activity_definitions/clean_tweed/problem0.bddl +++ b/bddl/activity_definitions/clean_tweed/problem0.bddl @@ -16,10 +16,10 @@ ) (:init - (covered wool_coat.n.01_1 stain.n.01_1) - (covered wool_coat.n.01_2 stain.n.01_1) - (ontop wool_coat.n.01_1 countertop.n.01_1) - (ontop wool_coat.n.01_2 countertop.n.01_1) + (covered wool_coat.n.01_1 stain.n.01_1) + (covered wool_coat.n.01_2 stain.n.01_1) + (ontop wool_coat.n.01_1 countertop.n.01_1) + (ontop wool_coat.n.01_2 countertop.n.01_1) (ontop sponge.n.01_1 countertop.n.01_1) (filled shampoo__bottle.n.01_1 shampoo.n.01_1) (ontop shampoo__bottle.n.01_1 countertop.n.01_1) @@ -35,7 +35,7 @@ (:goal (and (forall - (?wool_coat.n.01 - wool_coat.n.01) + (?wool_coat.n.01 - wool_coat.n.01) (not (covered ?wool_coat.n.01 ?stain.n.01_1) ) diff --git a/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl b/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl index 7bede99f..6bbd1215 100644 --- a/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl +++ b/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - raw_egg.n.01_1 - raw_egg.n.01 + beaten_egg.n.01_1 - beaten_egg.n.01 floor.n.01_1 - floor.n.01 sink.n.01_1 - sink.n.01 paper_towel.n.01_1 - paper_towel.n.01 @@ -12,7 +12,7 @@ ) (:init - (ontop raw_egg.n.01_1 floor.n.01_1) + (covered floor.n.01_1 beaten_egg.n.01_1) (ontop paper_towel.n.01_1 countertop.n.01_1) (inroom floor.n.01_1 kitchen) (insource sink.n.01_1 water.n.06_1) @@ -24,7 +24,7 @@ (:goal (and (not - (ontop ?raw_egg.n.01_1 ?floor.n.01_1) + (covered floor.n.01_1 beaten_egg.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 index fc9feaf2..b0033d26 100644 --- a/bddl/activity_definitions/clean_up_your_desk/problem0.bddl +++ b/bddl/activity_definitions/clean_up_your_desk/problem0.bddl @@ -27,16 +27,16 @@ (ontop mail.n.04_1 notebook.n.01_1) (ontop mail.n.04_2 desk.n.01_1) (ontop folder.n.02_1 desk.n.01_1) - (ontop folder.n.02_2 swivel_chair.n.01_1) + (ontop folder.n.02_2 swivel_chair.n.01_1) (ontop shears.n.01_1 floor.n.01_1) (ontop pencil.n.01_1 desk.n.01_1) - (ontop pen.n.01_1 swivel_chair.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 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 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) diff --git a/bddl/activity_definitions/clean_wood_siding/problem0.bddl b/bddl/activity_definitions/clean_wood_siding/problem0.bddl index a826f6a5..eb576bc8 100644 --- a/bddl/activity_definitions/clean_wood_siding/problem0.bddl +++ b/bddl/activity_definitions/clean_wood_siding/problem0.bddl @@ -2,9 +2,7 @@ (:domain omnigibson) (:objects - wax.n.01_1 - wax.n.01 adhesive_material.n.01_1 - adhesive_material.n.01 - wax__jar.n.01_1 - wax__jar.n.01 rubbing_alcohol.n.01_1 - rubbing_alcohol.n.01 rubbing_alcohol__bottle.n.01_1 - rubbing_alcohol__bottle.n.01 door.n.01_1 - door.n.01 @@ -14,12 +12,10 @@ ) (:init - (filled wax__jar.n.01_1 wax.n.01_1) (covered door.n.01_1 adhesive_material.n.01_1) (filled rubbing_alcohol__bottle.n.01_1 rubbing_alcohol.n.01_1) (ontop rubbing_alcohol__bottle.n.01_1 floor.n.01_1) - (ontop wax__jar.n.01_1 floor.n.01_1) - (ontop sponge.n.01_1 floor.n.01_1) + (ontop sponge.n.01_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) (inroom door.n.01_1 bathroom) (inroom floor.n.01_1 bathroom) @@ -27,8 +23,7 @@ (:goal (and - (covered ?door.n.01_1 ?wax.n.01_1) - (not + (not (covered ?door.n.01_1 ?adhesive_material.n.01_1) ) ) diff --git a/bddl/activity_definitions/clean_your_baseboard_radiators/problem0.bddl b/bddl/activity_definitions/clean_your_baseboard_radiators/problem0.bddl index 1abaf106..b79a4f32 100644 --- a/bddl/activity_definitions/clean_your_baseboard_radiators/problem0.bddl +++ b/bddl/activity_definitions/clean_your_baseboard_radiators/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - radiator.n.01_1 radiator.n.01_2 - radiator.n.01 + radiator.n.02_1 radiator.n.02_2 - radiator.n.02 floor.n.01_1 - floor.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 water.n.06_1 - water.n.06 @@ -12,11 +12,11 @@ ) (:init - (ontop radiator.n.01_1 floor.n.01_1) - (ontop radiator.n.01_2 floor.n.01_1) + (ontop radiator.n.02_1 floor.n.01_1) + (ontop radiator.n.02_2 floor.n.01_1) (ontop scrub_brush.n.01_1 floor.n.01_1) - (covered radiator.n.01_2 dust.n.01_1) - (covered radiator.n.01_1 dust.n.01_1) + (covered radiator.n.02_2 dust.n.01_1) + (covered radiator.n.02_1 dust.n.01_1) (inroom floor.n.01_1 utility_room) (inroom sink.n.01_1 utility_room) (insource sink.n.01_1 water.n.06_1) @@ -26,9 +26,9 @@ (:goal (and (forall - (?radiator.n.01 - radiator.n.01) + (?radiator.n.02 - radiator.n.02) (not - (covered ?radiator.n.01 ?dust.n.01_1) + (covered ?radiator.n.02 ?dust.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/clean_your_goal_keeper_gloves/problem0.bddl b/bddl/activity_definitions/clean_your_goal_keeper_gloves/problem0.bddl index 7250c4af..18ce0074 100644 --- a/bddl/activity_definitions/clean_your_goal_keeper_gloves/problem0.bddl +++ b/bddl/activity_definitions/clean_your_goal_keeper_gloves/problem0.bddl @@ -4,7 +4,6 @@ (:objects mud.n.03_1 - mud.n.03 goalkeeper_gloves.n.01_1 - goalkeeper_gloves.n.01 - tub.n.02_1 - tub.n.02 floor.n.01_1 - floor.n.01 sink.n.01_1 - sink.n.01 water.n.06_1 - water.n.06 @@ -20,8 +19,7 @@ (:init (covered goalkeeper_gloves.n.01_1 mud.n.03_1) (ontop goalkeeper_gloves.n.01_1 floor.n.01_1) - (ontop tub.n.02_1 floor.n.01_1) - (insource sink.n.01_1 water.n.06_1) + (insource sink.n.01_1 water.n.06_1) (filled detergent__bottle.n.01_1 detergent.n.02_1) (filled vinegar__bottle.n.01_1 vinegar.n.01_1) (ontop detergent__bottle.n.01_1 floor.n.01_1) diff --git a/bddl/activity_definitions/cleaning_bathtub/problem0.bddl b/bddl/activity_definitions/cleaning_bathtub/problem0.bddl index 4ad33ea5..406928b5 100644 --- a/bddl/activity_definitions/cleaning_bathtub/problem0.bddl +++ b/bddl/activity_definitions/cleaning_bathtub/problem0.bddl @@ -18,7 +18,7 @@ (ontop bar_soap.n.01_1 floor.n.01_1) (ontop bucket.n.01_1 floor.n.01_1) (inside scrub_brush.n.01_1 bathtub.n.01_1) - (insource water.n.06_1 sink.n.01_1) + (insource sink.n.01_1 water.n.06_1) (inroom floor.n.01_1 bathroom) (inroom bathtub.n.01_1 bathroom) (inroom sink.n.01_1 bathroom) diff --git a/bddl/activity_definitions/cleaning_bedroom/problem0.bddl b/bddl/activity_definitions/cleaning_bedroom/problem0.bddl index 316ee3ec..0f1d44d8 100644 --- a/bddl/activity_definitions/cleaning_bedroom/problem0.bddl +++ b/bddl/activity_definitions/cleaning_bedroom/problem0.bddl @@ -7,7 +7,7 @@ jean.n.01_1 jean.n.01_2 - jean.n.01 bed.n.01_1 - bed.n.01 jewelry.n.01_1 - jewelry.n.01 - perfume.n.02_1 - perfume.n.02 + bottle__of__perfume.n.01_1 - bottle__of__perfume.n.01 painting.n.01_1 - painting.n.01 vacuum.n.04_1 - vacuum.n.04 hand_towel.n.01_1 - hand_towel.n.01 @@ -22,7 +22,7 @@ (ontop jean.n.01_1 bed.n.01_1) (ontop jean.n.01_2 bed.n.01_1) (ontop jewelry.n.01_1 floor.n.01_1) - (ontop perfume.n.02_1 floor.n.01_1) + (ontop bottle__of__perfume.n.01_1 floor.n.01_1) (ontop painting.n.01_1 bed.n.01_1) (not (covered vacuum.n.04_1 dust.n.01_1) @@ -48,7 +48,7 @@ ) (and (inside ?jewelry.n.01_1 ?cabinet.n.01_1) - (inside ?perfume.n.02_1 ?cabinet.n.01_1) + (inside ?bottle__of__perfume.n.01_1 ?cabinet.n.01_1) ) (ontop ?sheet.n.03_1 ?bed.n.01_1) (forall diff --git a/bddl/activity_definitions/cleaning_boat/problem0.bddl b/bddl/activity_definitions/cleaning_boat/problem0.bddl index 4be0afe7..2abcc767 100644 --- a/bddl/activity_definitions/cleaning_boat/problem0.bddl +++ b/bddl/activity_definitions/cleaning_boat/problem0.bddl @@ -18,8 +18,8 @@ ) (:init - (covered boat.n.01_1 stain.n.01_1) - (ontop boat.n.01_1 driveway.n.01_1) + (covered boat.n.01_1 stain.n.01_1) + (ontop boat.n.01_1 driveway.n.01_1) (ontop swab.n.02_1 lawn.n.01_1) (ontop bucket.n.01_1 floor.n.01_1) (filled bucket.n.01_1 water.n.06_1) diff --git a/bddl/activity_definitions/cleaning_carpets/problem0.bddl b/bddl/activity_definitions/cleaning_carpets/problem0.bddl index db876b31..91cee986 100644 --- a/bddl/activity_definitions/cleaning_carpets/problem0.bddl +++ b/bddl/activity_definitions/cleaning_carpets/problem0.bddl @@ -5,7 +5,8 @@ stain.n.01_1 - stain.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 hand_towel.n.01_1 - hand_towel.n.01 - shampoo.n.01_1 - shampoo.n.01 + detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 cabinet.n.01_1 - cabinet.n.01 door.n.01_1 - door.n.01 sink.n.01_1 - sink.n.01 @@ -15,7 +16,8 @@ (:init (covered floor.n.01_1 stain.n.01_1) (ontop hand_towel.n.01_1 floor.n.01_2) - (inside shampoo.n.01_1 cabinet.n.01_1) + (filled detergent__bottle.n.01_1 detergent.n.02_1) + (inside detergent__bottle.n.01_1 cabinet.n.01_1) (inroom floor.n.01_1 corridor) (inroom floor.n.01_2 utility_room) (inroom door.n.01_1 corridor) diff --git a/bddl/activity_definitions/cleaning_floors/problem0.bddl b/bddl/activity_definitions/cleaning_floors/problem0.bddl index e2b1d854..001a4500 100644 --- a/bddl/activity_definitions/cleaning_floors/problem0.bddl +++ b/bddl/activity_definitions/cleaning_floors/problem0.bddl @@ -8,6 +8,7 @@ broom.n.01_1 - broom.n.01 dustpan.n.02_1 - dustpan.n.02 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 door.n.01_1 - door.n.01 sink.n.01_1 - sink.n.01 @@ -19,7 +20,8 @@ (covered floor.n.01_1 stain.n.01_1) (ontop broom.n.01_1 floor.n.01_1) (ontop dustpan.n.02_1 floor.n.01_1) - (ontop detergent.n.02_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) (ontop scrub_brush.n.01_1 floor.n.01_1) (inroom floor.n.01_1 bathroom) (inroom door.n.01_1 bathroom) diff --git a/bddl/activity_definitions/cleaning_freezer/problem0.bddl b/bddl/activity_definitions/cleaning_freezer/problem0.bddl index b54e39f6..6b4acad1 100644 --- a/bddl/activity_definitions/cleaning_freezer/problem0.bddl +++ b/bddl/activity_definitions/cleaning_freezer/problem0.bddl @@ -6,6 +6,7 @@ electric_refrigerator.n.01_1 - electric_refrigerator.n.01 seafood.n.01_1 seafood.n.01_2 seafood.n.01_3 - seafood.n.01 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 table.n.02_1 - table.n.02 towel.n.01_1 - towel.n.01 floor.n.01_1 - floor.n.01 @@ -22,7 +23,8 @@ (inside seafood.n.01_1 electric_refrigerator.n.01_1) (inside seafood.n.01_2 electric_refrigerator.n.01_1) (inside seafood.n.01_3 electric_refrigerator.n.01_1) - (ontop detergent.n.02_1 table.n.02_1) + (filled detergent__bottle.n.01_1 detergent.n.02_1) + (ontop detergent__bottle.n.01_1 table.n.02_1) (ontop towel.n.01_1 table.n.02_1) (inroom floor.n.01_1 kitchen) (inroom sink.n.01_1 kitchen) @@ -31,7 +33,7 @@ (inroom electric_refrigerator.n.01_1 kitchen) (inroom door.n.01_1 kitchen) (inroom table.n.02_1 kitchen) - (inroom chair.n.01_1 kitchen) + (inroom chair.n.01_1 kitchen) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/cleaning_high_chair/problem0.bddl b/bddl/activity_definitions/cleaning_high_chair/problem0.bddl index 0fa5ba9d..f43334a8 100644 --- a/bddl/activity_definitions/cleaning_high_chair/problem0.bddl +++ b/bddl/activity_definitions/cleaning_high_chair/problem0.bddl @@ -11,9 +11,9 @@ ) (:init - (covered highchair.n.01_1 dust.n.01_1) + (covered highchair.n.01_1 dust.n.01_1) (inside hand_towel.n.01_1 cabinet.n.01_1) - (ontop highchair.n.01_1 floor.n.01_2) + (ontop highchair.n.01_1 floor.n.01_2) (inroom cabinet.n.01_1 kitchen) (inroom floor.n.01_2 dining_room) (inroom floor.n.01_1 kitchen) diff --git a/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl b/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl index b11266bd..19cbed53 100644 --- a/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl +++ b/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl @@ -7,6 +7,7 @@ countertop.n.01_1 - countertop.n.01 hand_towel.n.01_1 - hand_towel.n.01 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 bowl.n.01_1 bowl.n.01_2 - bowl.n.01 cup.n.01_1 cup.n.01_2 - cup.n.01 floor.n.01_1 - floor.n.01 @@ -16,8 +17,9 @@ (:init (covered cabinet.n.01_1 dust.n.01_1) (covered cabinet.n.01_2 dust.n.01_1) - (ontop hand_towel.n.01_1 countertop.n.01_1) - (ontop detergent.n.02_1 countertop.n.01_1) + (ontop hand_towel.n.01_1 countertop.n.01_1) + (filled detergent__bottle.n.01_1 detergent.n.02_1) + (ontop detergent__bottle.n.01_1 countertop.n.01_1) (inside bowl.n.01_2 cabinet.n.01_2) (inside cup.n.01_1 cabinet.n.01_2) (inside cup.n.01_2 cabinet.n.01_1) diff --git a/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl b/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl index e3dc25b2..01ec6619 100644 --- a/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl +++ b/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl @@ -16,10 +16,10 @@ ) (: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_3 floor.n.01_1) - (ontop lawn_chair.n.01_4 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 lawn_chair.n.01_3 floor.n.01_1) + (ontop lawn_chair.n.01_4 floor.n.01_1) (ontop coffee_table.n.01_1 floor.n.01_1) (ontop bucket.n.01_1 coffee_table.n.01_1) (filled bucket.n.01_1 water.n.06_1) @@ -27,10 +27,10 @@ (ontop liquid_soap__bottle.n.01_1 coffee_table.n.01_1) (inside rag.n.01_1 bucket.n.01_1) (covered coffee_table.n.01_1 dirt.n.02_1) - (covered lawn_chair.n.01_1 mildew.n.02_1) - (covered lawn_chair.n.01_2 mildew.n.02_1) - (covered lawn_chair.n.01_3 mildew.n.02_1) - (covered lawn_chair.n.01_4 mildew.n.02_1) + (covered lawn_chair.n.01_1 mildew.n.02_1) + (covered lawn_chair.n.01_2 mildew.n.02_1) + (covered lawn_chair.n.01_3 mildew.n.02_1) + (covered lawn_chair.n.01_4 mildew.n.02_1) (ontop agent.n.01_1 floor.n.01_1) (inroom floor.n.01_1 garden) (inroom coffee_table.n.01_1 garden) diff --git a/bddl/activity_definitions/cleaning_pet_bed/problem0.bddl b/bddl/activity_definitions/cleaning_pet_bed/problem0.bddl index 0ea1846c..1be3f8fa 100644 --- a/bddl/activity_definitions/cleaning_pet_bed/problem0.bddl +++ b/bddl/activity_definitions/cleaning_pet_bed/problem0.bddl @@ -4,7 +4,7 @@ (:objects pet_bed.n.01_1 - pet_bed.n.01 floor.n.01_1 - floor.n.01 - hair.n.01_1 - hair.n.01 + hair.n.04_1 - hair.n.04 petfood.n.01_1 - petfood.n.01 vacuum.n.04_1 - vacuum.n.04 rug.n.01_1 - rug.n.01 @@ -14,7 +14,7 @@ (:init (ontop pet_bed.n.01_1 floor.n.01_1) - (covered pet_bed.n.01_1 hair.n.01_1) + (covered pet_bed.n.01_1 hair.n.04_1) (covered pet_bed.n.01_1 petfood.n.01_1) (ontop vacuum.n.04_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) @@ -26,7 +26,7 @@ (:goal (and (not - (covered ?pet_bed.n.01_1 ?hair.n.01_1) + (covered ?pet_bed.n.01_1 ?hair.n.04_1) ) (not (covered ?pet_bed.n.01_1 ?petfood.n.01_1) diff --git a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl index d7317041..77f2ba34 100644 --- a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl +++ b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl @@ -8,6 +8,7 @@ scrub_brush.n.01_1 - scrub_brush.n.01 shelf.n.01_1 - shelf.n.01 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 sink.n.01_1 - sink.n.01 agent.n.01_1 - agent.n.01 ) @@ -15,8 +16,9 @@ (:init (ontop pool.n.01_1 floor.n.01_1) (covered pool.n.01_1 stain.n.01_1) - (ontop scrub_brush.n.01_1 floor.n.01_1) - (ontop detergent.n.02_1 floor.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) (inroom shelf.n.01_1 garage) (inroom floor.n.01_1 garage) (inroom sink.n.01_1 storage_room) diff --git a/bddl/activity_definitions/cleaning_toilet/problem0.bddl b/bddl/activity_definitions/cleaning_toilet/problem0.bddl index a181af65..de532d5b 100644 --- a/bddl/activity_definitions/cleaning_toilet/problem0.bddl +++ b/bddl/activity_definitions/cleaning_toilet/problem0.bddl @@ -7,14 +7,16 @@ scrub_brush.n.01_1 - scrub_brush.n.01 floor.n.01_1 - floor.n.01 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 sink.n.01_1 - sink.n.01 agent.n.01_1 - agent.n.01 ) (:init (covered toilet.n.02_1 stain.n.01_1) - (ontop scrub_brush.n.01_1 floor.n.01_1) - (ontop detergent.n.02_1 floor.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) (inroom toilet.n.02_1 bathroom) (inroom floor.n.01_1 bathroom) (inroom sink.n.01_1 bathroom) diff --git a/bddl/activity_definitions/cleaning_up_after_a_meal/problem0.bddl b/bddl/activity_definitions/cleaning_up_after_a_meal/problem0.bddl index d9f8ba56..e602b8f0 100644 --- a/bddl/activity_definitions/cleaning_up_after_a_meal/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_after_a_meal/problem0.bddl @@ -12,6 +12,7 @@ hamburger.n.01_1 hamburger.n.01_2 - hamburger.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 dishwasher.n.01_1 - dishwasher.n.01 sink.n.01_1 - sink.n.01 agent.n.01_1 - agent.n.01 @@ -35,18 +36,19 @@ (ontop cup.n.01_2 table.n.02_1) (covered cup.n.01_1 stain.n.01_1) (covered cup.n.01_2 stain.n.01_1) - (ontop hamburger.n.01_1 chair.n.01_2) - (ontop hamburger.n.01_2 floor.n.01_1) - (ontop detergent.n.02_1 floor.n.01_1) - (covered chair.n.01_1 stain.n.01_1) - (covered chair.n.01_2 stain.n.01_1) + (ontop hamburger.n.01_1 chair.n.01_2) + (ontop hamburger.n.01_2 floor.n.01_1) + (filled detergent__bottle.n.01_1 detergent.n.02_1) + (ontop detergent__bottle.n.01_1 floor.n.01_1) + (covered chair.n.01_1 stain.n.01_1) + (covered chair.n.01_2 stain.n.01_1) (covered table.n.02_1 stain.n.01_1) (inroom dishwasher.n.01_1 kitchen) (inroom floor.n.01_1 dining_room) (inroom floor.n.01_2 kitchen) (inroom table.n.02_1 dining_room) - (inroom chair.n.01_1 dining_room) - (inroom chair.n.01_2 dining_room) + (inroom chair.n.01_1 dining_room) + (inroom chair.n.01_2 dining_room) (inroom sink.n.01_1 kitchen) (ontop agent.n.01_1 floor.n.01_2) ) diff --git a/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl b/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl index ec6abf27..61d1a1c9 100644 --- a/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl @@ -9,7 +9,7 @@ dishwasher.n.01_1 - dishwasher.n.01 leftovers.n.01_1 - leftovers.n.01 sink.n.01_1 - sink.n.01 - apple_juice.n.01_1 - apple_juice.n.01 + bottle__of__apple_juice.n.01_1 - bottle__of__apple_juice.n.01 broom.n.01_1 - broom.n.01 sponge.n.01_1 - sponge.n.01 water.n.06_1 - water.n.06 @@ -25,7 +25,7 @@ (ontop cup.n.01_3 electric_refrigerator.n.01_1) (ontop cup.n.01_4 dishwasher.n.01_1) (inside leftovers.n.01_1 sink.n.01_1) - (inside apple_juice.n.01_1 sink.n.01_1) + (inside 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) (not @@ -50,7 +50,7 @@ (inside ?cup.n.01 ?dishwasher.n.01_1) ) (inside ?leftovers.n.01_1 ?electric_refrigerator.n.01_1) - (inside ?apple_juice.n.01_1 ?electric_refrigerator.n.01_1) + (inside ?bottle__of__apple_juice.n.01_1 ?electric_refrigerator.n.01_1) (nextto ?broom.n.01_1 ?dishwasher.n.01_1) (covered ?sponge.n.01_1 ?water.n.06_1) (overlaid ?sponge.n.01_1 ?sink.n.01_1) diff --git a/bddl/activity_definitions/cleaning_up_plates_and_food/problem0.bddl b/bddl/activity_definitions/cleaning_up_plates_and_food/problem0.bddl index a89a9922..0532b16d 100644 --- a/bddl/activity_definitions/cleaning_up_plates_and_food/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_plates_and_food/problem0.bddl @@ -22,7 +22,7 @@ (ontop plate.n.04_3 breakfast_table.n.01_1) (ontop pizza.n.01_1 plate.n.04_1) (ontop pizza.n.01_2 plate.n.04_2) - (ontop white_rice.n.01_1 plate.n.04_3) + (covered plate.n.04_3 white_rice.n.01_1) (inside aluminum_foil.n.01_1 cabinet.n.01_1) (inside aluminum_foil.n.01_2 cabinet.n.01_1) (inside bowl.n.01_1 cabinet.n.01_1) @@ -45,7 +45,7 @@ (inside ?pizza.n.01 ?electric_refrigerator.n.01_1) ) ) - (filled ?bowl.n.01_1 ?white_rice.n.01_1) + (contains ?bowl.n.01_1 ?white_rice.n.01_1) (inside ?bowl.n.01_1 ?electric_refrigerator.n.01_1) (forall (?plate.n.04 - plate.n.04) diff --git a/bddl/activity_definitions/cleaning_windows/problem0.bddl b/bddl/activity_definitions/cleaning_windows/problem0.bddl index 49128614..37db3b55 100644 --- a/bddl/activity_definitions/cleaning_windows/problem0.bddl +++ b/bddl/activity_definitions/cleaning_windows/problem0.bddl @@ -7,6 +7,7 @@ cabinet.n.01_1 - cabinet.n.01 rag.n.01_1 rag.n.01_2 - rag.n.01 detergent.n.02_1 - detergent.n.02 + detergent__bottle.n.01_1 - detergent__bottle.n.01 window.n.01_1 window.n.01_2 - window.n.01 sink.n.01_1 - sink.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 @@ -18,8 +19,9 @@ (inside towel.n.01_1 cabinet.n.01_1) (inside towel.n.01_2 cabinet.n.01_1) (inside rag.n.01_1 cabinet.n.01_1) - (inside rag.n.01_2 cabinet.n.01_1) - (inside detergent.n.02_1 cabinet.n.01_1) + (inside rag.n.01_2 cabinet.n.01_1) + (filled detergent__bottle.n.01_1 detergent.n.02_1) + (inside detergent__bottle.n.01_1 cabinet.n.01_1) (covered window.n.01_1 dust.n.01_1) (covered window.n.01_2 dust.n.01_1) (not diff --git a/bddl/activity_definitions/clearing_table_after_snacks/problem0.bddl b/bddl/activity_definitions/clearing_table_after_snacks/problem0.bddl index 5ab64d9c..ddd3dd6c 100644 --- a/bddl/activity_definitions/clearing_table_after_snacks/problem0.bddl +++ b/bddl/activity_definitions/clearing_table_after_snacks/problem0.bddl @@ -4,7 +4,6 @@ (:objects half__apple.n.01_1 half__apple.n.01_2 - half__apple.n.01 plate.n.04_1 - plate.n.04 - chocolate_kiss.n.01_1 - chocolate_kiss.n.01 dinner_napkin.n.01_1 - dinner_napkin.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 compost_bin.n.01_1 - compost_bin.n.01 @@ -17,8 +16,7 @@ (:init (ontop half__apple.n.01_1 dinner_napkin.n.01_1) (ontop half__apple.n.01_2 dinner_napkin.n.01_1) - (ontop chocolate_kiss.n.01_1 plate.n.04_1) - (ontop plate.n.04_1 breakfast_table.n.01_1) + (ontop plate.n.04_1 breakfast_table.n.01_1) (ontop dinner_napkin.n.01_1 breakfast_table.n.01_1) (ontop compost_bin.n.01_1 floor.n.01_2) (inroom breakfast_table.n.01_1 dining_room) @@ -31,8 +29,7 @@ (:goal (and - (inside ?chocolate_kiss.n.01_1 ?cabinet.n.01_1) - (forall + (forall (?half__apple.n.01 - half__apple.n.01) (inside ?half__apple.n.01 ?compost_bin.n.01_1) ) diff --git a/bddl/activity_definitions/clearing_the_table_after_dinner/problem0.bddl b/bddl/activity_definitions/clearing_the_table_after_dinner/problem0.bddl index d5a2ad2b..62793752 100644 --- a/bddl/activity_definitions/clearing_the_table_after_dinner/problem0.bddl +++ b/bddl/activity_definitions/clearing_the_table_after_dinner/problem0.bddl @@ -8,7 +8,7 @@ cup.n.01_1 cup.n.01_2 - cup.n.01 bucket.n.01_1 bucket.n.01_2 - bucket.n.01 bowl.n.01_1 bowl.n.01_2 bowl.n.01_3 bowl.n.01_4 - bowl.n.01 - catsup.n.01_1 - catsup.n.01 + bottle__of__catsup.n.01_1 - bottle__of__catsup.n.01 agent.n.01_1 - agent.n.01 ) @@ -20,11 +20,11 @@ (ontop bowl.n.01_2 table.n.02_1) (ontop bowl.n.01_3 table.n.02_1) (ontop bowl.n.01_4 table.n.02_1) - (ontop catsup.n.01_1 table.n.02_1) + (ontop bottle__of__catsup.n.01_1 table.n.02_1) (ontop bucket.n.01_2 floor.n.01_1) (inroom floor.n.01_1 dining_room) - (inroom chair.n.01_1 dining_room) - (inroom chair.n.01_2 dining_room) + (inroom chair.n.01_1 dining_room) + (inroom chair.n.01_2 dining_room) (inroom table.n.02_1 dining_room) (ontop agent.n.01_1 floor.n.01_1) ) @@ -47,7 +47,7 @@ ) (exists (?bucket.n.01 - bucket.n.01) - (inside ?catsup.n.01_1 ?bucket.n.01) + (inside ?bottle__of__catsup.n.01_1 ?bucket.n.01) ) ) ) diff --git a/bddl/activity_definitions/collecting_aluminum_cans/problem0.bddl b/bddl/activity_definitions/collecting_aluminum_cans/problem0.bddl index e159e0cc..efa5d35b 100644 --- a/bddl/activity_definitions/collecting_aluminum_cans/problem0.bddl +++ b/bddl/activity_definitions/collecting_aluminum_cans/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - pop.n.02_1 pop.n.02_2 pop.n.02_3 pop.n.02_4 pop.n.02_5 pop.n.02_6 - pop.n.02 + can__of__soda.n.01_1 can__of__soda.n.01_2 can__of__soda.n.01_3 can__of__soda.n.01_4 can__of__soda.n.01_5 can__of__soda.n.01_6 - can__of__soda.n.01 bed.n.01_1 - bed.n.01 floor.n.01_1 - floor.n.01 bucket.n.01_1 - bucket.n.01 @@ -10,12 +10,12 @@ ) (:init - (ontop pop.n.02_1 bed.n.01_1) - (ontop pop.n.02_2 bed.n.01_1) - (ontop pop.n.02_3 bed.n.01_1) - (ontop pop.n.02_4 floor.n.01_1) - (ontop pop.n.02_5 floor.n.01_1) - (ontop pop.n.02_6 floor.n.01_1) + (ontop can__of__soda.n.01_1 bed.n.01_1) + (ontop can__of__soda.n.01_2 bed.n.01_1) + (ontop can__of__soda.n.01_3 bed.n.01_1) + (ontop can__of__soda.n.01_4 floor.n.01_1) + (ontop can__of__soda.n.01_5 floor.n.01_1) + (ontop can__of__soda.n.01_6 floor.n.01_1) (ontop bucket.n.01_1 bed.n.01_1) (inroom bed.n.01_1 bedroom) (inroom floor.n.01_1 bedroom) @@ -25,8 +25,8 @@ (:goal (and (forall - (?pop.n.02 - pop.n.02) - (inside ?pop.n.02 ?bucket.n.01_1) + (?can__of__soda.n.01 - can__of__soda.n.01) + (inside ?can__of__soda.n.01 ?bucket.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/cook_bok_choy/problem0.bddl b/bddl/activity_definitions/cook_bok_choy/problem0.bddl index 6407a6cb..8f72d8b9 100644 --- a/bddl/activity_definitions/cook_bok_choy/problem0.bddl +++ b/bddl/activity_definitions/cook_bok_choy/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - bok_choy.n.01_1 - bok_choy.n.01 + bok_choy.n.02_1 - bok_choy.n.02 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 butter.n.01_1 - butter.n.01 clove.n.03_1 clove.n.03_2 clove.n.03_3 - clove.n.03 @@ -20,13 +20,13 @@ ) (:init - (inside bok_choy.n.01_1 electric_refrigerator.n.01_1) + (inside bok_choy.n.02_1 electric_refrigerator.n.01_1) (inside butter.n.01_1 electric_refrigerator.n.01_1) (inside clove.n.03_1 electric_refrigerator.n.01_1) (inside clove.n.03_2 electric_refrigerator.n.01_1) (inside clove.n.03_3 electric_refrigerator.n.01_1) (not - (cooked bok_choy.n.01_1) + (cooked bok_choy.n.02_1) ) (filled soy_sauce__bottle.n.01_1 soy_sauce.n.01_1) (inside soy_sauce__bottle.n.01_1 electric_refrigerator.n.01_1) @@ -46,10 +46,10 @@ (and (real ?melted__butter.n.01_1) (real ?diced__clove.n.01_1) - (inside ?bok_choy.n.01_1 ?frying_pan.n.01_1) + (inside ?bok_choy.n.02_1 ?frying_pan.n.01_1) (contains ?frying_pan.n.01_1 ?melted__butter.n.01_1) (contains ?frying_pan.n.01_1 ?diced__clove.n.01_1) - (cooked ?bok_choy.n.01_1) + (cooked ?bok_choy.n.02_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/cook_cabbage/problem0.bddl b/bddl/activity_definitions/cook_cabbage/problem0.bddl index c67fa999..1e6b9b1d 100644 --- a/bddl/activity_definitions/cook_cabbage/problem0.bddl +++ b/bddl/activity_definitions/cook_cabbage/problem0.bddl @@ -2,9 +2,9 @@ (:domain omnigibson) (:objects - cabbage.n.03_1 - cabbage.n.03 + head_cabbage.n.02_1 - head_cabbage.n.02 cooked__diced__chili.n.01_1 - cooked__diced__chili.n.01 - cooked__diced__cabbage.n.01_1 - cooked__diced__cabbage.n.01 + cooked__diced__head_cabbage.n.01_1 - cooked__diced__head_cabbage.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 chili.n.02_1 - chili.n.02 chopping_board.n.01_1 - chopping_board.n.01 @@ -17,11 +17,11 @@ ) (:init - (inside cabbage.n.03_1 electric_refrigerator.n.01_1) + (inside head_cabbage.n.02_1 electric_refrigerator.n.01_1) (inside frying_pan.n.01_1 cabinet.n.01_1) (inside chili.n.02_1 electric_refrigerator.n.01_1) (not - (cooked cabbage.n.03_1) + (cooked head_cabbage.n.02_1) ) (inside chopping_board.n.01_1 cabinet.n.01_1) (inside carving_knife.n.01_1 cabinet.n.01_1) @@ -30,15 +30,15 @@ (inroom stove.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) (inroom cabinet.n.01_1 kitchen) - (future cooked__diced__cabbage.n.01_1) + (future cooked__diced__head_cabbage.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and - (real ?cooked__diced__cabbage.n.01_1) + (real ?cooked__diced__head_cabbage.n.01_1) (real ?cooked__diced__chili.n.01_1) - (contains ?frying_pan.n.01_1 ?cooked__diced__cabbage.n.01_1) + (contains ?frying_pan.n.01_1 ?cooked__diced__head_cabbage.n.01_1) (contains ?frying_pan.n.01_1 ?cooked__diced__chili.n.01_1) ) ) diff --git a/bddl/activity_definitions/cook_chicken_and_rice/problem0.bddl b/bddl/activity_definitions/cook_chicken_and_rice/problem0.bddl index 5d30f654..6c2a7a22 100644 --- a/bddl/activity_definitions/cook_chicken_and_rice/problem0.bddl +++ b/bddl/activity_definitions/cook_chicken_and_rice/problem0.bddl @@ -3,6 +3,7 @@ (:objects white_rice.n.01_1 - white_rice.n.01 + cooked__white_rice.n.01_1 - cooked__white_rice.n.01 bowl.n.01_1 - bowl.n.01 kitchen_table.n.01_1 - kitchen_table.n.01 chicken.n.01_1 - chicken.n.01 @@ -29,9 +30,6 @@ (ontop olive_oil__bottle.n.01_1 kitchen_table.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 kitchen_table.n.01_1) - (not - (cooked white_rice.n.01_1) - ) (not (cooked chicken.n.01_1) ) @@ -41,11 +39,12 @@ (inroom floor.n.01_1 kitchen) (inroom electric_refrigerator.n.01_1 kitchen) (ontop agent.n.01_1 floor.n.01_1) + (future cooked__white_rice.n.01_1) ) (:goal (and - (cooked ?white_rice.n.01_1) + (real cooked__white_rice.n.01_1) (cooked ?chicken.n.01_1) (covered ?chicken.n.01_1 ?salt.n.02_1) (covered ?chicken.n.01_1 ?olive_oil.n.01_1) diff --git a/bddl/activity_definitions/cook_clams/problem0.bddl b/bddl/activity_definitions/cook_clams/problem0.bddl index dbf62631..a0e92efb 100644 --- a/bddl/activity_definitions/cook_clams/problem0.bddl +++ b/bddl/activity_definitions/cook_clams/problem0.bddl @@ -5,7 +5,7 @@ saucepan.n.01_1 - saucepan.n.01 stove.n.01_1 - stove.n.01 bowl.n.01_1 - bowl.n.01 - clam.n.01_1 clam.n.01_2 clam.n.01_3 - clam.n.01 + clam.n.03_1 clam.n.03_2 clam.n.03_3 - clam.n.03 salt.n.02_1 - salt.n.02 salt__shaker.n.01_1 - salt__shaker.n.01 lemon_juice.n.01_1 - lemon_juice.n.01 @@ -19,17 +19,17 @@ (:init (ontop saucepan.n.01_1 stove.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) - (inside clam.n.01_1 bowl.n.01_1) - (inside clam.n.01_2 bowl.n.01_1) - (inside clam.n.01_3 bowl.n.01_1) + (inside clam.n.03_1 bowl.n.01_1) + (inside clam.n.03_2 bowl.n.01_1) + (inside clam.n.03_3 bowl.n.01_1) (not - (cooked clam.n.01_1) + (cooked clam.n.03_1) ) (not - (cooked clam.n.01_2) + (cooked clam.n.03_2) ) (not - (cooked clam.n.01_3) + (cooked clam.n.03_3) ) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 countertop.n.01_1) @@ -45,11 +45,11 @@ (:goal (and (forall - (?clam.n.01 - clam.n.01) + (?clam.n.03 - clam.n.03) (and - (cooked ?clam.n.01) - (covered ?clam.n.01 ?salt.n.02_1) - (covered ?clam.n.01 ?lemon_juice.n.01_1) + (cooked ?clam.n.03) + (covered ?clam.n.03 ?salt.n.02_1) + (covered ?clam.n.03 ?lemon_juice.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/cook_eggs/problem0.bddl b/bddl/activity_definitions/cook_eggs/problem0.bddl index 003998f9..ca094786 100644 --- a/bddl/activity_definitions/cook_eggs/problem0.bddl +++ b/bddl/activity_definitions/cook_eggs/problem0.bddl @@ -6,7 +6,6 @@ stove.n.01_1 - stove.n.01 water.n.06_1 - water.n.06 raw_egg.n.01_1 raw_egg.n.01_2 - raw_egg.n.01 - fried_egg.n.01_1 fried_egg.n.01_2 - fried_egg.n.01 bowl.n.01_1 - bowl.n.01 sink.n.01_1 - sink.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 @@ -19,8 +18,6 @@ (inside raw_egg.n.01_1 bowl.n.01_1) (inside raw_egg.n.01_2 bowl.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) - (future fried_egg.n.01_1) - (future fried_egg.n.01_2) (insource sink.n.01_1 water.n.06_1) (inroom stove.n.01_1 kitchen) (inroom electric_refrigerator.n.01_1 kitchen) @@ -31,11 +28,9 @@ (:goal (and - (real ?fried_egg.n.01_1) - (real ?fried_egg.n.01_2) (forall - (?fried_egg.n.01 - fried_egg.n.01) - (cooked ?fried_egg.n.01) + (?raw_egg.n.01 - raw_egg.n.01) + (cooked ?raw_egg.n.01) ) ) ) diff --git a/bddl/activity_definitions/cook_fish/problem0.bddl b/bddl/activity_definitions/cook_fish/problem0.bddl index 93d28bda..ec1b5541 100644 --- a/bddl/activity_definitions/cook_fish/problem0.bddl +++ b/bddl/activity_definitions/cook_fish/problem0.bddl @@ -6,7 +6,7 @@ oven.n.01_1 - oven.n.01 salt.n.02_1 - salt.n.02 salt__shaker.n.01_1 - salt__shaker.n.01 - salmon.n.01_1 - salmon.n.01 + salmon.n.03_1 - salmon.n.03 diced__lemon.n.01_1 - diced__lemon.n.01 bowl.n.01_1 bowl.n.01_2 - bowl.n.01 clove.n.03_1 clove.n.03_2 clove.n.03_3 - clove.n.03 @@ -21,7 +21,7 @@ (ontop casserole.n.02_1 oven.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (inside salt__shaker.n.01_1 cabinet.n.01_1) - (inside salmon.n.01_1 tupperware.n.01_1) + (inside salmon.n.03_1 tupperware.n.01_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) (filled bowl.n.01_1 diced__lemon.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) @@ -30,7 +30,7 @@ (inside clove.n.03_3 bowl.n.01_2) (inside bowl.n.01_2 electric_refrigerator.n.01_1) (not - (cooked salmon.n.01_1) + (cooked salmon.n.03_1) ) (inroom electric_refrigerator.n.01_1 kitchen) (inroom oven.n.01_1 kitchen) @@ -41,9 +41,9 @@ (:goal (and - (cooked ?salmon.n.01_1) - (inside ?salmon.n.01_1 ?casserole.n.02_1) - (covered ?salmon.n.01_1 ?salt.n.02_1) + (cooked ?salmon.n.03_1) + (inside ?salmon.n.03_1 ?casserole.n.02_1) + (covered ?salmon.n.03_1 ?salt.n.02_1) (contains ?casserole.n.02_1 ?diced__lemon.n.01_1) ) ) diff --git a/bddl/activity_definitions/cook_kabobs/problem0.bddl b/bddl/activity_definitions/cook_kabobs/problem0.bddl index 7ae92b64..cf3683b9 100644 --- a/bddl/activity_definitions/cook_kabobs/problem0.bddl +++ b/bddl/activity_definitions/cook_kabobs/problem0.bddl @@ -7,7 +7,7 @@ cooking_oil.n.01_1 - cooking_oil.n.01 cooking_oil__bottle.n.01_1 - cooking_oil__bottle.n.01 grill.n.02_1 - grill.n.02 - coriander.n.03_1 - coriander.n.03 + coriander.n.02_1 - coriander.n.02 coriander__shaker.n.01_1 - coriander__shaker.n.01 plate.n.04_1 - plate.n.04 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 @@ -36,7 +36,7 @@ (not (cooked kabob.n.01_4) ) - (insource coriander__shaker.n.01_1 coriander.n.03_1) + (insource coriander__shaker.n.01_1 coriander.n.02_1) (inside coriander__shaker.n.01_1 electric_refrigerator.n.01_1) (inside plate.n.04_1 cabinet.n.01_1) (inroom cabinet.n.01_1 kitchen) @@ -53,7 +53,7 @@ (and (cooked ?kabob.n.01) (covered ?kabob.n.01 ?cooking_oil.n.01_1) - (covered ?kabob.n.01 ?coriander.n.03_1) + (covered ?kabob.n.01 ?coriander.n.02_1) (ontop ?kabob.n.01 ?plate.n.04_1) ) ) diff --git a/bddl/activity_definitions/cook_mussels/problem0.bddl b/bddl/activity_definitions/cook_mussels/problem0.bddl index 76c41515..b091f143 100644 --- a/bddl/activity_definitions/cook_mussels/problem0.bddl +++ b/bddl/activity_definitions/cook_mussels/problem0.bddl @@ -7,8 +7,8 @@ beefsteak_tomato.n.01_1 beefsteak_tomato.n.01_2 - beefsteak_tomato.n.01 cooked__diced__beefsteak_tomato.n.01_1 - cooked__diced__beefsteak_tomato.n.01 salt.n.02_1 - salt.n.02 - oregano.n.01_1 - oregano.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram.n.02_1 - marjoram.n.02 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 salt__shaker.n.01_1 - salt__shaker.n.01 plate.n.04_1 - plate.n.04 carving_knife.n.01_1 - carving_knife.n.01 @@ -76,9 +76,9 @@ ) (insource sink.n.01_1 water.n.06_1) (insource salt__shaker.n.01_1 salt.n.02_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) (inside salt__shaker.n.01_1 shelf.n.01_1) - (inside oregano__shaker.n.01_1 shelf.n.01_1) + (inside marjoram__shaker.n.01_1 shelf.n.01_1) (inside stockpot.n.01_1 shelf.n.01_1) (ontop carving_knife.n.01_1 chopping_board.n.01_1) (inside plate.n.04_1 shelf.n.01_1) @@ -106,7 +106,7 @@ (contains ?stockpot.n.01_1 ?cooked__diced__beefsteak_tomato.n.01_1) (real ?seawater.n.01_1) (contains ?stockpot.n.01_1 ?seawater.n.01_1) - (contains ?stockpot.n.01_1 ?oregano.n.01_1) + (contains ?stockpot.n.01_1 ?marjoram.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/cook_oysters/problem0.bddl b/bddl/activity_definitions/cook_oysters/problem0.bddl index 8e816196..2c13eb24 100644 --- a/bddl/activity_definitions/cook_oysters/problem0.bddl +++ b/bddl/activity_definitions/cook_oysters/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - oyster.n.01_1 oyster.n.01_2 oyster.n.01_3 - oyster.n.01 + huitre.n.01_1 huitre.n.01_2 huitre.n.01_3 - huitre.n.01 stockpot.n.01_1 - stockpot.n.01 salt.n.02_1 - salt.n.02 salt__shaker.n.01_1 - salt__shaker.n.01 @@ -18,17 +18,17 @@ (:init (not - (cooked oyster.n.01_1) + (cooked huitre.n.01_1) ) (not - (cooked oyster.n.01_2) + (cooked huitre.n.01_2) ) (not - (cooked oyster.n.01_3) + (cooked huitre.n.01_3) ) - (inside oyster.n.01_1 bowl.n.01_1) - (inside oyster.n.01_2 bowl.n.01_1) - (inside oyster.n.01_3 bowl.n.01_1) + (inside huitre.n.01_1 bowl.n.01_1) + (inside huitre.n.01_2 bowl.n.01_1) + (inside huitre.n.01_3 bowl.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) (ontop stockpot.n.01_1 countertop.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) @@ -45,14 +45,14 @@ (:goal (and (forall - (?oyster.n.01 - oyster.n.01) - (inside ?oyster.n.01 ?stockpot.n.01_1) + (?huitre.n.01 - huitre.n.01) + (inside ?huitre.n.01 ?stockpot.n.01_1) ) (forall - (?oyster.n.01 - oyster.n.01) + (?huitre.n.01 - huitre.n.01) (and - (cooked ?oyster.n.01) - (covered ?oyster.n.01 ?salt.n.02_1) + (cooked ?huitre.n.01) + (covered ?huitre.n.01 ?salt.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/cook_peas/problem0.bddl b/bddl/activity_definitions/cook_peas/problem0.bddl index 7d3b9198..bc847748 100644 --- a/bddl/activity_definitions/cook_peas/problem0.bddl +++ b/bddl/activity_definitions/cook_peas/problem0.bddl @@ -2,7 +2,8 @@ (:domain omnigibson) (:objects - pea.n.01_1 pea.n.01_2 pea.n.01_3 pea.n.01_4 pea.n.01_5 pea.n.01_6 pea.n.01_7 pea.n.01_8 - pea.n.01 + pea.n.01_1 - pea.n.01 + cooked__pea.n.01_1 - cooked__pea.n.01 bowl.n.01_1 - bowl.n.01 stove.n.01_1 - stove.n.01 lid.n.02_1 - lid.n.02 @@ -19,44 +20,14 @@ ) (:init - (not - (cooked pea.n.01_1) - ) - (not - (cooked pea.n.01_2) - ) - (not - (cooked pea.n.01_3) - ) - (not - (cooked pea.n.01_4) - ) - (not - (cooked pea.n.01_5) - ) - (not - (cooked pea.n.01_6) - ) - (not - (cooked pea.n.01_7) - ) - (not - (cooked pea.n.01_8) - ) - (inside pea.n.01_1 bowl.n.01_1) - (inside pea.n.01_2 bowl.n.01_1) - (inside pea.n.01_3 bowl.n.01_1) - (inside pea.n.01_4 bowl.n.01_1) - (inside pea.n.01_5 bowl.n.01_1) - (inside pea.n.01_6 bowl.n.01_1) - (inside pea.n.01_7 bowl.n.01_1) - (inside pea.n.01_8 bowl.n.01_1) + (filled bowl.n.01_1 pea.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) (inside butter.n.01_1 tupperware.n.01_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) (inside lid.n.02_1 cabinet.n.01_1) (inside saucepan.n.01_1 cabinet.n.01_1) (future melted__butter.n.01_1) + (future cooked__pea.n.01_1) (insource sink.n.01_1 water.n.06_1) (inroom sink.n.01_1 kitchen) (inroom stove.n.01_1 kitchen) @@ -69,13 +40,9 @@ (:goal (and (real ?melted__butter.n.01_1) - (forall - (?pea.n.01 - pea.n.01) - (and - (cooked ?pea.n.01) - (covered ?pea.n.01 ?melted__butter.n.01_1) - ) - ) + (real ?cooked__pea.n.01_1) + (contains ?saucepan.n.01_1 ?cooked__pea.n.01_1) + (contains ?saucepan.n.01_1 ?melted__butter.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/cook_seafood_paella/problem0.bddl b/bddl/activity_definitions/cook_seafood_paella/problem0.bddl index 0363fcfa..95de297a 100644 --- a/bddl/activity_definitions/cook_seafood_paella/problem0.bddl +++ b/bddl/activity_definitions/cook_seafood_paella/problem0.bddl @@ -18,9 +18,10 @@ paprika.n.02_1 - paprika.n.02 paprika__shaker.n.01_1 - paprika__shaker.n.01 cooked__paprika.n.01_1 - cooked__paprika.n.01 - shrimp.n.03_1 shrimp.n.03_2 shrimp.n.03_3 shrimp.n.03_4 shrimp.n.03_5 shrimp.n.03_6 - shrimp.n.03 - clam.n.01_1 clam.n.01_2 clam.n.01_3 clam.n.01_4 clam.n.01_5 clam.n.01_6 - clam.n.01 - pea.n.01_1 pea.n.01_10 pea.n.01_11 pea.n.01_12 pea.n.01_2 pea.n.01_3 pea.n.01_4 pea.n.01_5 pea.n.01_6 pea.n.01_7 pea.n.01_8 pea.n.01_9 - pea.n.01 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 prawn.n.01_4 prawn.n.01_5 prawn.n.01_6 - prawn.n.01 + clam.n.03_1 clam.n.03_2 clam.n.03_3 clam.n.03_4 clam.n.03_5 clam.n.03_6 - clam.n.03 + pea.n.01_1 - pea.n.01 + cooked__pea.n.01_1 - cooked__pea.n.01 tupperware.n.01_1 tupperware.n.01_2 tupperware.n.01_3 - tupperware.n.01 bowl.n.01_1 - bowl.n.01 carving_knife.n.01_1 - carving_knife.n.01 @@ -52,12 +53,12 @@ (insource paprika__shaker.n.01_1 paprika.n.02_1) (ontop paprika__shaker.n.01_1 countertop.n.01_1) (ontop saucepot.n.01_1 stove.n.01_1) - (inside shrimp.n.03_1 tupperware.n.01_2) - (inside shrimp.n.03_2 tupperware.n.01_2) - (inside shrimp.n.03_3 tupperware.n.01_2) - (inside shrimp.n.03_4 tupperware.n.01_2) - (inside shrimp.n.03_5 tupperware.n.01_2) - (inside shrimp.n.03_6 tupperware.n.01_2) + (inside prawn.n.01_1 tupperware.n.01_2) + (inside prawn.n.01_2 tupperware.n.01_2) + (inside prawn.n.01_3 tupperware.n.01_2) + (inside prawn.n.01_4 tupperware.n.01_2) + (inside prawn.n.01_5 tupperware.n.01_2) + (inside prawn.n.01_6 tupperware.n.01_2) (inside tupperware.n.01_2 electric_refrigerator.n.01_1) (ontop chopping_board.n.01_1 countertop.n.01_1) (ontop carving_knife.n.01_1 chopping_board.n.01_1) @@ -65,48 +66,48 @@ (ontop white_rice__sack.n.01_1 floor.n.01_1) (inside cup.n.01_1 cabinet.n.01_1) (ontop frying_pan.n.01_1 stove.n.01_1) - (inside clam.n.01_1 tupperware.n.01_3) - (inside clam.n.01_2 tupperware.n.01_3) - (inside clam.n.01_3 tupperware.n.01_3) - (inside clam.n.01_4 tupperware.n.01_3) - (inside clam.n.01_5 tupperware.n.01_3) - (inside clam.n.01_6 tupperware.n.01_3) + (inside clam.n.03_1 tupperware.n.01_3) + (inside clam.n.03_2 tupperware.n.01_3) + (inside clam.n.03_3 tupperware.n.01_3) + (inside clam.n.03_4 tupperware.n.01_3) + (inside clam.n.03_5 tupperware.n.01_3) + (inside clam.n.03_6 tupperware.n.01_3) (inside tupperware.n.01_3 electric_refrigerator.n.01_1) (not - (cooked shrimp.n.03_1) + (cooked prawn.n.01_1) ) (not - (cooked shrimp.n.03_2) + (cooked prawn.n.01_2) ) (not - (cooked shrimp.n.03_3) + (cooked prawn.n.01_3) ) (not - (cooked shrimp.n.03_4) + (cooked prawn.n.01_4) ) (not - (cooked shrimp.n.03_5) + (cooked prawn.n.01_5) ) (not - (cooked shrimp.n.03_6) + (cooked prawn.n.01_6) ) (not - (cooked clam.n.01_1) + (cooked clam.n.03_1) ) (not - (cooked clam.n.01_2) + (cooked clam.n.03_2) ) (not - (cooked clam.n.01_3) + (cooked clam.n.03_3) ) (not - (cooked clam.n.01_4) + (cooked clam.n.03_4) ) (not - (cooked clam.n.01_5) + (cooked clam.n.03_5) ) (not - (cooked clam.n.01_6) + (cooked clam.n.03_6) ) (not (cooked chorizo.n.01_1) @@ -114,54 +115,7 @@ (not (cooked chorizo.n.01_2) ) - (inside pea.n.01_1 bowl.n.01_1) - (not - (cooked pea.n.01_1) - ) - (inside pea.n.01_2 bowl.n.01_1) - (not - (cooked pea.n.01_2) - ) - (inside pea.n.01_3 bowl.n.01_1) - (not - (cooked pea.n.01_3) - ) - (inside pea.n.01_4 bowl.n.01_1) - (not - (cooked pea.n.01_4) - ) - (inside pea.n.01_5 bowl.n.01_1) - (not - (cooked pea.n.01_5) - ) - (inside pea.n.01_6 bowl.n.01_1) - (not - (cooked pea.n.01_6) - ) - (inside pea.n.01_7 bowl.n.01_1) - (not - (cooked pea.n.01_7) - ) - (inside pea.n.01_8 bowl.n.01_1) - (not - (cooked pea.n.01_8) - ) - (inside pea.n.01_9 bowl.n.01_1) - (not - (cooked pea.n.01_9) - ) - (inside pea.n.01_10 bowl.n.01_1) - (not - (cooked pea.n.01_10) - ) - (inside pea.n.01_11 bowl.n.01_1) - (not - (cooked pea.n.01_11) - ) - (inside pea.n.01_12 bowl.n.01_1) - (not - (cooked pea.n.01_12) - ) + (filled bowl.n.01_1 pea.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 countertop.n.01_1) @@ -180,6 +134,7 @@ (future cooked__salt.n.01_1) (future cooked__white_wine.n.01_1) (future cooked__paprika.n.01_1) + (future cooked__pea.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) @@ -187,6 +142,7 @@ (and (real ?cooked__white_rice.n.01_1) (real ?cooked__diced__chorizo.n.01_1) + (real ?cooked__pea.n.01_1) (or (real ?saffron.n.02_1) (real ?cooked__saffron.n.01_1) @@ -213,27 +169,21 @@ (contains ?frying_pan.n.01_1 ?salt.n.02_1) ) (forall - (?shrimp.n.03 - shrimp.n.03) + (?prawn.n.01 - prawn.n.01) (and - (cooked ?shrimp.n.03) - (inside ?shrimp.n.03 ?frying_pan.n.01_1) + (cooked ?prawn.n.01) + (inside ?prawn.n.01 ?frying_pan.n.01_1) ) ) (forall - (?clam.n.01 - clam.n.01) - (and - (cooked ?clam.n.01) - (inside ?clam.n.01 ?frying_pan.n.01_1) - ) - ) - (forall - (?pea.n.01 - pea.n.01) + (?clam.n.03 - clam.n.03) (and - (cooked ?pea.n.01) - (inside ?pea.n.01 ?frying_pan.n.01_1) + (cooked ?clam.n.03) + (inside ?clam.n.03 ?frying_pan.n.01_1) ) ) (contains ?frying_pan.n.01_1 ?cooked__diced__chorizo.n.01_1) + (contains ?frying_pan.n.01_1 ?cooked__pea.n.01_1) (or (contains ?frying_pan.n.01_1 ?paprika.n.02_1) (contains ?frying_pan.n.01_1 ?cooked__paprika.n.01_1) diff --git a/bddl/activity_definitions/cook_shrimp/problem0.bddl b/bddl/activity_definitions/cook_shrimp/problem0.bddl index 5500d0b4..59e592a2 100644 --- a/bddl/activity_definitions/cook_shrimp/problem0.bddl +++ b/bddl/activity_definitions/cook_shrimp/problem0.bddl @@ -3,7 +3,7 @@ (:objects frying_pan.n.01_1 - frying_pan.n.01 - shrimp.n.03_1 shrimp.n.03_10 shrimp.n.03_2 shrimp.n.03_3 shrimp.n.03_4 shrimp.n.03_5 shrimp.n.03_6 shrimp.n.03_7 shrimp.n.03_8 shrimp.n.03_9 - shrimp.n.03 + prawn.n.01_1 prawn.n.01_10 prawn.n.01_2 prawn.n.01_3 prawn.n.01_4 prawn.n.01_5 prawn.n.01_6 prawn.n.01_7 prawn.n.01_8 prawn.n.01_9 - prawn.n.01 stove.n.01_1 - stove.n.01 clove.n.03_1 clove.n.03_2 clove.n.03_3 clove.n.03_4 - clove.n.03 tupperware.n.01_1 - tupperware.n.01 @@ -21,55 +21,55 @@ ) (:init - (inside shrimp.n.03_1 sack.n.01_1) - (inside shrimp.n.03_2 sack.n.01_1) - (inside shrimp.n.03_3 sack.n.01_1) - (inside shrimp.n.03_4 sack.n.01_1) - (inside shrimp.n.03_5 sack.n.01_1) - (inside shrimp.n.03_6 sack.n.01_1) - (inside shrimp.n.03_7 sack.n.01_1) - (inside shrimp.n.03_8 sack.n.01_1) - (inside shrimp.n.03_9 sack.n.01_1) - (inside shrimp.n.03_10 sack.n.01_1) - (frozen shrimp.n.03_1) - (frozen shrimp.n.03_2) - (frozen shrimp.n.03_3) - (frozen shrimp.n.03_4) - (frozen shrimp.n.03_5) - (frozen shrimp.n.03_6) - (frozen shrimp.n.03_7) - (frozen shrimp.n.03_8) - (frozen shrimp.n.03_9) - (frozen shrimp.n.03_10) + (inside prawn.n.01_1 sack.n.01_1) + (inside prawn.n.01_2 sack.n.01_1) + (inside prawn.n.01_3 sack.n.01_1) + (inside prawn.n.01_4 sack.n.01_1) + (inside prawn.n.01_5 sack.n.01_1) + (inside prawn.n.01_6 sack.n.01_1) + (inside prawn.n.01_7 sack.n.01_1) + (inside prawn.n.01_8 sack.n.01_1) + (inside prawn.n.01_9 sack.n.01_1) + (inside prawn.n.01_10 sack.n.01_1) + (frozen prawn.n.01_1) + (frozen prawn.n.01_2) + (frozen prawn.n.01_3) + (frozen prawn.n.01_4) + (frozen prawn.n.01_5) + (frozen prawn.n.01_6) + (frozen prawn.n.01_7) + (frozen prawn.n.01_8) + (frozen prawn.n.01_9) + (frozen prawn.n.01_10) (not - (cooked shrimp.n.03_1) + (cooked prawn.n.01_1) ) (not - (cooked shrimp.n.03_2) + (cooked prawn.n.01_2) ) (not - (cooked shrimp.n.03_3) + (cooked prawn.n.01_3) ) (not - (cooked shrimp.n.03_4) + (cooked prawn.n.01_4) ) (not - (cooked shrimp.n.03_5) + (cooked prawn.n.01_5) ) (not - (cooked shrimp.n.03_6) + (cooked prawn.n.01_6) ) (not - (cooked shrimp.n.03_7) + (cooked prawn.n.01_7) ) (not - (cooked shrimp.n.03_8) + (cooked prawn.n.01_8) ) (not - (cooked shrimp.n.03_9) + (cooked prawn.n.01_9) ) (not - (cooked shrimp.n.03_10) + (cooked prawn.n.01_10) ) (inside sack.n.01_1 electric_refrigerator.n.01_1) (inside frying_pan.n.01_1 cabinet.n.01_1) @@ -94,12 +94,12 @@ (:goal (and (forall - (?shrimp.n.03 - shrimp.n.03) + (?prawn.n.01 - prawn.n.01) (and - (cooked ?shrimp.n.03) - (covered ?shrimp.n.03 ?paprika.n.02_1) - (covered ?shrimp.n.03 ?salt.n.02_1) - (inside ?shrimp.n.03 ?frying_pan.n.01_1) + (cooked ?prawn.n.01) + (covered ?prawn.n.01 ?paprika.n.02_1) + (covered ?prawn.n.01 ?salt.n.02_1) + (inside ?prawn.n.01 ?frying_pan.n.01_1) ) ) (forall diff --git a/bddl/activity_definitions/cook_simple_ginger_and_garlic_prawns/problem0.bddl b/bddl/activity_definitions/cook_simple_ginger_and_garlic_prawns/problem0.bddl index eea4021c..26f689e8 100644 --- a/bddl/activity_definitions/cook_simple_ginger_and_garlic_prawns/problem0.bddl +++ b/bddl/activity_definitions/cook_simple_ginger_and_garlic_prawns/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - shrimp.n.03_1 - shrimp.n.03 + prawn.n.01_1 - prawn.n.01 frying_pan.n.01_1 - frying_pan.n.01 clove.n.03_1 clove.n.03_2 - clove.n.03 lime.n.06_1 - lime.n.06 @@ -14,7 +14,7 @@ ) (:init - (ontop shrimp.n.03_1 frying_pan.n.01_1) + (ontop prawn.n.01_1 frying_pan.n.01_1) (ontop clove.n.03_1 frying_pan.n.01_1) (ontop clove.n.03_2 frying_pan.n.01_1) (ontop lime.n.06_1 frying_pan.n.01_1) @@ -23,7 +23,7 @@ (ontop frying_pan.n.01_1 stove.n.01_1) (ontop butter.n.01_1 frying_pan.n.01_1) (not - (cooked shrimp.n.03_1) + (cooked prawn.n.01_1) ) (not (hot frying_pan.n.01_1) @@ -36,16 +36,16 @@ (:goal (and (and - (covered ?shrimp.n.03_1 ?butter.n.01_1) + (covered ?prawn.n.01_1 ?butter.n.01_1) (ontop ?lime.n.06_1 ?casserole.n.02_1) - (ontop ?shrimp.n.03_1 ?casserole.n.02_1) + (ontop ?prawn.n.01_1 ?casserole.n.02_1) (ontop ?clove.n.03_1 ?casserole.n.02_1) (ontop ?clove.n.03_2 ?casserole.n.02_1) (ontop ?frying_pan.n.01_1 ?stove.n.01_1) (ontop ?casserole.n.02_1 ?stove.n.01_1) ) (and - (cooked ?shrimp.n.03_1) + (cooked ?prawn.n.01_1) (not (toggled_on ?stove.n.01_1) ) diff --git a/bddl/activity_definitions/cook_snap_peas/problem0.bddl b/bddl/activity_definitions/cook_snap_peas/problem0.bddl index fc80cb7d..b77d58af 100644 --- a/bddl/activity_definitions/cook_snap_peas/problem0.bddl +++ b/bddl/activity_definitions/cook_snap_peas/problem0.bddl @@ -5,7 +5,7 @@ white_sauce.n.01_1 - white_sauce.n.01 white_sauce__bottle.n.01_1 - white_sauce__bottle.n.01 cabinet.n.01_1 - cabinet.n.01 - pea.n.01_1 pea.n.01_2 pea.n.01_3 pea.n.01_3 pea.n.01_4 pea.n.01_5 pea.n.01_6 pea.n.01_7 pea.n.01_8 pea.n.01_9 - pea.n.01 + pea_pod.n.01_1 pea_pod.n.01_2 pea_pod.n.01_3 pea_pod.n.01_4 - pea_pod.n.01 oven.n.01_1 - oven.n.01 bowl.n.01_1 - bowl.n.01 casserole.n.02_1 - casserole.n.02 @@ -17,45 +17,22 @@ (:init (filled white_sauce__bottle.n.01_1 white_sauce.n.01_1) (inside white_sauce__bottle.n.01_1 cabinet.n.01_1) - (inside pea.n.01_1 bowl.n.01_1) - (inside pea.n.01_2 bowl.n.01_1) - (inside pea.n.01_3 bowl.n.01_1) - (inside pea.n.01_4 bowl.n.01_1) - (inside pea.n.01_5 bowl.n.01_1) - (inside pea.n.01_6 bowl.n.01_1) - (inside pea.n.01_7 bowl.n.01_1) - (inside pea.n.01_8 bowl.n.01_1) - (inside pea.n.01_9 bowl.n.01_1) + (inside pea_pod.n.01_1 bowl.n.01_1) + (inside pea_pod.n.01_2 bowl.n.01_1) + (inside pea_pod.n.01_3 bowl.n.01_1) + (inside pea_pod.n.01_4 bowl.n.01_1) (not - (cooked pea.n.01_1) + (cooked pea_pod.n.01_1) ) (not - (cooked pea.n.01_2) + (cooked pea_pod.n.01_2) ) (not - (cooked pea.n.01_3) + (cooked pea_pod.n.01_3) ) (not - (cooked pea.n.01_4) - ) - (not - (cooked pea.n.01_5) - ) - (not - (cooked pea.n.01_6) - ) - (not - (cooked pea.n.01_7) - ) - (not - (cooked pea.n.01_8) - ) - (not - (cooked pea.n.01_9) - ) - (not - (hot oven.n.01_1) - ) + (cooked pea_pod.n.01_4) + ) (inside bowl.n.01_1 electric_refrigerator.n.01_1) (inside casserole.n.02_1 cabinet.n.01_1) (inroom floor.n.01_1 kitchen) @@ -68,10 +45,10 @@ (:goal (and (forall - (?pea.n.01 - pea.n.01) + (?pea_pod.n.01 - pea_pod.n.01) (and - (cooked ?pea.n.01) - (covered ?pea.n.01 ?white_sauce.n.01_1) + (cooked ?pea_pod.n.01) + (covered ?pea_pod.n.01 ?white_sauce.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/cook_sweet_potatoes/problem0.bddl b/bddl/activity_definitions/cook_sweet_potatoes/problem0.bddl index ccf4cb41..b71ecafb 100644 --- a/bddl/activity_definitions/cook_sweet_potatoes/problem0.bddl +++ b/bddl/activity_definitions/cook_sweet_potatoes/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - sweet_potato.n.01_1 sweet_potato.n.01_2 - sweet_potato.n.01 + sweet_potato.n.02_1 sweet_potato.n.02_2 - sweet_potato.n.02 aluminum_foil.n.01_1 - aluminum_foil.n.01 oven.n.01_1 - oven.n.01 salt.n.02_1 - salt.n.02 @@ -12,14 +12,14 @@ ) (:init - (ontop sweet_potato.n.01_1 aluminum_foil.n.01_1) - (ontop sweet_potato.n.01_2 aluminum_foil.n.01_1) + (ontop sweet_potato.n.02_1 aluminum_foil.n.01_1) + (ontop sweet_potato.n.02_2 aluminum_foil.n.01_1) (ontop aluminum_foil.n.01_1 oven.n.01_1) (not - (cooked sweet_potato.n.01_1) + (cooked sweet_potato.n.02_1) ) (not - (cooked sweet_potato.n.01_2) + (cooked sweet_potato.n.02_2) ) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 oven.n.01_1) @@ -31,10 +31,10 @@ (:goal (and (forall - (?sweet_potato.n.01 - sweet_potato.n.01) + (?sweet_potato.n.02 - sweet_potato.n.02) (and - (cooked ?sweet_potato.n.01) - (covered ?sweet_potato.n.01 ?salt.n.02_1) + (cooked ?sweet_potato.n.02) + (covered ?sweet_potato.n.02 ?salt.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/cooking_breakfast/problem0.bddl b/bddl/activity_definitions/cooking_breakfast/problem0.bddl index e7604a8a..aa83c470 100644 --- a/bddl/activity_definitions/cooking_breakfast/problem0.bddl +++ b/bddl/activity_definitions/cooking_breakfast/problem0.bddl @@ -3,7 +3,6 @@ (:objects raw_egg.n.01_1 raw_egg.n.01_2 - raw_egg.n.01 - fried_egg.n.01_1 fried_egg.n.01_2 - fried_egg.n.01 bowl.n.01_1 bowl.n.01_2 - bowl.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 butter.n.01_1 - butter.n.01 @@ -32,8 +31,6 @@ (inside bratwurst.n.01_2 electric_refrigerator.n.01_1) (ontop plate.n.04_1 countertop.n.01_1) (future melted__butter.n.01_1) - (future fried_egg.n.01_1) - (future fried_egg.n.01_2) (inroom electric_refrigerator.n.01_1 kitchen) (inroom countertop.n.01_1 kitchen) (inroom stove.n.01_1 kitchen) @@ -44,14 +41,12 @@ (:goal (and (real ?melted__butter.n.01_1) - (real ?fried_egg.n.01_1) - (real ?fried_egg.n.01_2) (forall - (?fried_egg.n.01 - fried_egg.n.01) + (?raw_egg.n.01 - raw_egg.n.01) (and - (cooked ?fried_egg.n.01) - (ontop ?fried_egg.n.01 ?plate.n.04_1) - (covered ?fried_egg.n.01 ?melted__butter.n.01_1) + (cooked ?raw_egg.n.01) + (ontop ?raw_egg.n.01 ?plate.n.04_1) + (covered ?raw_egg.n.01 ?melted__butter.n.01_1) ) ) (forall diff --git a/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl b/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl index 60842ba1..f1f69d36 100644 --- a/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl +++ b/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl @@ -30,7 +30,7 @@ (attached wreath.n.01_1 wall.n.01_1) ) (inroom floor.n.01_1 playroom) - (inroom straight_chair.n.01_1 playroom) + (inroom straight_chair.n.01_1 playroom) (inroom wall.n.01_1 playroom) (inroom cabinet.n.01_1 playroom) (inroom bookcase.n.01_1 playroom) diff --git a/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl b/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl index b0a6b677..34f0ce61 100644 --- a/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl +++ b/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl @@ -7,7 +7,7 @@ sign.n.02_1 - sign.n.02 floor.n.01_1 - floor.n.01 centerpiece.n.02_1 - centerpiece.n.02 - gift.n.01_1 - gift.n.01 + gift__box.n.01_1 - gift__box.n.01 bow.n.08_1 - bow.n.08 tree.n.01_1 - tree.n.01 wall.n.01_1 - wall.n.01 @@ -30,7 +30,7 @@ ) (ontop centerpiece.n.02_1 floor.n.01_1) (ontop bow.n.08_1 floor.n.01_1) - (ontop gift.n.01_1 floor.n.01_1) + (ontop gift__box.n.01_1 floor.n.01_1) (inroom floor.n.01_1 garden) (inroom tree.n.01_1 garden) (inroom wall.n.01_1 garden) @@ -40,7 +40,7 @@ (:goal (and - (ontop ?gift.n.01_1 ?pedestal_table.n.01_1) + (ontop ?gift__box.n.01_1 ?pedestal_table.n.01_1) (ontop ?centerpiece.n.02_1 ?pedestal_table.n.01_1) (forall (?balloon.n.01 - balloon.n.01) diff --git a/bddl/activity_definitions/dispose_of_batteries/problem0.bddl b/bddl/activity_definitions/dispose_of_batteries/problem0.bddl index 5c06f223..358d7d6a 100644 --- a/bddl/activity_definitions/dispose_of_batteries/problem0.bddl +++ b/bddl/activity_definitions/dispose_of_batteries/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - battery.n.01_1 battery.n.01_2 - battery.n.01 + battery.n.02_1 battery.n.02_2 - battery.n.02 cabinet.n.01_1 - cabinet.n.01 ashcan.n.01_1 - ashcan.n.01 razor.n.01_1 - razor.n.01 @@ -12,9 +12,9 @@ ) (:init - (ontop battery.n.01_1 floor.n.01_1) + (ontop battery.n.02_1 floor.n.01_1) (inside hand_blower.n.01_1 cabinet.n.01_1) - (ontop battery.n.01_2 floor.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) (inroom cabinet.n.01_1 bedroom) @@ -25,9 +25,9 @@ (:goal (and (forall - (?battery.n.01 - battery.n.01) - (inside ?battery.n.01 ?ashcan.n.01_1) + (?battery.n.02 - battery.n.02) + (inside ?battery.n.02 ?ashcan.n.01_1) ) ) ) -) \ No newline at end of file +) diff --git a/bddl/activity_definitions/dispose_of_medication/problem0.bddl b/bddl/activity_definitions/dispose_of_medication/problem0.bddl index 458dcf87..87d3ae95 100644 --- a/bddl/activity_definitions/dispose_of_medication/problem0.bddl +++ b/bddl/activity_definitions/dispose_of_medication/problem0.bddl @@ -2,7 +2,6 @@ (:domain omnigibson) (:objects - analgesic.n.01_1 analgesic.n.01_2 analgesic.n.01_3 analgesic.n.01_4 - analgesic.n.01 pill.n.02_1 - pill.n.02 pill_bottle.n.01_1 pill_bottle.n.01_2 - pill_bottle.n.01 shelf.n.01_1 - shelf.n.01 @@ -12,10 +11,7 @@ ) (:init - (inside analgesic.n.01_1 pill_bottle.n.01_1) - (inside analgesic.n.01_2 pill_bottle.n.01_1) - (inside analgesic.n.01_3 pill_bottle.n.01_1) - (inside analgesic.n.01_4 pill_bottle.n.01_1) + (filled pill_bottle.n.01_1 pill.n.02_1) (filled pill_bottle.n.01_2 pill.n.02_1) (ontop pill_bottle.n.01_1 shelf.n.01_1) (ontop pill_bottle.n.01_2 shelf.n.01_1) @@ -29,12 +25,11 @@ (and (forall (?pill_bottle.n.01 - pill_bottle.n.01) - (inside ?pill_bottle.n.01 ?ashcan.n.01_1) - ) - (forall - (?analgesic.n.01 - analgesic.n.01) - (inside ?analgesic.n.01 ?ashcan.n.01_1) + (not + (contains ?pill_bottle.n.01 ?pill.n.02_1) + ) ) + (contains ?ashcan.n.01_1 ?pill.n.02_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/fertilizing_garden/problem0.bddl b/bddl/activity_definitions/fertilizing_garden/problem0.bddl index d89f4a99..3f10480d 100644 --- a/bddl/activity_definitions/fertilizing_garden/problem0.bddl +++ b/bddl/activity_definitions/fertilizing_garden/problem0.bddl @@ -16,9 +16,9 @@ (ontop pot.n.04_1 floor.n.01_1) (filled pot.n.04_1 soil.n.02_1) (ontop fertilizer__atomizer.n.01_1 floor.n.01_1) - (ontop potato.n.01_1 soil.n.02_1) - (ontop potato.n.01_2 soil.n.02_1) - (ontop potato.n.01_3 soil.n.02_1) + (ontop potato.n.01_1 floor.n.01_1) + (ontop potato.n.01_2 floor.n.01_1) + (ontop potato.n.01_3 floor.n.01_1) (inroom floor.n.01_1 garden) (ontop agent.n.01_1 floor.n.01_1) ) @@ -27,7 +27,10 @@ (and (forall (?potato.n.01 - potato.n.01) - (covered ?potato.n.01 ?fertilizer.n.01_1) + (and + (covered ?potato.n.01 ?fertilizer.n.01_1) + (covered ?potato.n.01 ?soil.n.02_1) + ) ) ) ) diff --git a/bddl/activity_definitions/filling_salt/problem0.bddl b/bddl/activity_definitions/filling_salt/problem0.bddl index 179de4f2..867f56a4 100644 --- a/bddl/activity_definitions/filling_salt/problem0.bddl +++ b/bddl/activity_definitions/filling_salt/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - funnel.n.01_1 - funnel.n.01 + funnel.n.02_1 - funnel.n.02 mason_jar.n.01_1 - mason_jar.n.01 granulated_salt.n.01_1 - granulated_salt.n.01 salt__bottle.n.01_1 - salt__bottle.n.01 @@ -12,7 +12,7 @@ ) (:init - (inside funnel.n.01_1 cabinet.n.01_1) + (inside funnel.n.02_1 cabinet.n.01_1) (inside mason_jar.n.01_1 cabinet.n.01_1) (filled salt__bottle.n.01_1 granulated_salt.n.01_1) (inside salt__bottle.n.01_1 cabinet.n.01_1) diff --git a/bddl/activity_definitions/fixing_broken_chair/problem0.bddl b/bddl/activity_definitions/fixing_broken_chair/problem0.bddl index f17b7488..8bcb2755 100644 --- a/bddl/activity_definitions/fixing_broken_chair/problem0.bddl +++ b/bddl/activity_definitions/fixing_broken_chair/problem0.bddl @@ -8,9 +8,9 @@ ) (:init - (broken chair.n.01_1) + (broken chair.n.01_1) (inroom floor.n.01_1 living_room) - (inroom chair.n.01_1 living_room) + (inroom chair.n.01_1 living_room) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/freeze_fruit/problem0.bddl b/bddl/activity_definitions/freeze_fruit/problem0.bddl index 97f18ae0..e6d0db0a 100644 --- a/bddl/activity_definitions/freeze_fruit/problem0.bddl +++ b/bddl/activity_definitions/freeze_fruit/problem0.bddl @@ -9,7 +9,6 @@ apple.n.01_1 apple.n.01_2 - apple.n.01 tray.n.01_1 - tray.n.01 strawberry.n.01_1 strawberry.n.01_2 - strawberry.n.01 - blueberry.n.02_1 blueberry.n.02_2 - blueberry.n.02 floor.n.01_1 - floor.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 agent.n.01_1 - agent.n.01 @@ -23,10 +22,8 @@ (inside apple.n.01_2 bowl.n.01_1) (ontop tray.n.01_1 countertop.n.01_1) (ontop strawberry.n.01_1 tray.n.01_1) - (ontop strawberry.n.01_2 tray.n.01_1) - (ontop blueberry.n.02_1 tray.n.01_1) - (ontop blueberry.n.02_2 tray.n.01_1) - (inroom floor.n.01_1 kitchen) + (ontop strawberry.n.01_2 tray.n.01_1) + (inroom floor.n.01_1 kitchen) (inroom electric_refrigerator.n.01_1 kitchen) (inroom countertop.n.01_1 kitchen) (inroom cabinet.n.01_1 kitchen) @@ -44,12 +41,7 @@ (?strawberry.n.01 - strawberry.n.01) (?tupperware.n.01 - tupperware.n.01) (inside ?strawberry.n.01 ?tupperware.n.01) - ) - (forpairs - (?blueberry.n.02 - blueberry.n.02) - (?tupperware.n.01 - tupperware.n.01) - (inside ?blueberry.n.02 ?tupperware.n.01) - ) + ) (forall (?apple.n.01 - apple.n.01) (frozen ?apple.n.01) @@ -57,11 +49,7 @@ (forall (?strawberry.n.01 - strawberry.n.01) (frozen ?strawberry.n.01) - ) - (forall - (?blueberry.n.02 - blueberry.n.02) - (frozen ?blueberry.n.02) - ) + ) (forall (?tupperware.n.01 - tupperware.n.01) (inside ?tupperware.n.01 ?electric_refrigerator.n.01_1) diff --git a/bddl/activity_definitions/fry_pot_stickers/problem0.bddl b/bddl/activity_definitions/fry_pot_stickers/problem0.bddl index e50421e2..9382beb1 100644 --- a/bddl/activity_definitions/fry_pot_stickers/problem0.bddl +++ b/bddl/activity_definitions/fry_pot_stickers/problem0.bddl @@ -6,7 +6,7 @@ stove.n.01_1 - stove.n.01 spatula.n.01_1 - spatula.n.01 cabinet.n.01_1 - cabinet.n.01 - dumpling.n.02_1 dumpling.n.02_2 dumpling.n.02_3 dumpling.n.02_4 - dumpling.n.02 + dumpling.n.01_1 dumpling.n.01_2 dumpling.n.01_3 dumpling.n.01_4 - dumpling.n.01 tupperware.n.01_1 - tupperware.n.01 cooking_oil.n.01_1 - cooking_oil.n.01 cooking_oil__bottle.n.01_1 - cooking_oil__bottle.n.01 @@ -20,26 +20,26 @@ (:init (inside frying_pan.n.01_1 cabinet.n.01_1) (inside spatula.n.01_1 cabinet.n.01_1) - (inside dumpling.n.02_1 tupperware.n.01_1) + (inside dumpling.n.01_1 tupperware.n.01_1) (not - (cooked dumpling.n.02_1) + (cooked dumpling.n.01_1) ) - (frozen dumpling.n.02_1) - (inside dumpling.n.02_2 tupperware.n.01_1) + (frozen dumpling.n.01_1) + (inside dumpling.n.01_2 tupperware.n.01_1) (not - (cooked dumpling.n.02_2) + (cooked dumpling.n.01_2) ) - (frozen dumpling.n.02_2) - (inside dumpling.n.02_3 tupperware.n.01_1) + (frozen dumpling.n.01_2) + (inside dumpling.n.01_3 tupperware.n.01_1) (not - (cooked dumpling.n.02_3) + (cooked dumpling.n.01_3) ) - (frozen dumpling.n.02_3) - (inside dumpling.n.02_4 tupperware.n.01_1) + (frozen dumpling.n.01_3) + (inside dumpling.n.01_4 tupperware.n.01_1) (not - (cooked dumpling.n.02_4) + (cooked dumpling.n.01_4) ) - (frozen dumpling.n.02_4) + (frozen dumpling.n.01_4) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) (filled cooking_oil__bottle.n.01_1 cooking_oil.n.01_1) (inside cooking_oil__bottle.n.01_1 cabinet.n.01_1) @@ -55,10 +55,10 @@ (:goal (and (forall - (?dumpling.n.02 - dumpling.n.02) + (?dumpling.n.01 - dumpling.n.01) (and - (cooked ?dumpling.n.02) - (covered ?dumpling.n.02 ?cooking_oil.n.01_1) + (cooked ?dumpling.n.01) + (covered ?dumpling.n.01 ?cooking_oil.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/gathering_nuts/problem0.bddl b/bddl/activity_definitions/gathering_nuts/problem0.bddl index b45e1404..0d64db7f 100644 --- a/bddl/activity_definitions/gathering_nuts/problem0.bddl +++ b/bddl/activity_definitions/gathering_nuts/problem0.bddl @@ -2,7 +2,6 @@ (:domain omnigibson) (:objects - rail_fence.n.01_1 - rail_fence.n.01 floor.n.01_1 - floor.n.01 walnut.n.01_1 walnut.n.01_2 walnut.n.01_3 walnut.n.01_4 walnut.n.01_5 walnut.n.01_6 walnut.n.01_7 walnut.n.01_8 - walnut.n.01 bucket.n.01_1 bucket.n.01_2 - bucket.n.01 @@ -11,8 +10,7 @@ ) (:init - (ontop rail_fence.n.01_1 floor.n.01_1) - (ontop walnut.n.01_1 floor.n.01_1) + (ontop walnut.n.01_1 floor.n.01_1) (ontop walnut.n.01_2 floor.n.01_1) (ontop walnut.n.01_3 floor.n.01_1) (ontop walnut.n.01_4 floor.n.01_1) diff --git a/bddl/activity_definitions/getting_organized_for_work/problem0.bddl b/bddl/activity_definitions/getting_organized_for_work/problem0.bddl index 7fb5aa53..b919ce97 100644 --- a/bddl/activity_definitions/getting_organized_for_work/problem0.bddl +++ b/bddl/activity_definitions/getting_organized_for_work/problem0.bddl @@ -15,15 +15,15 @@ ) (:init - (ontop mouse.n.04_1 swivel_chair.n.01_1) + (ontop mouse.n.04_1 swivel_chair.n.01_1) (ontop keyboard.n.01_1 notebook.n.01_1) (ontop pen.n.01_1 folder.n.02_1) (ontop notebook.n.01_1 desk.n.01_1) - (ontop folder.n.02_1 swivel_chair.n.01_1) + (ontop folder.n.02_1 swivel_chair.n.01_1) (ontop computer.n.01_1 desk.n.01_1) (inroom desk.n.01_1 shared_office) (inroom floor.n.01_1 shared_office) - (inroom swivel_chair.n.01_1 shared_office) + (inroom swivel_chair.n.01_1 shared_office) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/hard_boil_an_egg/problem0.bddl b/bddl/activity_definitions/hard_boil_an_egg/problem0.bddl index 7b67ef80..ad448b1a 100644 --- a/bddl/activity_definitions/hard_boil_an_egg/problem0.bddl +++ b/bddl/activity_definitions/hard_boil_an_egg/problem0.bddl @@ -5,7 +5,6 @@ stove.n.01_1 - stove.n.01 saucepot.n.01_1 - saucepot.n.01 egg.n.02_1 - egg.n.02 - hard-boiled_egg.n.01_1 - hard-boiled_egg.n.01 floor.n.01_1 - floor.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 sink.n.01_1 - sink.n.01 @@ -21,13 +20,12 @@ (inroom floor.n.01_1 kitchen) (inroom electric_refrigerator.n.01_1 kitchen) (inroom sink.n.01_1 kitchen) - (future hard-boiled_egg.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and - (real ?hard-boiled_egg.n.01_1) + (cooked ?egg.n.02_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/make_a_blended_iced_cappuccino/problem0.bddl b/bddl/activity_definitions/make_a_blended_iced_cappuccino/problem0.bddl index 6e48d267..6ec2574f 100644 --- a/bddl/activity_definitions/make_a_blended_iced_cappuccino/problem0.bddl +++ b/bddl/activity_definitions/make_a_blended_iced_cappuccino/problem0.bddl @@ -4,7 +4,7 @@ (:objects water.n.06_1 - water.n.06 instant_coffee.n.01_1 - instant_coffee.n.01 - cane_sugar.n.01_1 - cane_sugar.n.01 + cane_sugar.n.02_1 - cane_sugar.n.02 chocolate_milk.n.01_1 - chocolate_milk.n.01 ice_cube.n.01_1 ice_cube.n.01_2 ice_cube.n.01_3 - ice_cube.n.01 iced_cappuccino.n.01_1 - iced_cappuccino.n.01 @@ -28,7 +28,7 @@ (ontop tablespoon.n.02_1 countertop.n.01_1) (filled instant_coffee__jar.n.01_1 instant_coffee.n.01_1) (inside instant_coffee__jar.n.01_1 cabinet.n.01_1) - (filled sugar__sack.n.01_1 cane_sugar.n.01_1) + (filled sugar__sack.n.01_1 cane_sugar.n.02_1) (inside sugar__sack.n.01_1 cabinet.n.01_1) (filled milk__carton.n.01_1 chocolate_milk.n.01_1) (inside milk__carton.n.01_1 electric_refrigerator.n.01_1) diff --git a/bddl/activity_definitions/make_a_cappuccino/problem0.bddl b/bddl/activity_definitions/make_a_cappuccino/problem0.bddl index 2d6cfc4e..1e1b98bb 100644 --- a/bddl/activity_definitions/make_a_cappuccino/problem0.bddl +++ b/bddl/activity_definitions/make_a_cappuccino/problem0.bddl @@ -4,7 +4,7 @@ (:objects water.n.06_1 - water.n.06 instant_coffee.n.01_1 - instant_coffee.n.01 - cane_sugar.n.01_1 - cane_sugar.n.01 + cane_sugar.n.02_1 - cane_sugar.n.02 whole_milk.n.01_1 - whole_milk.n.01 foam.n.01_1 - foam.n.01 blender.n.01_1 - blender.n.01 @@ -28,7 +28,7 @@ (ontop tablespoon.n.02_1 countertop.n.01_1) (filled instant_coffee__jar.n.01_1 instant_coffee.n.01_1) (ontop instant_coffee__jar.n.01_1 countertop.n.01_1) - (filled mason_jar.n.01_1 cane_sugar.n.01_1) + (filled mason_jar.n.01_1 cane_sugar.n.02_1) (ontop mason_jar.n.01_1 countertop.n.01_1) (filled carafe.n.01_1 whole_milk.n.01_1) (filled carboy.n.01_1 foam.n.01_1) diff --git a/bddl/activity_definitions/make_a_cheese_pastry/problem0.bddl b/bddl/activity_definitions/make_a_cheese_pastry/problem0.bddl index 57e23a34..935e57d8 100644 --- a/bddl/activity_definitions/make_a_cheese_pastry/problem0.bddl +++ b/bddl/activity_definitions/make_a_cheese_pastry/problem0.bddl @@ -3,7 +3,7 @@ (:objects raw_egg.n.01_1 - raw_egg.n.01 - cane_sugar.n.01_1 - cane_sugar.n.01 + cane_sugar.n.02_1 - cane_sugar.n.02 lemon_juice.n.01_1 - lemon_juice.n.01 vanilla.n.02_1 - vanilla.n.02 cream_cheese.n.01_1 - cream_cheese.n.01 @@ -36,7 +36,7 @@ (:init (inside raw_egg.n.01_1 bowl.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) - (filled sugar__sack.n.01_1 cane_sugar.n.01_1) + (filled sugar__sack.n.01_1 cane_sugar.n.02_1) (ontop sugar__sack.n.01_1 countertop.n.01_1) (filled lemon_juice__bottle.n.01_1 lemon_juice.n.01_1) (inside lemon_juice__bottle.n.01_1 electric_refrigerator.n.01_1) diff --git a/bddl/activity_definitions/make_a_chia_breakfast_bowl/problem0.bddl b/bddl/activity_definitions/make_a_chia_breakfast_bowl/problem0.bddl index 08c749c4..2de3b425 100644 --- a/bddl/activity_definitions/make_a_chia_breakfast_bowl/problem0.bddl +++ b/bddl/activity_definitions/make_a_chia_breakfast_bowl/problem0.bddl @@ -6,11 +6,12 @@ granola__box.n.01_1 - granola__box.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 yogurt.n.01_1 - yogurt.n.01 - cup__of__yogurt.n.01_1 - cup__of__yogurt.n.01 - blackberry.n.01_1 - blackberry.n.01 - bowl.n.01_1 - bowl.n.01 + yogurt__cup.n.01_1 - yogurt__cup.n.01 + blackberry.n.01_1 blackberry.n.01_2 - blackberry.n.01 + bowl.n.01_1 bowl.n.01_2 - bowl.n.01 + plate.n.04_1 - plate.n.04 blueberry.n.02_1 - blueberry.n.02 - raspberry.n.02_1 - raspberry.n.02 + raspberry.n.02_1 raspberry.n.02_2 - raspberry.n.02 chia_seed.n.01_1 - chia_seed.n.01 chia_seed__bag.n.01_1 - chia_seed__bag.n.01 floor.n.01_1 - floor.n.01 @@ -18,15 +19,19 @@ ) (:init - (covered granola__box.n.01_1 granola.n.01_1) - (ontop granola__box.n.01_1 breakfast_table.n.01_1) - (covered cup__of__yogurt.n.01_1 yogurt.n.01_1) - (ontop cup__of__yogurt.n.01_1 breakfast_table.n.01_1) - (ontop blackberry.n.01_1 bowl.n.01_1) - (ontop blueberry.n.02_1 bowl.n.01_1) - (ontop raspberry.n.02_1 bowl.n.01_1) - (ontop bowl.n.01_1 breakfast_table.n.01_1) - (covered chia_seed__bag.n.01_1 chia_seed.n.01_1) + (filled granola__box.n.01_1 granola.n.01_1) + (ontop granola__box.n.01_1 breakfast_table.n.01_1) + (ontop plate.n.04_1 breakfast_table.n.01_1) + (filled yogurt__cup.n.01_1 yogurt.n.01_1) + (ontop yogurt__cup.n.01_1 breakfast_table.n.01_1) + (ontop blackberry.n.01_1 plate.n.04_1) + (ontop blackberry.n.01_2 plate.n.04_1) + (ontop raspberry.n.02_1 plate.n.04_1) + (ontop raspberry.n.02_2 plate.n.04_1) + (filled bowl.n.01_1 blueberry.n.02_1) + (ontop bowl.n.01_1 breakfast_table.n.01_1) + (ontop bowl.n.01_2 breakfast_table.n.01_1) + (filled chia_seed__bag.n.01_1 chia_seed.n.01_1) (ontop chia_seed__bag.n.01_1 breakfast_table.n.01_1) (inroom breakfast_table.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) @@ -34,47 +39,20 @@ ) (:goal - (and - (forall - (?granola.n.01 - granola.n.01) - (filled ?bowl.n.01_1 ?granola.n.01) - ) - (forall - (?granola__box.n.01 - granola__box.n.01) - (ontop ?granola__box.n.01 ?breakfast_table.n.01_1) - ) - (forall - (?yogurt.n.01 - yogurt.n.01) - (filled ?bowl.n.01_1 ?yogurt.n.01) - ) - (forall - (?cup__of__yogurt.n.01 - cup__of__yogurt.n.01) - (ontop ?cup__of__yogurt.n.01 ?breakfast_table.n.01_1) - ) + (and + (contains ?bowl.n.01_2 ?granola.n.01_1) + (contains ?bowl.n.01_2 ?yogurt.n.01_1) (forall (?blackberry.n.01 - blackberry.n.01) - (ontop ?blackberry.n.01 ?bowl.n.01_1) - ) - (forall - (?blueberry.n.02 - blueberry.n.02) - (ontop ?blueberry.n.02 ?bowl.n.01_1) - ) - (forall - (?raspberry.n.02 - raspberry.n.02) - (ontop ?raspberry.n.02 ?bowl.n.01_1) - ) - (forall - (?bowl.n.01 - bowl.n.01) - (ontop ?bowl.n.01 ?breakfast_table.n.01_1) - ) - (forall - (?chia_seed.n.01 - chia_seed.n.01) - (covered ?bowl.n.01_1 ?chia_seed.n.01) - ) - (forall - (?chia_seed__bag.n.01 - chia_seed__bag.n.01) - (ontop ?chia_seed__bag.n.01 ?breakfast_table.n.01_1) + (inside ?blackberry.n.01 ?bowl.n.01_2) + ) + (forall + (?raspberry.n.02 - raspberry.n.02) + (inside ?raspberry.n.02 ?bowl.n.01_2) ) + (contains ?bowl.n.01_2 ?blueberry.n.02_1) + (ontop ?bowl.n.01_2 ?breakfast_table.n.01_1) + (contains ?bowl.n.01_2 ?chia_seed.n.01_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/make_a_frappe/problem0.bddl b/bddl/activity_definitions/make_a_frappe/problem0.bddl index 2a65f8c9..62d436d1 100644 --- a/bddl/activity_definitions/make_a_frappe/problem0.bddl +++ b/bddl/activity_definitions/make_a_frappe/problem0.bddl @@ -4,7 +4,7 @@ (:objects water.n.06_1 - water.n.06 instant_coffee.n.01_1 - instant_coffee.n.01 - cane_sugar.n.01_1 - cane_sugar.n.01 + cane_sugar.n.02_1 - cane_sugar.n.02 ice_cube.n.01_1 ice_cube.n.01_2 ice_cube.n.01_3 ice_cube.n.01_4 - ice_cube.n.01 milkshake.n.01_1 - milkshake.n.01 blender.n.01_1 - blender.n.01 @@ -27,7 +27,7 @@ (ontop tablespoon.n.02_1 countertop.n.01_1) (filled instant_coffee__jar.n.01_1 instant_coffee.n.01_1) (ontop instant_coffee__jar.n.01_1 countertop.n.01_1) - (filled sugar__sack.n.01_1 cane_sugar.n.01_1) + (filled sugar__sack.n.01_1 cane_sugar.n.02_1) (ontop sugar__sack.n.01_1 countertop.n.01_1) (inside ice_cube.n.01_1 bowl.n.01_1) (inside ice_cube.n.01_2 bowl.n.01_1) diff --git a/bddl/activity_definitions/make_a_military_care_package/problem0.bddl b/bddl/activity_definitions/make_a_military_care_package/problem0.bddl index 30550007..1d8e34fe 100644 --- a/bddl/activity_definitions/make_a_military_care_package/problem0.bddl +++ b/bddl/activity_definitions/make_a_military_care_package/problem0.bddl @@ -4,14 +4,13 @@ (:objects carton.n.02_1 - carton.n.02 coffee_table.n.01_1 - coffee_table.n.01 - gift.n.01_1 - gift.n.01 - vodka__bottle.n.01_1 - vodka__bottle.n.01 - shampoo__bottle.n.01_1 - shampoo__bottle.n.01 - liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 + bottle__of__vodka.n.01_1 - bottle__of__vodka.n.01 + bottle__of__shampoo.n.01_1 - bottle__of__shampoo.n.01 + bottle__of__liquid_soap.n.01_1 - bottle__of__liquid_soap.n.01 flashlight.n.01_1 - flashlight.n.01 toothbrush.n.01_1 - toothbrush.n.01 - analgesic.n.01_1 - analgesic.n.01 - lotion__bottle.n.01_1 - lotion__bottle.n.01 + bottle__of__analgesics.n.01_1 - bottle__of__analgesics.n.01 + bottle__of__lotion.n.01_1 - bottle__of__lotion.n.01 cookie.n.01_1 - cookie.n.01 chocolate_box.n.01_1 - chocolate_box.n.01 floor.n.01_1 - floor.n.01 @@ -20,14 +19,13 @@ (:init (ontop carton.n.02_1 floor.n.01_1) - (ontop gift.n.01_1 coffee_table.n.01_1) - (ontop vodka__bottle.n.01_1 coffee_table.n.01_1) - (ontop shampoo__bottle.n.01_1 coffee_table.n.01_1) - (ontop liquid_soap__bottle.n.01_1 coffee_table.n.01_1) + (ontop bottle__of__vodka.n.01_1 coffee_table.n.01_1) + (ontop bottle__of__shampoo.n.01_1 coffee_table.n.01_1) + (ontop bottle__of__liquid_soap.n.01_1 coffee_table.n.01_1) (ontop flashlight.n.01_1 coffee_table.n.01_1) (ontop toothbrush.n.01_1 coffee_table.n.01_1) - (ontop analgesic.n.01_1 coffee_table.n.01_1) - (ontop lotion__bottle.n.01_1 coffee_table.n.01_1) + (ontop bottle__of__analgesics.n.01_1 coffee_table.n.01_1) + (ontop bottle__of__lotion.n.01_1 coffee_table.n.01_1) (ontop cookie.n.01_1 coffee_table.n.01_1) (ontop chocolate_box.n.01_1 coffee_table.n.01_1) (inroom coffee_table.n.01_1 living_room) @@ -37,14 +35,13 @@ (:goal (and - (inside ?gift.n.01_1 ?carton.n.02_1) - (inside ?vodka__bottle.n.01_1 ?carton.n.02_1) - (inside ?shampoo__bottle.n.01_1 ?carton.n.02_1) - (inside ?liquid_soap__bottle.n.01_1 ?carton.n.02_1) + (inside ?bottle__of__vodka.n.01_1 ?carton.n.02_1) + (inside ?bottle__of__shampoo.n.01_1 ?carton.n.02_1) + (inside ?bottle__of__liquid_soap.n.01_1 ?carton.n.02_1) (inside ?flashlight.n.01_1 ?carton.n.02_1) (inside ?toothbrush.n.01_1 ?carton.n.02_1) - (inside ?analgesic.n.01_1 ?carton.n.02_1) - (inside ?lotion__bottle.n.01_1 ?carton.n.02_1) + (inside ?bottle__of__analgesics.n.01_1 ?carton.n.02_1) + (inside ?bottle__of__lotion.n.01_1 ?carton.n.02_1) (inside ?cookie.n.01_1 ?carton.n.02_1) (inside ?chocolate_box.n.01_1 ?carton.n.02_1) ) diff --git a/bddl/activity_definitions/make_a_salad/problem0.bddl b/bddl/activity_definitions/make_a_salad/problem0.bddl index 665edecd..ae531125 100644 --- a/bddl/activity_definitions/make_a_salad/problem0.bddl +++ b/bddl/activity_definitions/make_a_salad/problem0.bddl @@ -19,7 +19,7 @@ vinegar__bottle.n.01_1 - vinegar__bottle.n.01 salt.n.02_1 - salt.n.02 salt__shaker.n.01_1 - salt__shaker.n.01 - crouton.n.01_1 crouton.n.01_2 crouton.n.01_3 crouton.n.01_4 crouton.n.01_5 crouton.n.01_6 - crouton.n.01 + crouton.n.01_1 - crouton.n.01 tupperware.n.01_1 - tupperware.n.01 chopping_board.n.01_1 - chopping_board.n.01 carving_knife.n.01_1 - carving_knife.n.01 @@ -39,12 +39,7 @@ (ontop vinegar__bottle.n.01_1 countertop.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 countertop.n.01_1) - (inside crouton.n.01_1 tupperware.n.01_1) - (inside crouton.n.01_2 tupperware.n.01_1) - (inside crouton.n.01_3 tupperware.n.01_1) - (inside crouton.n.01_4 tupperware.n.01_1) - (inside crouton.n.01_5 tupperware.n.01_1) - (inside crouton.n.01_6 tupperware.n.01_1) + (filled tupperware.n.01_1 crouton.n.01_1) (ontop tupperware.n.01_1 countertop.n.01_1) (future diced__lettuce.n.01_1) (future diced__spinach.n.01_1) @@ -71,10 +66,7 @@ (contains ?bowl.n.01_1 ?chickpea.n.03_1) (contains ?bowl.n.01_1 ?salt.n.02_1) (contains ?bowl.n.01_1 ?vinegar.n.01_1) - (forall - (?crouton.n.01 - crouton.n.01) - (inside ?crouton.n.01 ?bowl.n.01_1) - ) + (contains ?bowl.n.01_1 ?crouton.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/make_a_small_vegetable_garden/problem0.bddl b/bddl/activity_definitions/make_a_small_vegetable_garden/problem0.bddl index 26fa23ee..366cf940 100644 --- a/bddl/activity_definitions/make_a_small_vegetable_garden/problem0.bddl +++ b/bddl/activity_definitions/make_a_small_vegetable_garden/problem0.bddl @@ -84,7 +84,7 @@ (forall (?pot.n.04 - pot.n.04) (and - (filled ?pot.n.04 ?soil.n.02_1) + (contains ?pot.n.04 ?soil.n.02_1) (contains ?pot.n.04 ?fertilizer.n.01_1) ) ) diff --git a/bddl/activity_definitions/make_an_egg_tomato_and_toast_breakfast/problem0.bddl b/bddl/activity_definitions/make_an_egg_tomato_and_toast_breakfast/problem0.bddl index a2289f85..b5941605 100644 --- a/bddl/activity_definitions/make_an_egg_tomato_and_toast_breakfast/problem0.bddl +++ b/bddl/activity_definitions/make_an_egg_tomato_and_toast_breakfast/problem0.bddl @@ -3,9 +3,10 @@ (:objects plate.n.04_1 - plate.n.04 + bowl.n.01_1 - bowl.n.01 countertop.n.01_1 - countertop.n.01 toast.n.01_1 - toast.n.01 - egg.n.02_1 - egg.n.02 + raw_egg.n.01_1 - raw_egg.n.01 stove.n.01_1 - stove.n.01 avocado.n.01_1 - avocado.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 @@ -14,9 +15,10 @@ ) (:init - (ontop plate.n.04_1 countertop.n.01_1) - (ontop toast.n.01_1 plate.n.04_1) - (ontop egg.n.02_1 stove.n.01_1) + (ontop plate.n.04_1 countertop.n.01_1) + (ontop toast.n.01_1 plate.n.04_1) + (inside raw_egg.n.01_1 bowl.n.01_1) + (ontop bowl.n.01_1 countertop.n.01_1) (inside avocado.n.01_1 electric_refrigerator.n.01_1) (inroom electric_refrigerator.n.01_1 kitchen) (inroom countertop.n.01_1 kitchen) @@ -27,8 +29,9 @@ (:goal (and - (ontop ?toast.n.01_1 ?plate.n.04_1) - (ontop ?egg.n.02_1 ?toast.n.01_1) + (ontop ?toast.n.01_1 ?plate.n.04_1) + (cooked ?raw_egg.n.01_1) + (ontop ?raw_egg.n.01_1 ?toast.n.01_1) (ontop ?avocado.n.01_1 ?toast.n.01_1) ) ) diff --git a/bddl/activity_definitions/make_blueberry_mousse/problem0.bddl b/bddl/activity_definitions/make_blueberry_mousse/problem0.bddl index 27aba48b..69df61e3 100644 --- a/bddl/activity_definitions/make_blueberry_mousse/problem0.bddl +++ b/bddl/activity_definitions/make_blueberry_mousse/problem0.bddl @@ -4,7 +4,7 @@ (:objects lemon_juice.n.01_1 - lemon_juice.n.01 granulated_sugar.n.01_1 - granulated_sugar.n.01 - blueberry.n.02_1 blueberry.n.02_10 blueberry.n.02_2 blueberry.n.02_3 blueberry.n.02_4 blueberry.n.02_5 blueberry.n.02_6 blueberry.n.02_7 blueberry.n.02_8 blueberry.n.02_9 - blueberry.n.02 + blueberry.n.02_1 - blueberry.n.02 stove.n.01_1 - stove.n.01 saucepan.n.01_1 - saucepan.n.01 gelatin.n.02_1 - gelatin.n.02 @@ -33,16 +33,7 @@ (inside lemon_juice__bottle.n.01_1 electric_refrigerator.n.01_1) (filled sugar__sack.n.01_1 granulated_sugar.n.01_1) (ontop sugar__sack.n.01_1 countertop.n.01_1) - (inside blueberry.n.02_1 tupperware.n.01_1) - (inside blueberry.n.02_2 tupperware.n.01_1) - (inside blueberry.n.02_3 tupperware.n.01_1) - (inside blueberry.n.02_4 tupperware.n.01_1) - (inside blueberry.n.02_5 tupperware.n.01_1) - (inside blueberry.n.02_6 tupperware.n.01_1) - (inside blueberry.n.02_7 tupperware.n.01_1) - (inside blueberry.n.02_8 tupperware.n.01_1) - (inside blueberry.n.02_9 tupperware.n.01_1) - (inside blueberry.n.02_10 tupperware.n.01_1) + (filled tupperware.n.01_1 blueberry.n.02_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) (ontop saucepan.n.01_1 countertop.n.01_1) (inside gelatin.n.02_1 gelatin__box.n.01_1) diff --git a/bddl/activity_definitions/make_burrito_bowls/problem0.bddl b/bddl/activity_definitions/make_burrito_bowls/problem0.bddl index fa5ab417..f8272ebb 100644 --- a/bddl/activity_definitions/make_burrito_bowls/problem0.bddl +++ b/bddl/activity_definitions/make_burrito_bowls/problem0.bddl @@ -9,7 +9,6 @@ cooked__diced__bell_pepper.n.01_1 - cooked__diced__bell_pepper.n.01 diced__beefsteak_tomato.n.01_1 - diced__beefsteak_tomato.n.01 cooked__diced__beefsteak_tomato.n.01_1 - cooked__diced__beefsteak_tomato.n.01 - coriander.n.03_1 - coriander.n.03 refried_beans.n.01_1 - refried_beans.n.01 refried_beans__can.n.01_1 - refried_beans__can.n.01 grated_cheese.n.01_1 - grated_cheese.n.01 @@ -20,8 +19,8 @@ floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) - - (:init + + (:init (inside bowl.n.01_1 cabinet.n.01_1) (inside bowl.n.01_2 cabinet.n.01_1) (filled tupperware.n.01_1 cooked__white_rice.n.01_1) @@ -32,24 +31,23 @@ (inside tupperware.n.01_3 electric_refrigerator.n.01_1) (filled bowl.n.01_4 diced__beefsteak_tomato.n.01_1) (inside bowl.n.01_4 electric_refrigerator.n.01_1) - (filled bowl.n.01_3 coriander.n.03_1) (inside bowl.n.01_3 electric_refrigerator.n.01_1) (filled refried_beans__can.n.01_1 refried_beans.n.01_1) (inside refried_beans__can.n.01_1 cabinet.n.01_2) (filled grated_cheese__sack.n.01_1 grated_cheese.n.01_1) (inside grated_cheese__sack.n.01_1 electric_refrigerator.n.01_1) - (inroom microwave.n.02_1 kitchen) - (inroom cabinet.n.01_1 kitchen) - (inroom cabinet.n.01_2 kitchen) - (inroom electric_refrigerator.n.01_1 kitchen) - (inroom floor.n.01_1 kitchen) + (inroom microwave.n.02_1 kitchen) + (inroom cabinet.n.01_1 kitchen) + (inroom cabinet.n.01_2 kitchen) + (inroom electric_refrigerator.n.01_1 kitchen) + (inroom floor.n.01_1 kitchen) (future cooked__diced__beefsteak_tomato.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) - - (:goal - (and - (or + + (:goal + (and + (or (real ?diced__beefsteak_tomato.n.01_1) (real ?cooked__diced__beefsteak_tomato.n.01_1) ) @@ -65,7 +63,6 @@ (contains ?bowl.n.01 ?cooked__diced__beefsteak_tomato.n.01_1) ) (contains ?bowl.n.01 ?cooked__diced__bell_pepper.n.01_1) - (contains ?bowl.n.01 ?coriander.n.03_1) (contains ?bowl.n.01 ?grated_cheese.n.01_1) ) ) diff --git a/bddl/activity_definitions/make_chicken_fajitas/problem0.bddl b/bddl/activity_definitions/make_chicken_fajitas/problem0.bddl index 1baece27..e10fdb71 100644 --- a/bddl/activity_definitions/make_chicken_fajitas/problem0.bddl +++ b/bddl/activity_definitions/make_chicken_fajitas/problem0.bddl @@ -24,9 +24,9 @@ salt.n.02_1 - salt.n.02 cooked__salt.n.01_1 - cooked__salt.n.01 salt__shaker.n.01_1 - salt__shaker.n.01 - oregano.n.01_1 - oregano.n.01 - cooked__oregano.n.01_1 - cooked__oregano.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram.n.02_1 - marjoram.n.02 + cooked__marjoram.n.02_1 - cooked__marjoram.n.02 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 cumin.n.02_1 - cumin.n.02 cooked__cumin.n.01_1 - cooked__cumin.n.01 cumin__shaker.n.01_1 - cumin__shaker.n.01 @@ -63,8 +63,8 @@ (ontop pepper__shaker.n.01_1 countertop.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 countertop.n.01_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) - (inside oregano__shaker.n.01_1 cabinet.n.01_1) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) + (inside marjoram__shaker.n.01_1 cabinet.n.01_1) (insource cumin__shaker.n.01_1 cumin.n.02_1) (inside cumin__shaker.n.01_1 cabinet.n.01_1) (insource paprika__shaker.n.01_1 paprika.n.02_1) @@ -84,7 +84,7 @@ (future cooked__diced__vidalia_onion.n.01_1) (future cooked__black_pepper.n.01_1) (future cooked__salt.n.01_1) - (future cooked__oregano.n.01_1) + (future cooked__marjoram.n.02_1) (future cooked__cumin.n.01_1) (future cooked__paprika.n.01_1) (future cooked__salsa.n.01_1) @@ -105,7 +105,7 @@ (real ?cooked__diced__vidalia_onion.n.01_1) (real ?cooked__black_pepper.n.01_1) (real ?cooked__salt.n.01_1) - (real ?cooked__oregano.n.01_1) + (real ?cooked__marjoram.n.02_1) (real ?cooked__cumin.n.01_1) (real ?cooked__paprika.n.01_1) (real ?cooked__salsa.n.01_1) @@ -121,7 +121,7 @@ (contains ?frying_pan.n.01_1 ?cooked__diced__vidalia_onion.n.01_1) (contains ?frying_pan.n.01_1 ?cooked__black_pepper.n.01_1) (contains ?frying_pan.n.01_1 ?cooked__salt.n.01_1) - (contains ?frying_pan.n.01_1 ?cooked__oregano.n.01_1) + (contains ?frying_pan.n.01_1 ?cooked__marjoram.n.02_1) (contains ?frying_pan.n.01_1 ?cooked__cumin.n.01_1) (contains ?frying_pan.n.01_1 ?cooked__paprika.n.01_1) (contains ?frying_pan.n.01_1 ?cooked__salsa.n.01_1) diff --git a/bddl/activity_definitions/make_edible_chocolate_chip_cookie_dough/problem0.bddl b/bddl/activity_definitions/make_edible_chocolate_chip_cookie_dough/problem0.bddl index c37e7744..1d336a06 100644 --- a/bddl/activity_definitions/make_edible_chocolate_chip_cookie_dough/problem0.bddl +++ b/bddl/activity_definitions/make_edible_chocolate_chip_cookie_dough/problem0.bddl @@ -8,6 +8,8 @@ brown_sugar.n.01_1 - brown_sugar.n.01 salt.n.02_1 - salt.n.02 vanilla.n.02_1 - vanilla.n.02 + chocolate_kiss.n.01_1 - chocolate_kiss.n.01 + mason_jar.n.01_1 - mason_jar.n.01 edible_cookie_dough.n.01_1 - edible_cookie_dough.n.01 electric_mixer.n.01_1 - electric_mixer.n.01 mixing_bowl.n.01_1 - mixing_bowl.n.01 @@ -30,7 +32,9 @@ (:init (filled flour__sack.n.01_1 flour.n.01_1) - (ontop flour__sack.n.01_1 countertop.n.01_1) + (ontop flour__sack.n.01_1 countertop.n.01_1) + (filled mason_jar.n.01_1 chocolate_kiss.n.01_1) + (inside mason_jar.n.01_1 cabinet.n.01_1) (filled bowl.n.01_1 melted__butter.n.01_1) (inside bowl.n.01_1 electric_refrigerator.n.01_1) (filled sugar__sack.n.01_1 granulated_sugar.n.01_1) diff --git a/bddl/activity_definitions/make_fried_rice/problem0.bddl b/bddl/activity_definitions/make_fried_rice/problem0.bddl index 55b5645b..99a854e3 100644 --- a/bddl/activity_definitions/make_fried_rice/problem0.bddl +++ b/bddl/activity_definitions/make_fried_rice/problem0.bddl @@ -5,8 +5,6 @@ chili.n.02_1 - chili.n.02 diced__chili.n.01_1 - diced__chili.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - egg.n.02_1 - egg.n.02 - half__egg.n.01_1 half__egg.n.01_2 - half__egg.n.01 countertop.n.01_1 - countertop.n.01 salt.n.02_1 - salt.n.02 salt__shaker.n.01_1 - salt__shaker.n.01 @@ -32,10 +30,6 @@ (not (cooked chili.n.02_1) ) - (inside egg.n.02_1 electric_refrigerator.n.01_1) - (not - (cooked egg.n.02_1) - ) (insource salt__shaker.n.01_1 salt.n.02_1) (filled soy_sauce__bottle.n.01_1 soy_sauce.n.01_1) (inside chinese_anise.n.02_1 mason_jar.n.01_1) @@ -54,27 +48,14 @@ (inroom cabinet.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) (future diced__chili.n.01_1) - (future half__egg.n.01_1) - (future half__egg.n.01_2) (future cooked__white_rice.n.01_1) - (ontop agent.n.01_1 floor.n.01_1) ) (:goal - (and - (real ?half__egg.n.01_1) - (real ?half__egg.n.01_2) + (and (real ?diced__chili.n.01_1) (real ?cooked__white_rice.n.01_1) - (forall - (?half__egg.n.01 - half__egg.n.01) - (and - (inside ?half__egg.n.01 ?wok.n.01_1) - (covered ?half__egg.n.01 ?soy_sauce.n.01_1) - (cooked ?half__egg.n.01) - ) - ) (contains ?wok.n.01_1 ?salt.n.02_1) (filled ?wok.n.01_1 ?cooked__white_rice.n.01_1) (contains ?wok.n.01_1 ?sesame_oil.n.01_1) diff --git a/bddl/activity_definitions/make_granola/problem0.bddl b/bddl/activity_definitions/make_granola/problem0.bddl index 943f9751..7151c2a2 100644 --- a/bddl/activity_definitions/make_granola/problem0.bddl +++ b/bddl/activity_definitions/make_granola/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - oat.n.01_1 - oat.n.01 + oat.n.02_1 - oat.n.02 honey.n.01_1 - honey.n.01 cinnamon.n.03_1 - cinnamon.n.03 pecan.n.03_1 - pecan.n.03 @@ -22,7 +22,7 @@ ) (:init - (filled oat__box.n.01_1 oat.n.01_1) + (filled oat__box.n.01_1 oat.n.02_1) (inside oat__box.n.01_1 cabinet.n.01_1) (filled honey__jar.n.01_1 honey.n.01_1) (inside honey__jar.n.01_1 cabinet.n.01_1) diff --git a/bddl/activity_definitions/make_king_prawns_with_garlic/problem0.bddl b/bddl/activity_definitions/make_king_prawns_with_garlic/problem0.bddl index 8aee0f41..c1e66762 100644 --- a/bddl/activity_definitions/make_king_prawns_with_garlic/problem0.bddl +++ b/bddl/activity_definitions/make_king_prawns_with_garlic/problem0.bddl @@ -6,7 +6,7 @@ frying_pan.n.01_1 - frying_pan.n.01 olive_oil.n.01_1 - olive_oil.n.01 olive_oil__bottle.n.01_1 - olive_oil__bottle.n.01 - shrimp.n.03_1 shrimp.n.03_2 shrimp.n.03_3 shrimp.n.03_4 shrimp.n.03_5 shrimp.n.03_6 - shrimp.n.03 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 prawn.n.01_4 prawn.n.01_5 prawn.n.01_6 - prawn.n.01 clove.n.03_1 clove.n.03_2 clove.n.03_3 - clove.n.03 bowl.n.01_1 - bowl.n.01 cooked__diced__clove.n.01_1 - cooked__diced__clove.n.01 @@ -25,36 +25,36 @@ (ontop frying_pan.n.01_1 countertop.n.01_1) (filled olive_oil__bottle.n.01_1 olive_oil.n.01_1) (inside sack.n.01_1 electric_refrigerator.n.01_1) - (inside shrimp.n.03_1 sack.n.01_1) - (inside shrimp.n.03_2 sack.n.01_1) - (inside shrimp.n.03_3 sack.n.01_1) - (inside shrimp.n.03_4 sack.n.01_1) - (inside shrimp.n.03_5 sack.n.01_1) - (inside shrimp.n.03_6 sack.n.01_1) + (inside prawn.n.01_1 sack.n.01_1) + (inside prawn.n.01_2 sack.n.01_1) + (inside prawn.n.01_3 sack.n.01_1) + (inside prawn.n.01_4 sack.n.01_1) + (inside prawn.n.01_5 sack.n.01_1) + (inside prawn.n.01_6 sack.n.01_1) (not - (cooked shrimp.n.03_1) + (cooked prawn.n.01_1) ) (not - (cooked shrimp.n.03_2) + (cooked prawn.n.01_2) ) (not - (cooked shrimp.n.03_3) + (cooked prawn.n.01_3) ) (not - (cooked shrimp.n.03_4) + (cooked prawn.n.01_4) ) (not - (cooked shrimp.n.03_5) + (cooked prawn.n.01_5) ) (not - (cooked shrimp.n.03_6) + (cooked prawn.n.01_6) ) - (frozen shrimp.n.03_1) - (frozen shrimp.n.03_2) - (frozen shrimp.n.03_3) - (frozen shrimp.n.03_4) - (frozen shrimp.n.03_5) - (frozen shrimp.n.03_6) + (frozen prawn.n.01_1) + (frozen prawn.n.01_2) + (frozen prawn.n.01_3) + (frozen prawn.n.01_4) + (frozen prawn.n.01_5) + (frozen prawn.n.01_6) (ontop chopping_board.n.01_1 countertop.n.01_1) (ontop carving_knife.n.01_1 chopping_board.n.01_1) (inside clove.n.03_1 bowl.n.01_1) @@ -76,10 +76,10 @@ (and (real ?cooked__diced__clove.n.01_1) (forall - (?shrimp.n.03 - shrimp.n.03) + (?prawn.n.01 - prawn.n.01) (and - (cooked ?shrimp.n.03) - (inside ?shrimp.n.03 ?frying_pan.n.01_1) + (cooked ?prawn.n.01) + (inside ?prawn.n.01 ?frying_pan.n.01_1) ) ) (contains ?frying_pan.n.01_1 ?cooked__diced__clove.n.01_1) diff --git a/bddl/activity_definitions/make_macaroni_and_cheese/problem0.bddl b/bddl/activity_definitions/make_macaroni_and_cheese/problem0.bddl index cd5f2574..d2554579 100644 --- a/bddl/activity_definitions/make_macaroni_and_cheese/problem0.bddl +++ b/bddl/activity_definitions/make_macaroni_and_cheese/problem0.bddl @@ -14,7 +14,7 @@ macaroni_and_cheese.n.01_1 - macaroni_and_cheese.n.01 wooden_spoon.n.02_1 - wooden_spoon.n.02 oven.n.01_1 - oven.n.01 - casserole.n.01_1 - casserole.n.01 + casserole.n.02_1 - casserole.n.02 cream_cheese__box.n.01_1 - cream_cheese__box.n.01 bowl.n.01_1 bowl.n.01_2 bowl.n.01_3 - bowl.n.01 salt__shaker.n.01_1 - salt__shaker.n.01 @@ -51,7 +51,7 @@ (filled cup.n.01_1 breadcrumb.n.01_1) (ontop cup.n.01_1 countertop.n.01_2) (inroom oven.n.01_1 kitchen) - (ontop casserole.n.01_1 countertop.n.01_2) + (ontop casserole.n.02_1 countertop.n.01_2) (ontop stockpot.n.01_1 countertop.n.01_2) (insource sink.n.01_1 water.n.06_1) (future macaroni_and_cheese.n.01_1) @@ -69,7 +69,7 @@ (and (real ?macaroni_and_cheese.n.01_1) (cooked ?macaroni_and_cheese.n.01_1) - (inside ?macaroni_and_cheese.n.01_1 ?casserole.n.01_1) + (inside ?macaroni_and_cheese.n.01_1 ?casserole.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/make_oatmeal/problem0.bddl b/bddl/activity_definitions/make_oatmeal/problem0.bddl index ddddc1c1..dfb323bf 100644 --- a/bddl/activity_definitions/make_oatmeal/problem0.bddl +++ b/bddl/activity_definitions/make_oatmeal/problem0.bddl @@ -5,7 +5,7 @@ salt.n.02_1 - salt.n.02 cinnamon.n.03_1 - cinnamon.n.03 honey.n.01_1 - honey.n.01 - oat.n.01_1 - oat.n.01 + oat.n.02_1 - oat.n.02 low-fat_milk.n.01_1 - low-fat_milk.n.01 water.n.06_1 - water.n.06 oatmeal.n.01_1 - oatmeal.n.01 @@ -31,7 +31,7 @@ (inside cinnamon__shaker.n.01_1 cabinet.n.01_1) (filled honey__jar.n.01_1 honey.n.01_1) (ontop honey__jar.n.01_1 countertop.n.01_1) - (filled oat__box.n.01_1 oat.n.01_1) + (filled oat__box.n.01_1 oat.n.02_1) (inside oat__box.n.01_1 cabinet.n.01_1) (filled milk__carton.n.01_1 low-fat_milk.n.01_1) (inside milk__carton.n.01_1 electric_refrigerator.n.01_1) diff --git a/bddl/activity_definitions/make_pasta_sauce/problem0.bddl b/bddl/activity_definitions/make_pasta_sauce/problem0.bddl index 2f958728..0f8d1ef2 100644 --- a/bddl/activity_definitions/make_pasta_sauce/problem0.bddl +++ b/bddl/activity_definitions/make_pasta_sauce/problem0.bddl @@ -8,14 +8,14 @@ basil.n.03_1 basil.n.03_2 basil.n.03_3 basil.n.03_4 - basil.n.03 chopping_board.n.01_1 - chopping_board.n.01 carving_knife.n.01_1 - carving_knife.n.01 - oregano.n.01_1 - oregano.n.01 + marjoram.n.02_1 - marjoram.n.02 granulated_sugar.n.01_1 - granulated_sugar.n.01 salt.n.02_1 - salt.n.02 cooked__marinara.n.01_1 - cooked__marinara.n.01 oven.n.01_1 - oven.n.01 stockpot.n.01_1 - stockpot.n.01 mason_jar.n.01_1 - mason_jar.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 sugar__sack.n.01_1 - sugar__sack.n.01 salt__shaker.n.01_1 - salt__shaker.n.01 tupperware.n.01_1 - tupperware.n.01 @@ -46,8 +46,8 @@ (inside basil.n.03_3 mason_jar.n.01_1) (inside basil.n.03_4 mason_jar.n.01_1) (inside mason_jar.n.01_1 electric_refrigerator.n.01_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) - (inside oregano__shaker.n.01_1 cabinet.n.01_1) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) + (inside marjoram__shaker.n.01_1 cabinet.n.01_1) (filled sugar__sack.n.01_1 granulated_sugar.n.01_1) (inside sugar__sack.n.01_1 cabinet.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) diff --git a/bddl/activity_definitions/make_pizza/problem0.bddl b/bddl/activity_definitions/make_pizza/problem0.bddl index 53b73601..8ce360ec 100644 --- a/bddl/activity_definitions/make_pizza/problem0.bddl +++ b/bddl/activity_definitions/make_pizza/problem0.bddl @@ -6,7 +6,7 @@ tomato_sauce.n.01_1 - tomato_sauce.n.01 grated_cheese.n.01_1 - grated_cheese.n.01 pepperoni.n.01_1 pepperoni.n.01_2 pepperoni.n.01_3 pepperoni.n.01_4 pepperoni.n.01_5 pepperoni.n.01_6 pepperoni.n.01_7 - pepperoni.n.01 - oregano.n.01_1 - oregano.n.01 + marjoram.n.02_1 - marjoram.n.02 mushroom.n.05_1 mushroom.n.05_2 mushroom.n.05_3 mushroom.n.05_4 mushroom.n.05_5 - mushroom.n.05 vidalia_onion.n.01_1 - vidalia_onion.n.01 pizza.n.01_1 - pizza.n.01 @@ -16,7 +16,7 @@ carving_knife.n.01_1 - carving_knife.n.01 tupperware.n.01_1 tupperware.n.01_2 tupperware.n.01_3 - tupperware.n.01 tomato_sauce__jar.n.01_1 - tomato_sauce__jar.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 cabinet.n.01_1 - cabinet.n.01 sack.n.01_1 - sack.n.01 @@ -42,8 +42,8 @@ (inside tupperware.n.01_3 electric_refrigerator.n.01_1) (ontop chopping_board.n.01_1 countertop.n.01_1) (ontop carving_knife.n.01_1 countertop.n.01_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) - (ontop oregano__shaker.n.01_1 countertop.n.01_2) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) + (ontop marjoram__shaker.n.01_1 countertop.n.01_2) (inside mushroom.n.05_1 tupperware.n.01_2) (inside mushroom.n.05_2 tupperware.n.01_2) (inside mushroom.n.05_3 tupperware.n.01_2) diff --git a/bddl/activity_definitions/make_pizza_sauce/problem0.bddl b/bddl/activity_definitions/make_pizza_sauce/problem0.bddl index 91910114..0c14bb5d 100644 --- a/bddl/activity_definitions/make_pizza_sauce/problem0.bddl +++ b/bddl/activity_definitions/make_pizza_sauce/problem0.bddl @@ -4,7 +4,7 @@ (:objects beefsteak_tomato.n.01_1 - beefsteak_tomato.n.01 tomato_paste.n.01_1 - tomato_paste.n.01 - oregano.n.01_1 - oregano.n.01 + marjoram.n.02_1 - marjoram.n.02 clove.n.03_1 clove.n.03_2 - clove.n.03 salt.n.02_1 - salt.n.02 basil.n.03_1 - basil.n.03 @@ -12,7 +12,7 @@ stove.n.01_1 - stove.n.01 bowl.n.01_1 - bowl.n.01 tomato_paste__can.n.01_1 - tomato_paste__can.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 salt__shaker.n.01_1 - salt__shaker.n.01 cabinet.n.01_1 - cabinet.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 @@ -26,8 +26,8 @@ (filled tomato_paste__can.n.01_1 tomato_paste.n.01_1) (inside tomato_paste__can.n.01_1 cabinet.n.01_1) (inside beefsteak_tomato.n.01_1 electric_refrigerator.n.01_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) - (inside oregano__shaker.n.01_1 cabinet.n.01_1) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) + (inside marjoram__shaker.n.01_1 cabinet.n.01_1) (ontop clove.n.03_1 countertop.n.01_1) (ontop clove.n.03_2 countertop.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) diff --git a/bddl/activity_definitions/make_red_beans_and_rice/problem0.bddl b/bddl/activity_definitions/make_red_beans_and_rice/problem0.bddl index af18be22..8ab6aa4a 100644 --- a/bddl/activity_definitions/make_red_beans_and_rice/problem0.bddl +++ b/bddl/activity_definitions/make_red_beans_and_rice/problem0.bddl @@ -10,8 +10,8 @@ cooked__diced__beefsteak_tomato.n.01_1 - cooked__diced__beefsteak_tomato.n.01 salt.n.02_1 - salt.n.02 cooked__salt.n.01_1 - cooked__salt.n.01 - oregano.n.01_1 - oregano.n.01 - cooked__oregano.n.01_1 - cooked__oregano.n.01 + marjoram.n.02_1 - marjoram.n.02 + cooked__marjoram.n.02_1 - cooked__marjoram.n.02 black_pepper.n.02_1 - black_pepper.n.02 cooked__black_pepper.n.01_1 - cooked__black_pepper.n.01 pepper__shaker.n.01_1 - pepper__shaker.n.01 @@ -28,7 +28,7 @@ stockpot.n.01_1 - stockpot.n.01 mason_jar.n.01_1 - mason_jar.n.01 salt__shaker.n.01_1 - salt__shaker.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 white_rice__sack.n.01_1 - white_rice__sack.n.01 chopping_board.n.01_1 chopping_board.n.01_2 - chopping_board.n.01 carving_knife.n.01_1 - carving_knife.n.01 @@ -49,13 +49,10 @@ (ontop beefsteak_tomato.n.01_1 countertop.n.01_1) (insource salt__shaker.n.01_1 salt.n.02_1) (ontop salt__shaker.n.01_1 countertop.n.01_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) - (ontop oregano__shaker.n.01_1 countertop.n.01_1) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) + (ontop marjoram__shaker.n.01_1 countertop.n.01_1) (insource pepper__shaker.n.01_1 black_pepper.n.02_1) (ontop pepper__shaker.n.01_1 countertop.n.01_1) - (not - (cooked white_rice.n.01_1) - ) (filled white_rice__sack.n.01_1 white_rice.n.01_1) (ontop white_rice__sack.n.01_1 countertop.n.01_2) (ontop turkey.n.04_1 chopping_board.n.01_2) @@ -78,7 +75,7 @@ (future cooked__diced__bell_pepper.n.01_1) (future cooked__diced__clove.n.01_1) (future cooked__salt.n.01_1) - (future cooked__oregano.n.01_1) + (future cooked__marjoram.n.02_1) (future cooked__black_pepper.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) @@ -97,8 +94,8 @@ (real ?salt.n.02_1) ) (or - (real ?cooked__oregano.n.01_1) - (real ?oregano.n.01_1) + (real ?cooked__marjoram.n.02_1) + (real ?marjoram.n.02_1) ) (or (real ?cooked__black_pepper.n.01_1) @@ -116,8 +113,8 @@ (contains ?stockpot.n.01_1 ?cooked__salt.n.01_1) ) (or - (contains ?stockpot.n.01_1 ?oregano.n.01_1) - (contains ?stockpot.n.01_1 ?cooked__oregano.n.01_1) + (contains ?stockpot.n.01_1 ?marjoram.n.02_1) + (contains ?stockpot.n.01_1 ?cooked__marjoram.n.02_1) ) (or (contains ?stockpot.n.01_1 ?black_pepper.n.02_1) diff --git a/bddl/activity_definitions/make_seafood_stew/problem0.bddl b/bddl/activity_definitions/make_seafood_stew/problem0.bddl index 1ed82a62..c36f0cb7 100644 --- a/bddl/activity_definitions/make_seafood_stew/problem0.bddl +++ b/bddl/activity_definitions/make_seafood_stew/problem0.bddl @@ -8,17 +8,17 @@ beefsteak_tomato.n.01_1 - beefsteak_tomato.n.01 tomato_sauce.n.01_1 - tomato_sauce.n.01 chicken_broth.n.01_1 - chicken_broth.n.01 - clam.n.01_1 clam.n.01_2 clam.n.01_3 clam.n.01_4 clam.n.01_5 clam.n.01_6 - clam.n.01 - shrimp.n.03_1 shrimp.n.03_2 shrimp.n.03_3 shrimp.n.03_4 shrimp.n.03_5 - shrimp.n.03 + clam.n.03_1 clam.n.03_2 clam.n.03_3 clam.n.03_4 clam.n.03_5 clam.n.03_6 - clam.n.03 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 prawn.n.01_4 prawn.n.01_5 - prawn.n.01 scallop.n.02_1 scallop.n.02_2 scallop.n.02_3 scallop.n.02_4 - scallop.n.02 - oregano.n.01_1 - oregano.n.01 + marjoram.n.02_1 - marjoram.n.02 parsley.n.02_1 - parsley.n.02 fish_stew.n.01_1 - fish_stew.n.01 stove.n.01_1 - stove.n.01 stockpot.n.01_1 - stockpot.n.01 tomato_sauce__jar.n.01_1 - tomato_sauce__jar.n.01 tupperware.n.01_1 tupperware.n.01_2 tupperware.n.01_3 - tupperware.n.01 - oregano__shaker.n.01_1 - oregano__shaker.n.01 + marjoram__shaker.n.01_1 - marjoram__shaker.n.01 mason_jar.n.01_1 - mason_jar.n.01 chopping_board.n.01_1 - chopping_board.n.01 carving_knife.n.01_1 - carving_knife.n.01 @@ -48,49 +48,49 @@ (filled cup.n.01_1 chicken_broth.n.01_1) (inside cup.n.01_1 electric_refrigerator.n.01_1) (not - (cooked clam.n.01_1) + (cooked clam.n.03_1) ) - (inside clam.n.01_1 tupperware.n.01_1) + (inside clam.n.03_1 tupperware.n.01_1) (not - (cooked clam.n.01_2) + (cooked clam.n.03_2) ) - (inside clam.n.01_2 tupperware.n.01_1) + (inside clam.n.03_2 tupperware.n.01_1) (not - (cooked clam.n.01_3) + (cooked clam.n.03_3) ) - (inside clam.n.01_3 tupperware.n.01_1) + (inside clam.n.03_3 tupperware.n.01_1) (not - (cooked clam.n.01_4) + (cooked clam.n.03_4) ) - (inside clam.n.01_4 tupperware.n.01_1) + (inside clam.n.03_4 tupperware.n.01_1) (not - (cooked clam.n.01_5) + (cooked clam.n.03_5) ) - (inside clam.n.01_5 tupperware.n.01_1) + (inside clam.n.03_5 tupperware.n.01_1) (not - (cooked clam.n.01_6) + (cooked clam.n.03_6) ) - (inside clam.n.01_6 tupperware.n.01_1) + (inside clam.n.03_6 tupperware.n.01_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) - (inside shrimp.n.03_1 tupperware.n.01_2) + (inside prawn.n.01_1 tupperware.n.01_2) (not - (cooked shrimp.n.03_1) + (cooked prawn.n.01_1) ) - (inside shrimp.n.03_2 tupperware.n.01_2) + (inside prawn.n.01_2 tupperware.n.01_2) (not - (cooked shrimp.n.03_2) + (cooked prawn.n.01_2) ) - (inside shrimp.n.03_3 tupperware.n.01_2) + (inside prawn.n.01_3 tupperware.n.01_2) (not - (cooked shrimp.n.03_3) + (cooked prawn.n.01_3) ) - (inside shrimp.n.03_4 tupperware.n.01_2) + (inside prawn.n.01_4 tupperware.n.01_2) (not - (cooked shrimp.n.03_4) + (cooked prawn.n.01_4) ) - (inside shrimp.n.03_5 tupperware.n.01_2) + (inside prawn.n.01_5 tupperware.n.01_2) (not - (cooked shrimp.n.03_5) + (cooked prawn.n.01_5) ) (inside tupperware.n.01_2 electric_refrigerator.n.01_1) (not @@ -110,8 +110,8 @@ ) (inside scallop.n.02_4 tupperware.n.01_3) (inside tupperware.n.01_3 electric_refrigerator.n.01_1) - (insource oregano__shaker.n.01_1 oregano.n.01_1) - (inside oregano__shaker.n.01_1 cabinet.n.01_1) + (insource marjoram__shaker.n.01_1 marjoram.n.02_1) + (inside marjoram__shaker.n.01_1 cabinet.n.01_1) (inside parsley.n.02_1 mason_jar.n.01_1) (inside mason_jar.n.01_1 electric_refrigerator.n.01_1) (inroom stove.n.01_1 kitchen) diff --git a/bddl/activity_definitions/make_stew/problem0.bddl b/bddl/activity_definitions/make_stew/problem0.bddl index b7310485..3a005d79 100644 --- a/bddl/activity_definitions/make_stew/problem0.bddl +++ b/bddl/activity_definitions/make_stew/problem0.bddl @@ -4,7 +4,7 @@ (:objects carrot.n.03_1 carrot.n.03_2 carrot.n.03_3 - carrot.n.03 vidalia_onion.n.01_1 vidalia_onion.n.01_2 - vidalia_onion.n.01 - pea.n.01_1 pea.n.01_10 pea.n.01_11 pea.n.01_12 pea.n.01_13 pea.n.01_14 pea.n.01_2 pea.n.01_3 pea.n.01_4 pea.n.01_5 pea.n.01_6 pea.n.01_7 pea.n.01_8 pea.n.01_9 - pea.n.01 + pea.n.01_1 - pea.n.01 ground_beef.n.01_1 - ground_beef.n.01 beef_broth.n.01_1 - beef_broth.n.01 beef_stew.n.01_1 - beef_stew.n.01 @@ -29,20 +29,7 @@ (inside vidalia_onion.n.01_1 wicker_basket.n.01_1) (inside vidalia_onion.n.01_2 wicker_basket.n.01_1) (ontop wicker_basket.n.01_1 countertop.n.01_1) - (inside pea.n.01_1 tupperware.n.01_2) - (inside pea.n.01_2 tupperware.n.01_2) - (inside pea.n.01_3 tupperware.n.01_2) - (inside pea.n.01_4 tupperware.n.01_2) - (inside pea.n.01_5 tupperware.n.01_2) - (inside pea.n.01_6 tupperware.n.01_2) - (inside pea.n.01_7 tupperware.n.01_2) - (inside pea.n.01_8 tupperware.n.01_2) - (inside pea.n.01_9 tupperware.n.01_2) - (inside pea.n.01_10 tupperware.n.01_2) - (inside pea.n.01_11 tupperware.n.01_2) - (inside pea.n.01_12 tupperware.n.01_2) - (inside pea.n.01_13 tupperware.n.01_2) - (inside pea.n.01_14 tupperware.n.01_2) + (filled tupperware.n.01_2 pea.n.01_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) (filled tupperware.n.01_1 ground_beef.n.01_1) (inside tupperware.n.01_2 electric_refrigerator.n.01_1) diff --git a/bddl/activity_definitions/make_the_ultimate_spa_basket/problem0.bddl b/bddl/activity_definitions/make_the_ultimate_spa_basket/problem0.bddl index 6917f903..4f8bb6d9 100644 --- a/bddl/activity_definitions/make_the_ultimate_spa_basket/problem0.bddl +++ b/bddl/activity_definitions/make_the_ultimate_spa_basket/problem0.bddl @@ -7,7 +7,6 @@ lotion__bottle.n.01_1 - lotion__bottle.n.01 perfume__bottle.n.01_1 - perfume__bottle.n.01 essential_oil__bottle.n.01_1 - essential_oil__bottle.n.01 - wax__jar.n.01_1 - wax__jar.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) @@ -17,8 +16,7 @@ (ontop lotion__bottle.n.01_1 console_table.n.01_1) (ontop perfume__bottle.n.01_1 console_table.n.01_1) (ontop essential_oil__bottle.n.01_1 console_table.n.01_1) - (ontop wax__jar.n.01_1 console_table.n.01_1) - (inroom console_table.n.01_1 spa) + (inroom console_table.n.01_1 spa) (inroom floor.n.01_1 spa) (ontop agent.n.01_1 floor.n.01_1) ) @@ -26,8 +24,7 @@ (:goal (and (inside ?essential_oil__bottle.n.01_1 ?wicker_basket.n.01_1) - (inside ?wax__jar.n.01_1 ?wicker_basket.n.01_1) - (inside ?lotion__bottle.n.01_1 ?wicker_basket.n.01_1) + (inside ?lotion__bottle.n.01_1 ?wicker_basket.n.01_1) (inside ?perfume__bottle.n.01_1 ?wicker_basket.n.01_1) ) ) diff --git a/bddl/activity_definitions/making_coffee/problem0.bddl b/bddl/activity_definitions/making_coffee/problem0.bddl index 64e63fc0..84440ad3 100644 --- a/bddl/activity_definitions/making_coffee/problem0.bddl +++ b/bddl/activity_definitions/making_coffee/problem0.bddl @@ -30,7 +30,7 @@ (:goal (and (real ?drip_coffee.n.01_1) - (filled ?mug.n.04_1 ?drip_coffee.n.01_1) + (contains ?mug.n.04_1 ?drip_coffee.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/melt_white_chocolate/problem0.bddl b/bddl/activity_definitions/melt_white_chocolate/problem0.bddl index 6a255b43..6e266f8a 100644 --- a/bddl/activity_definitions/melt_white_chocolate/problem0.bddl +++ b/bddl/activity_definitions/melt_white_chocolate/problem0.bddl @@ -16,9 +16,9 @@ (not (toggled_on stove.n.01_1) ) - (ontop saucepot.n.01_1 stove.n.01_1) - (filled saucepot.n.01_1 white_chocolate.n.01_1) - (ontop bowl.n.01_1 countertop.n.01_1) + (ontop saucepot.n.01_1 stove.n.01_1) + (ontop white_chocolate.n.01_1 countertop.n.01_1) + (ontop bowl.n.01_1 countertop.n.01_1) (inroom countertop.n.01_1 kitchen) (inroom stove.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) @@ -28,7 +28,7 @@ (:goal (and - (contains ?bowl.n.01_1 ?white_chocolate.n.01_1) + (contains ?bowl.n.01_1 ?melted__white_chocolate.n.01_1) (real ?melted__white_chocolate.n.01_1) ) ) diff --git a/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl b/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl index f83869d5..6850275a 100644 --- a/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl +++ b/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl @@ -13,7 +13,7 @@ ) (:init - (ontop marker.n.03_1 chair.n.01_1) + (ontop marker.n.03_1 chair.n.01_1) (ontop document.n.01_1 table.n.02_1) (inside document.n.01_2 cabinet.n.01_1) (ontop document.n.01_3 table.n.02_1) @@ -22,7 +22,7 @@ (ontop folder.n.02_2 floor.n.01_1) (inroom cabinet.n.01_1 private_office) (inroom table.n.02_1 private_office) - (inroom chair.n.01_1 private_office) + (inroom chair.n.01_1 private_office) (inroom floor.n.01_1 private_office) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl b/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl index 04199c13..aa902988 100644 --- a/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl +++ b/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl @@ -6,10 +6,10 @@ floor.n.01_1 - floor.n.01 toothbrush.n.01_1 - toothbrush.n.01 bed.n.01_1 - bed.n.01 - shampoo.n.01_1 - shampoo.n.01 + bottle__of__shampoo.n.01_1 - bottle__of__shampoo.n.01 hardback.n.01_1 - hardback.n.01 underwear.n.01_1 underwear.n.01_2 - underwear.n.01 - toothpaste.n.01_1 - toothpaste.n.01 + tube__of__toothpaste.n.01_1 - tube__of__toothpaste.n.01 door.n.01_1 - door.n.01 window.n.01_1 - window.n.01 agent.n.01_1 - agent.n.01 @@ -18,11 +18,11 @@ (:init (ontop backpack.n.01_1 floor.n.01_1) (ontop toothbrush.n.01_1 bed.n.01_1) - (ontop shampoo.n.01_1 bed.n.01_1) + (ontop bottle__of__shampoo.n.01_1 bed.n.01_1) (ontop hardback.n.01_1 bed.n.01_1) (ontop underwear.n.01_1 bed.n.01_1) (ontop underwear.n.01_2 bed.n.01_1) - (ontop toothpaste.n.01_1 bed.n.01_1) + (ontop tube__of__toothpaste.n.01_1 bed.n.01_1) (inroom bed.n.01_1 bedroom) (inroom floor.n.01_1 bedroom) (inroom door.n.01_1 bedroom) @@ -37,9 +37,9 @@ (inside ?underwear.n.01 ?backpack.n.01_1) ) (inside ?toothbrush.n.01_1 ?backpack.n.01_1) - (inside ?shampoo.n.01_1 ?backpack.n.01_1) + (inside ?bottle__of__shampoo.n.01_1 ?backpack.n.01_1) (inside ?hardback.n.01_1 ?backpack.n.01_1) - (inside ?toothpaste.n.01_1 ?backpack.n.01_1) + (inside ?tube__of__toothpaste.n.01_1 ?backpack.n.01_1) (or (ontop ?backpack.n.01_1 ?bed.n.01_1) (ontop ?backpack.n.01_1 ?floor.n.01_1) diff --git a/bddl/activity_definitions/packing_cleaning_suppies_into_car/problem0.bddl b/bddl/activity_definitions/packing_cleaning_suppies_into_car/problem0.bddl index d3a1b1ea..c46b6f47 100644 --- a/bddl/activity_definitions/packing_cleaning_suppies_into_car/problem0.bddl +++ b/bddl/activity_definitions/packing_cleaning_suppies_into_car/problem0.bddl @@ -4,7 +4,7 @@ (:objects car.n.01_1 - car.n.01 driveway.n.01_1 - driveway.n.01 - mask.n.02_1 - mask.n.02 + face_mask.n.01_1 - face_mask.n.01 backpack.n.01_1 - backpack.n.01 rag.n.01_1 - rag.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 @@ -14,7 +14,7 @@ (:init (ontop car.n.01_1 driveway.n.01_1) - (ontop mask.n.02_1 backpack.n.01_1) + (ontop face_mask.n.01_1 backpack.n.01_1) (ontop rag.n.01_1 floor.n.01_1) (ontop backpack.n.01_1 driveway.n.01_1) (ontop scrub_brush.n.01_1 rag.n.01_1) @@ -26,7 +26,7 @@ (:goal (and (ontop ?car.n.01_1 ?driveway.n.01_1) - (inside ?mask.n.02_1 ?backpack.n.01_1) + (inside ?face_mask.n.01_1 ?backpack.n.01_1) (inside ?rag.n.01_1 ?backpack.n.01_1) (inside ?backpack.n.01_1 ?car.n.01_1) (inside ?scrub_brush.n.01_1 ?car.n.01_1) diff --git a/bddl/activity_definitions/packing_fishing_gear_into_car/problem0.bddl b/bddl/activity_definitions/packing_fishing_gear_into_car/problem0.bddl index 7895f8e6..bb9f4d7f 100644 --- a/bddl/activity_definitions/packing_fishing_gear_into_car/problem0.bddl +++ b/bddl/activity_definitions/packing_fishing_gear_into_car/problem0.bddl @@ -15,8 +15,8 @@ (:init (ontop car.n.01_1 driveway.n.01_1) - (inside fishing_rod.n.01_1 boat.n.01_1) - (ontop boat.n.01_1 driveway.n.01_1) + (inside fishing_rod.n.01_1 boat.n.01_1) + (ontop boat.n.01_1 driveway.n.01_1) (inside bait.n.01_1 tupperware.n.01_1) (inside bait.n.01_2 tupperware.n.01_1) (inside bait.n.01_3 tupperware.n.01_1) diff --git a/bddl/activity_definitions/packing_moving_van/problem0.bddl b/bddl/activity_definitions/packing_moving_van/problem0.bddl index f9658335..3f41c614 100644 --- a/bddl/activity_definitions/packing_moving_van/problem0.bddl +++ b/bddl/activity_definitions/packing_moving_van/problem0.bddl @@ -19,8 +19,8 @@ (ontop carton.n.02_2 floor.n.01_1) (ontop carton.n.02_3 floor.n.01_1) (inroom floor.n.01_1 garden) - (inroom chair.n.01_1 garden) - (inroom chair.n.01_2 garden) + (inroom chair.n.01_1 garden) + (inroom chair.n.01_2 garden) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/picking_up_prescriptions/problem0.bddl b/bddl/activity_definitions/picking_up_prescriptions/problem0.bddl index aaf8a72e..6518ee21 100644 --- a/bddl/activity_definitions/picking_up_prescriptions/problem0.bddl +++ b/bddl/activity_definitions/picking_up_prescriptions/problem0.bddl @@ -4,7 +4,7 @@ (:objects floor.n.01_1 - floor.n.01 pill_bottle.n.01_1 pill_bottle.n.01_2 - pill_bottle.n.01 - antihistamine.n.01_1 antihistamine.n.01_2 - antihistamine.n.01 + bottle__of__antihistamines.n.01_1 bottle__of__antihistamines.n.01_2 - bottle__of__antihistamines.n.01 shelf.n.01_1 shelf.n.01_2 - shelf.n.01 plastic_bag.n.01_1 - plastic_bag.n.01 desk.n.01_1 - desk.n.01 @@ -13,32 +13,32 @@ writing_paper.n.01_1 - writing_paper.n.01 agent.n.01_1 - agent.n.01 ) - - (:init - (inside pill_bottle.n.01_1 shelf.n.01_1) - (inside pill_bottle.n.01_2 shelf.n.01_1) - (inside antihistamine.n.01_1 shelf.n.01_2) - (inside antihistamine.n.01_2 shelf.n.01_2) - (ontop plastic_bag.n.01_1 desk.n.01_1) - (ontop printer.n.03_1 desk.n.01_1) - (ontop desktop_computer.n.01_1 desk.n.01_1) - (ontop writing_paper.n.01_1 printer.n.03_1) - (inroom floor.n.01_1 grocery_store) - (inroom shelf.n.01_1 grocery_store) - (inroom shelf.n.01_2 grocery_store) - (inroom desk.n.01_1 grocery_store) + + (:init + (inside pill_bottle.n.01_1 shelf.n.01_1) + (inside pill_bottle.n.01_2 shelf.n.01_1) + (inside bottle__of__antihistamines.n.01_1 shelf.n.01_2) + (inside bottle__of__antihistamines.n.01_2 shelf.n.01_2) + (ontop plastic_bag.n.01_1 desk.n.01_1) + (ontop printer.n.03_1 desk.n.01_1) + (ontop desktop_computer.n.01_1 desk.n.01_1) + (ontop writing_paper.n.01_1 printer.n.03_1) + (inroom floor.n.01_1 grocery_store) + (inroom shelf.n.01_1 grocery_store) + (inroom shelf.n.01_2 grocery_store) + (inroom desk.n.01_1 grocery_store) (ontop agent.n.01_1 floor.n.01_1) ) - - (:goal - (and + + (:goal + (and (forall (?pill_bottle.n.01 - pill_bottle.n.01) (inside ?pill_bottle.n.01 ?plastic_bag.n.01_1) ) (forall - (?antihistamine.n.01 - antihistamine.n.01) - (inside ?antihistamine.n.01 ?plastic_bag.n.01_1) + (?bottle__of__antihistamines.n.01 - bottle__of__antihistamines.n.01) + (inside ?bottle__of__antihistamines.n.01 ?plastic_bag.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/picking_up_trash/problem0.bddl b/bddl/activity_definitions/picking_up_trash/problem0.bddl index 4dda582e..525deb27 100644 --- a/bddl/activity_definitions/picking_up_trash/problem0.bddl +++ b/bddl/activity_definitions/picking_up_trash/problem0.bddl @@ -4,7 +4,7 @@ (:objects ashcan.n.01_1 - ashcan.n.01 pad.n.01_1 pad.n.01_2 pad.n.01_3 - pad.n.01 - 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 floor.n.01_1 floor.n.01_2 - floor.n.01 agent.n.01_1 - agent.n.01 ) @@ -14,8 +14,8 @@ (ontop pad.n.01_1 floor.n.01_2) (ontop pad.n.01_2 floor.n.01_2) (ontop pad.n.01_3 floor.n.01_1) - (ontop pop.n.02_1 floor.n.01_1) - (ontop pop.n.02_2 floor.n.01_1) + (ontop can__of__soda.n.01_1 floor.n.01_1) + (ontop can__of__soda.n.01_2 floor.n.01_1) (inroom floor.n.01_2 kitchen) (inroom floor.n.01_1 living_room) (ontop agent.n.01_1 floor.n.01_2) @@ -28,8 +28,8 @@ (inside ?pad.n.01 ?ashcan.n.01_1) ) (forall - (?pop.n.02 - pop.n.02) - (inside ?pop.n.02 ?ashcan.n.01_1) + (?can__of__soda.n.01 - can__of__soda.n.01) + (inside ?can__of__soda.n.01 ?ashcan.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/picking_vegetables_in_garden/problem0.bddl b/bddl/activity_definitions/picking_vegetables_in_garden/problem0.bddl index e97aac3f..0ba83990 100644 --- a/bddl/activity_definitions/picking_vegetables_in_garden/problem0.bddl +++ b/bddl/activity_definitions/picking_vegetables_in_garden/problem0.bddl @@ -6,7 +6,7 @@ lawn.n.01_1 - lawn.n.01 artichoke.n.02_1 - artichoke.n.02 chard.n.02_1 - chard.n.02 - beetroot.n.01_1 - beetroot.n.01 + beet.n.02_1 - beet.n.02 wicker_basket.n.01_1 wicker_basket.n.01_2 - wicker_basket.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 @@ -16,7 +16,7 @@ (ontop rail_fence.n.01_1 lawn.n.01_1) (ontop artichoke.n.02_1 lawn.n.01_1) (ontop chard.n.02_1 lawn.n.01_1) - (ontop beetroot.n.01_1 lawn.n.01_1) + (ontop beet.n.02_1 lawn.n.01_1) (ontop wicker_basket.n.01_1 lawn.n.01_1) (ontop wicker_basket.n.01_2 lawn.n.01_1) (inroom lawn.n.01_1 garden) @@ -36,7 +36,7 @@ ) (exists (?wicker_basket.n.01 - wicker_basket.n.01) - (inside ?beetroot.n.01_1 ?wicker_basket.n.01) + (inside ?beet.n.02_1 ?wicker_basket.n.01) ) ) ) diff --git a/bddl/activity_definitions/planting_vegetables/problem0.bddl b/bddl/activity_definitions/planting_vegetables/problem0.bddl index 78c061cb..f55e886e 100644 --- a/bddl/activity_definitions/planting_vegetables/problem0.bddl +++ b/bddl/activity_definitions/planting_vegetables/problem0.bddl @@ -24,7 +24,7 @@ (:goal (and (contains ?pot.n.04_1 ?pumpkin_seed.n.01_1) - (filled ?pot.n.04_1 ?soil.n.02_1) + (contains ?pot.n.04_1 ?soil.n.02_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/polish_copper/problem0.bddl b/bddl/activity_definitions/polish_copper/problem0.bddl index 6dfe5064..be104a34 100644 --- a/bddl/activity_definitions/polish_copper/problem0.bddl +++ b/bddl/activity_definitions/polish_copper/problem0.bddl @@ -4,7 +4,7 @@ (:objects polish.n.03_1 - polish.n.03 polish__bottle.n.01_1 - polish__bottle.n.01 - copper.n.01_1 - copper.n.01 + copper_pot.n.01_1 - copper_pot.n.01 rag.n.01_1 - rag.n.01 cabinet.n.01_1 - cabinet.n.01 clothes_dryer.n.01_1 - clothes_dryer.n.01 @@ -14,7 +14,7 @@ (:init (inside rag.n.01_1 cabinet.n.01_1) - (ontop copper.n.01_1 clothes_dryer.n.01_1) + (ontop copper_pot.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) (inroom cabinet.n.01_1 utility_room) @@ -25,7 +25,7 @@ (:goal (and - (covered ?copper.n.01_1 ?polish.n.03_1) + (covered ?copper_pot.n.01_1 ?polish.n.03_1) ) ) ) diff --git a/bddl/activity_definitions/polish_pewter/problem0.bddl b/bddl/activity_definitions/polish_pewter/problem0.bddl index c722ec06..ea3b9767 100644 --- a/bddl/activity_definitions/polish_pewter/problem0.bddl +++ b/bddl/activity_definitions/polish_pewter/problem0.bddl @@ -3,7 +3,7 @@ (:objects dust.n.01_1 - dust.n.01 - pewter.n.01_1 - pewter.n.01 + pewter_teapot.n.01_1 - pewter_teapot.n.01 countertop.n.01_1 - countertop.n.01 bowl.n.01_1 - bowl.n.01 water.n.06_1 - water.n.06 @@ -18,8 +18,8 @@ ) (:init - (covered pewter.n.01_1 dust.n.01_1) - (ontop pewter.n.01_1 countertop.n.01_1) + (covered pewter_teapot.n.01_1 dust.n.01_1) + (ontop pewter_teapot.n.01_1 countertop.n.01_1) (filled polish__bottle.n.01_1 polish.n.03_1) (ontop polish__bottle.n.01_1 countertop.n.01_1) (ontop bowl.n.01_1 countertop.n.01_1) @@ -37,9 +37,9 @@ (:goal (and (not - (covered ?pewter.n.01_1 ?dust.n.01_1) + (covered ?pewter_teapot.n.01_1 ?dust.n.01_1) ) - (covered ?pewter.n.01_1 ?polish.n.03_1) + (covered ?pewter_teapot.n.01_1 ?polish.n.03_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/prepare_a_boat_for_fishing/problem0.bddl b/bddl/activity_definitions/prepare_a_boat_for_fishing/problem0.bddl index 64b7dbc0..e8c4f2e4 100644 --- a/bddl/activity_definitions/prepare_a_boat_for_fishing/problem0.bddl +++ b/bddl/activity_definitions/prepare_a_boat_for_fishing/problem0.bddl @@ -18,8 +18,8 @@ ) (:init - (covered boat.n.01_1 stain.n.01_1) - (ontop boat.n.01_1 driveway.n.01_1) + (covered boat.n.01_1 stain.n.01_1) + (ontop boat.n.01_1 driveway.n.01_1) (ontop fishing_gear.n.01_1 driveway.n.01_1) (ontop fishing_rod.n.01_1 driveway.n.01_1) (ontop bucket.n.01_1 driveway.n.01_1) @@ -38,8 +38,8 @@ (not (covered ?boat.n.01_1 ?stain.n.01_1) ) - (inside ?fishing_gear.n.01_1 ?boat.n.01_1) - (inside ?fishing_rod.n.01_1 ?boat.n.01_1) + (inside ?fishing_gear.n.01_1 ?boat.n.01_1) + (inside ?fishing_rod.n.01_1 ?boat.n.01_1) ) ) ) \ No newline at end of file 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 85e8422a..8881cf21 100644 --- a/bddl/activity_definitions/prepare_a_raised_bed_garden/problem0.bddl +++ b/bddl/activity_definitions/prepare_a_raised_bed_garden/problem0.bddl @@ -12,34 +12,27 @@ ) (:init - (ontop pot.n.04_1 floor.n.01_1) - (inside marigold.n.01_1 pot.n.04_1) - (inside marigold.n.01_2 pot.n.04_3) - (inside marigold.n.01_3 pot.n.04_3) - (filled pot.n.04_1 soil.n.02_1) - (filled pot.n.04_2 soil.n.02_1) - (filled pot.n.04_3 soil.n.02_1) (ontop pot.n.04_1 floor.n.01_1) (ontop pot.n.04_2 floor.n.01_1) + (filled pot.n.04_2 soil.n.02_1) (ontop pot.n.04_3 floor.n.01_1) - (ontop trowel.n.01_1 floor.n.01_1) - (filled sack.n.01_1 soil.n.02_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) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and - (filled ?pot.n.04_1 ?soil.n.02_1) - (forall + (forall (?marigold.n.01 - marigold.n.01) (and - (or - (inside ?marigold.n.01 ?pot.n.04_1) - (ontop ?marigold.n.01 ?pot.n.04_1) - ) - (touching ?marigold.n.01 ?soil.n.02_1) + (inside ?marigold.n.01 ?pot.n.04_1) + (covered ?marigold.n.01 ?soil.n.02_1) ) ) ) diff --git a/bddl/activity_definitions/prepare_and_cook_prawns/problem0.bddl b/bddl/activity_definitions/prepare_and_cook_prawns/problem0.bddl index 78173fff..a98695b6 100644 --- a/bddl/activity_definitions/prepare_and_cook_prawns/problem0.bddl +++ b/bddl/activity_definitions/prepare_and_cook_prawns/problem0.bddl @@ -3,7 +3,7 @@ (:objects stove.n.01_1 - stove.n.01 - shrimp.n.03_1 shrimp.n.03_2 shrimp.n.03_3 shrimp.n.03_4 shrimp.n.03_5 shrimp.n.03_6 - shrimp.n.03 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 prawn.n.01_4 prawn.n.01_5 prawn.n.01_6 - prawn.n.01 frying_pan.n.01_1 - frying_pan.n.01 butter.n.01_1 - butter.n.01 clove.n.03_1 clove.n.03_2 clove.n.03_3 - clove.n.03 @@ -22,35 +22,35 @@ (not (toggled_on stove.n.01_1) ) - (inside shrimp.n.03_1 electric_refrigerator.n.01_1) - (inside shrimp.n.03_2 electric_refrigerator.n.01_1) - (inside shrimp.n.03_3 electric_refrigerator.n.01_1) - (inside shrimp.n.03_4 electric_refrigerator.n.01_1) - (inside shrimp.n.03_5 electric_refrigerator.n.01_1) - (inside shrimp.n.03_6 electric_refrigerator.n.01_1) - (frozen shrimp.n.03_1) - (frozen shrimp.n.03_2) - (frozen shrimp.n.03_3) - (frozen shrimp.n.03_4) - (frozen shrimp.n.03_5) - (frozen shrimp.n.03_6) + (inside prawn.n.01_1 electric_refrigerator.n.01_1) + (inside prawn.n.01_2 electric_refrigerator.n.01_1) + (inside prawn.n.01_3 electric_refrigerator.n.01_1) + (inside prawn.n.01_4 electric_refrigerator.n.01_1) + (inside prawn.n.01_5 electric_refrigerator.n.01_1) + (inside prawn.n.01_6 electric_refrigerator.n.01_1) + (frozen prawn.n.01_1) + (frozen prawn.n.01_2) + (frozen prawn.n.01_3) + (frozen prawn.n.01_4) + (frozen prawn.n.01_5) + (frozen prawn.n.01_6) (not - (cooked shrimp.n.03_1) + (cooked prawn.n.01_1) ) (not - (cooked shrimp.n.03_2) + (cooked prawn.n.01_2) ) (not - (cooked shrimp.n.03_3) + (cooked prawn.n.01_3) ) (not - (cooked shrimp.n.03_4) + (cooked prawn.n.01_4) ) (not - (cooked shrimp.n.03_5) + (cooked prawn.n.01_5) ) (not - (cooked shrimp.n.03_6) + (cooked prawn.n.01_6) ) (inside butter.n.01_1 electric_refrigerator.n.01_1) (inside clove.n.03_1 electric_refrigerator.n.01_1) @@ -72,11 +72,11 @@ (:goal (and (forall - (?shrimp.n.03 - shrimp.n.03) + (?prawn.n.01 - prawn.n.01) (and - (cooked ?shrimp.n.03) - (ontop ?shrimp.n.03 ?plate.n.04_1) - (covered ?shrimp.n.03 ?salt.n.02_1) + (cooked ?prawn.n.01) + (ontop ?prawn.n.01 ?plate.n.04_1) + (covered ?prawn.n.01 ?salt.n.02_1) ) ) (forall diff --git a/bddl/activity_definitions/preparing_clothes_for_the_next_day/problem0.bddl b/bddl/activity_definitions/preparing_clothes_for_the_next_day/problem0.bddl index 118f751f..c9af3cca 100644 --- a/bddl/activity_definitions/preparing_clothes_for_the_next_day/problem0.bddl +++ b/bddl/activity_definitions/preparing_clothes_for_the_next_day/problem0.bddl @@ -16,8 +16,8 @@ (:init (inside jersey.n.03_1 wardrobe.n.01_1) - (inside coat.n.01_1 wardrobe.n.01_1) - (inside coat.n.01_2 wardrobe.n.01_1) + (inside coat.n.01_1 wardrobe.n.01_1) + (inside coat.n.01_2 wardrobe.n.01_1) (inside boot.n.01_1 cedar_chest.n.01_1) (inside boot.n.01_2 cedar_chest.n.01_1) (inside jean.n.01_1 cedar_chest.n.01_2) @@ -33,7 +33,7 @@ (:goal (and - (ontop ?coat.n.01_1 ?bed.n.01_1) + (ontop ?coat.n.01_1 ?bed.n.01_1) (ontop ?jersey.n.03_1 ?bed.n.01_1) (forall (?boot.n.01 - boot.n.01) diff --git a/bddl/activity_definitions/preparing_food_for_adult/problem0.bddl b/bddl/activity_definitions/preparing_food_for_adult/problem0.bddl index cbdbff22..e985c126 100644 --- a/bddl/activity_definitions/preparing_food_for_adult/problem0.bddl +++ b/bddl/activity_definitions/preparing_food_for_adult/problem0.bddl @@ -4,8 +4,7 @@ (:objects whiskey.n.01_1 - whiskey.n.01 whiskey__bottle.n.01_1 - whiskey__bottle.n.01 - egg.n.02_1 egg.n.02_2 - egg.n.02 - fried_egg.n.01_1 fried_egg.n.01_2 - fried_egg.n.01 + raw_egg.n.01_1 raw_egg.n.01_2 - raw_egg.n.01 bowl.n.01_1 bowl.n.01_2 - bowl.n.01 steak.n.01_1 - steak.n.01 diced__potato.n.01_1 - diced__potato.n.01 @@ -23,13 +22,13 @@ (:init (filled whiskey__bottle.n.01_1 whiskey.n.01_1) (inside whiskey__bottle.n.01_1 cabinet.n.01_1) - (inside egg.n.02_1 bowl.n.01_1) - (inside egg.n.02_2 bowl.n.01_1) + (inside raw_egg.n.01_1 bowl.n.01_1) + (inside raw_egg.n.01_2 bowl.n.01_1) (not - (cooked egg.n.02_1) + (cooked raw_egg.n.01_1) ) (not - (cooked egg.n.02_2) + (cooked raw_egg.n.01_2) ) (inside bowl.n.01_1 electric_refrigerator.n.01_1) (inside steak.n.01_1 bowl.n.01_2) @@ -43,8 +42,6 @@ (inside bowl.n.01_2 electric_refrigerator.n.01_1) (inside plate.n.04_1 cabinet.n.01_1) (inside frying_pan.n.01_1 cabinet.n.01_1) - (future fried_egg.n.01_1) - (future fried_egg.n.01_2) (future cooked__diced__potato.n.01_1) (inroom electric_refrigerator.n.01_1 kitchen) (inroom cabinet.n.01_1 kitchen) @@ -56,20 +53,13 @@ (:goal (and - (real ?fried_egg.n.01_1) - (real ?fried_egg.n.01_2) (real ?cooked__diced__potato.n.01_1) (cooked ?steak.n.01_1) (forall - (?fried_egg.n.01 - fried_egg.n.01) + (?raw_egg.n.01 - raw_egg.n.01) (and - (cooked ?fried_egg.n.01) - (or - (ontop ?fried_egg.n.01 ?plate.n.04_1) - (ontop ?fried_egg.n.01 ?steak.n.01_1) - (ontop ?fried_egg.n.01 ?fried_egg.n.01_1) - (ontop ?fried_egg.n.01 ?fried_egg.n.01_2) - ) + (cooked ?raw_egg.n.01) + (ontop ?raw_egg.n.01 ?plate.n.04_1) ) ) (ontop ?steak.n.01_1 ?plate.n.04_1) diff --git a/bddl/activity_definitions/put_together_a_goodie_bag/problem0.bddl b/bddl/activity_definitions/put_together_a_goodie_bag/problem0.bddl index f7e5e8ea..a39d33b3 100644 --- a/bddl/activity_definitions/put_together_a_goodie_bag/problem0.bddl +++ b/bddl/activity_definitions/put_together_a_goodie_bag/problem0.bddl @@ -7,7 +7,8 @@ candy.n.01_1 candy.n.01_2 - candy.n.01 countertop.n.01_1 - countertop.n.01 postcard.n.01_1 postcard.n.01_2 - postcard.n.01 - chocolate_kiss.n.01_1 chocolate_kiss.n.01_2 - chocolate_kiss.n.01 + chocolate_kiss.n.01_1 - chocolate_kiss.n.01 + mason_jar.n.01_1 - mason_jar.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 ribbon.n.01_1 ribbon.n.01_2 - ribbon.n.01 oven.n.01_1 - oven.n.01 @@ -22,8 +23,8 @@ (ontop candy.n.01_2 countertop.n.01_1) (ontop postcard.n.01_1 countertop.n.01_1) (ontop postcard.n.01_2 countertop.n.01_1) - (inside chocolate_kiss.n.01_1 electric_refrigerator.n.01_1) - (inside chocolate_kiss.n.01_2 electric_refrigerator.n.01_1) + (filled mason_jar.n.01_1 chocolate_kiss.n.01_1) + (inside mason_jar.n.01_1 cabinet.n.01_1) (ontop ribbon.n.01_1 oven.n.01_1) (ontop ribbon.n.01_2 oven.n.01_1) (inroom cabinet.n.01_1 kitchen) @@ -41,10 +42,9 @@ (?sack.n.01 - sack.n.01) (ontop ?sack.n.01 ?countertop.n.01_1) ) - (forpairs - (?sack.n.01 - sack.n.01) - (?chocolate_kiss.n.01 - chocolate_kiss.n.01) - (inside ?chocolate_kiss.n.01 ?sack.n.01) + (forall + (?sack.n.01 - sack.n.01) + (contains ?sack.n.01 ?chocolate_kiss.n.01_1) ) (forpairs (?sack.n.01 - sack.n.01) diff --git a/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl b/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl index fec58410..dfecfe49 100644 --- a/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl +++ b/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl @@ -4,21 +4,21 @@ (:objects sack.n.01_1 - sack.n.01 floor.n.01_1 - floor.n.01 - detergent__bottle.n.01_1 - detergent__bottle.n.01 - liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 + bottle__of__detergent.n.01_1 - bottle__of__detergent.n.01 + bottle__of__liquid_soap.n.01_1 - bottle__of__liquid_soap.n.01 glove.n.02_1 glove.n.02_2 - glove.n.02 - bleaching_agent__bottle.n.01_1 - bleaching_agent__bottle.n.01 + bottle__of__bleach_agent.n.01_1 - bottle__of__bleach_agent.n.01 cabinet.n.01_1 - cabinet.n.01 agent.n.01_1 - agent.n.01 ) (:init (ontop sack.n.01_1 floor.n.01_1) - (ontop detergent__bottle.n.01_1 floor.n.01_1) - (ontop liquid_soap__bottle.n.01_1 floor.n.01_1) + (ontop bottle__of__detergent.n.01_1 floor.n.01_1) + (ontop bottle__of__liquid_soap.n.01_1 floor.n.01_1) (inside glove.n.02_1 sack.n.01_1) (inside glove.n.02_2 sack.n.01_1) - (ontop bleaching_agent__bottle.n.01_1 floor.n.01_1) + (ontop bottle__of__bleach_agent.n.01_1 floor.n.01_1) (inroom floor.n.01_1 utility_room) (inroom cabinet.n.01_1 utility_room) (ontop agent.n.01_1 floor.n.01_1) @@ -26,13 +26,13 @@ (:goal (and - (inside ?detergent__bottle.n.01_1 ?cabinet.n.01_1) - (inside ?liquid_soap__bottle.n.01_1 ?cabinet.n.01_1) + (inside ?bottle__of__detergent.n.01_1 ?cabinet.n.01_1) + (inside ?bottle__of__liquid_soap.n.01_1 ?cabinet.n.01_1) (forall (?glove.n.02 - glove.n.02) (inside ?glove.n.02 ?cabinet.n.01_1) ) - (inside ?bleaching_agent__bottle.n.01_1 ?cabinet.n.01_1) + (inside ?bottle__of__bleach_agent.n.01_1 ?cabinet.n.01_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/putting_clothes_in_storage/problem0.bddl b/bddl/activity_definitions/putting_clothes_in_storage/problem0.bddl index e306935e..767f973a 100644 --- a/bddl/activity_definitions/putting_clothes_in_storage/problem0.bddl +++ b/bddl/activity_definitions/putting_clothes_in_storage/problem0.bddl @@ -15,8 +15,8 @@ (ontop carton.n.02_1 floor.n.01_1) (ontop carton.n.02_2 floor.n.01_1) (ontop carton.n.02_3 floor.n.01_1) - (ontop coat.n.01_1 floor.n.01_1) - (ontop coat.n.01_2 floor.n.01_1) + (ontop coat.n.01_1 floor.n.01_1) + (ontop coat.n.01_2 floor.n.01_1) (ontop trouser.n.01_1 floor.n.01_1) (ontop trouser.n.01_2 floor.n.01_1) (ontop jersey.n.03_1 floor.n.01_1) diff --git a/bddl/activity_definitions/rearranging_furniture/problem0.bddl b/bddl/activity_definitions/rearranging_furniture/problem0.bddl index 4f32b2cc..003bb935 100644 --- a/bddl/activity_definitions/rearranging_furniture/problem0.bddl +++ b/bddl/activity_definitions/rearranging_furniture/problem0.bddl @@ -14,8 +14,8 @@ (:init (ontop lamp.n.02_1 floor.n.01_1) (ontop lamp.n.02_2 floor.n.01_1) - (ontop chair.n.01_1 floor.n.01_1) - (ontop chair.n.01_2 bed.n.01_1) + (ontop chair.n.01_1 floor.n.01_1) + (ontop chair.n.01_2 bed.n.01_1) (inroom window.n.01_1 bedroom) (inroom bed.n.01_1 bedroom) (inroom floor.n.01_1 bedroom) @@ -27,7 +27,7 @@ (and (nextto ?lamp.n.02_1 ?door.n.01_1) (nextto ?lamp.n.02_2 ?window.n.01_1) - (touching ?chair.n.01_1 ?bed.n.01_1) + (touching ?chair.n.01_1 ?bed.n.01_1) (nextto ?chair.n.01_2 ?window.n.01_1) ) ) diff --git a/bddl/activity_definitions/recycling_newspapers/problem0.bddl b/bddl/activity_definitions/recycling_newspapers/problem0.bddl index 71bcabeb..9c1c39d3 100644 --- a/bddl/activity_definitions/recycling_newspapers/problem0.bddl +++ b/bddl/activity_definitions/recycling_newspapers/problem0.bddl @@ -13,7 +13,7 @@ (ontop recycling_bin.n.01_1 floor.n.01_1) (inside newspaper.n.03_1 recycling_bin.n.01_1) (inside newspaper.n.03_2 recycling_bin.n.01_1) - (ontop newspaper.n.03_3 swivel_chair.n.01_1) + (ontop newspaper.n.03_3 swivel_chair.n.01_1) (inroom floor.n.01_1 private_office) (inroom recycling_bin.n.01_1 private_office) (inroom swivel_chair.n.01_1 private_office) 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 index 30dd0d6c..d73da1c2 100644 --- a/bddl/activity_definitions/serving_food_at_a_homeless_shelter/problem0.bddl +++ b/bddl/activity_definitions/serving_food_at_a_homeless_shelter/problem0.bddl @@ -32,7 +32,7 @@ (filled casserole.n.02_2 cooked__white_rice.n.01_1) (filled casserole.n.02_3 chicken_broth.n.01_1) (filled casserole.n.02_4 mashed_potato.n.02_1) - (filled gravy_boat.n.01_1 gravy.n.01_1) + (filled gravy_boat.n.01_1 gravy.n.01_1) (filled tupperware.n.01_1 cooked__diced__virginia_ham.n.01_1) (filled casserole.n.02_6 beef_stew.n.01_1) (ontop casserole.n.02_1 breakfast_table.n.01_1) @@ -41,7 +41,7 @@ (ontop casserole.n.02_4 breakfast_table.n.01_1) (ontop casserole.n.02_5 breakfast_table.n.01_1) (ontop casserole.n.02_6 breakfast_table.n.01_1) - (ontop gravy_boat.n.01_1 breakfast_table.n.01_1) + (ontop gravy_boat.n.01_1 breakfast_table.n.01_1) (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) diff --git a/bddl/activity_definitions/set_up_a_guinea_pig_cage/problem0.bddl b/bddl/activity_definitions/set_up_a_guinea_pig_cage/problem0.bddl index ffb0cad6..fe68e218 100644 --- a/bddl/activity_definitions/set_up_a_guinea_pig_cage/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_guinea_pig_cage/problem0.bddl @@ -3,9 +3,10 @@ (:objects hutch.n.01_1 - hutch.n.01 + gunnysack.n.01_1 - gunnysack.n.01 floor.n.01_1 - floor.n.01 - pellet.n.01_1 - pellet.n.01 - pellet__bag.n.01_1 - pellet__bag.n.01 + pellet_food.n.01_1 - pellet_food.n.01 + pellet_food__bag.n.01_1 - pellet_food__bag.n.01 bowl.n.01_1 - bowl.n.01 water_bottle.n.01_1 - water_bottle.n.01 coffee_table.n.01_1 - coffee_table.n.01 @@ -15,11 +16,12 @@ (:init (ontop hutch.n.01_1 floor.n.01_1) - (filled pellet__bag.n.01_1 pellet.n.01_1) - (ontop pellet__bag.n.01_1 floor.n.01_1) + (filled pellet_food__bag.n.01_1 pellet_food.n.01_1) + (ontop pellet_food__bag.n.01_1 floor.n.01_1) (ontop water_bottle.n.01_1 coffee_table.n.01_1) (ontop bowl.n.01_1 coffee_table.n.01_1) - (ontop hay.n.01_1 coffee_table.n.01_1) + (filled gunnysack.n.01_1 hay.n.01_1) + (ontop gunnysack.n.01_1 floor.n.01_1) (inroom coffee_table.n.01_1 living_room) (inroom floor.n.01_1 living_room) (ontop agent.n.01_1 floor.n.01_1) @@ -28,10 +30,10 @@ (:goal (and (ontop ?hutch.n.01_1 ?coffee_table.n.01_1) - (filled ?bowl.n.01_1 ?pellet.n.01_1) + (filled ?bowl.n.01_1 ?pellet_food.n.01_1) (inside ?bowl.n.01_1 ?hutch.n.01_1) (inside ?water_bottle.n.01_1 ?hutch.n.01_1) - (inside ?hay.n.01_1 ?hutch.n.01_1) + (contains ?hutch.n.01_1 ?hay.n.01_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/set_up_a_home_office_in_your_garage/problem0.bddl b/bddl/activity_definitions/set_up_a_home_office_in_your_garage/problem0.bddl index 36643664..ba81ca9f 100644 --- a/bddl/activity_definitions/set_up_a_home_office_in_your_garage/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_home_office_in_your_garage/problem0.bddl @@ -19,7 +19,7 @@ (inside router.n.02_1 carton.n.02_1) (ontop carton.n.02_1 floor.n.01_1) (inroom floor.n.01_1 corridor) - (inroom swivel_chair.n.01_1 garage) + (inroom swivel_chair.n.01_1 garage) (inroom wall.n.01_1 garage) (inroom desk.n.01_1 garage) (ontop agent.n.01_1 floor.n.01_1) diff --git a/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl b/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl index 99f15c22..48070fcf 100644 --- a/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl @@ -60,16 +60,16 @@ (inroom desk.n.01_10 classroom) (inroom wall_clock.n.01_1 classroom) (inroom map.n.01_1 classroom) - (inroom straight_chair.n.01_1 classroom) - (inroom straight_chair.n.01_2 classroom) - (inroom straight_chair.n.01_3 classroom) - (inroom straight_chair.n.01_4 classroom) - (inroom straight_chair.n.01_5 classroom) - (inroom straight_chair.n.01_6 classroom) - (inroom straight_chair.n.01_7 classroom) - (inroom straight_chair.n.01_8 classroom) - (inroom straight_chair.n.01_9 classroom) - (inroom straight_chair.n.01_10 classroom) + (inroom straight_chair.n.01_1 classroom) + (inroom straight_chair.n.01_2 classroom) + (inroom straight_chair.n.01_3 classroom) + (inroom straight_chair.n.01_4 classroom) + (inroom straight_chair.n.01_5 classroom) + (inroom straight_chair.n.01_6 classroom) + (inroom straight_chair.n.01_7 classroom) + (inroom straight_chair.n.01_8 classroom) + (inroom straight_chair.n.01_9 classroom) + (inroom straight_chair.n.01_10 classroom) (inroom floor.n.01_1 classroom) (inroom wall.n.01_1 classroom) (ontop agent.n.01_1 floor.n.01_1) diff --git a/bddl/activity_definitions/setting_up_for_an_event/problem0.bddl b/bddl/activity_definitions/setting_up_for_an_event/problem0.bddl index 6b8182c6..33f5a842 100644 --- a/bddl/activity_definitions/setting_up_for_an_event/problem0.bddl +++ b/bddl/activity_definitions/setting_up_for_an_event/problem0.bddl @@ -5,7 +5,7 @@ hamburger.n.01_1 hamburger.n.01_2 hamburger.n.01_3 hamburger.n.01_4 - hamburger.n.01 floor.n.01_1 - floor.n.01 beer_bottle.n.01_1 beer_bottle.n.01_2 beer_bottle.n.01_3 beer_bottle.n.01_4 - beer_bottle.n.01 - gift.n.01_1 gift.n.01_2 gift.n.01_3 gift.n.01_4 - gift.n.01 + gift__box.n.01_1 gift__box.n.01_2 gift__box.n.01_3 gift__box.n.01_4 - gift__box.n.01 tablecloth.n.01_1 - tablecloth.n.01 coffee_table.n.01_1 - coffee_table.n.01 agent.n.01_1 - agent.n.01 @@ -20,10 +20,10 @@ (ontop beer_bottle.n.01_2 coffee_table.n.01_1) (ontop beer_bottle.n.01_3 coffee_table.n.01_1) (ontop beer_bottle.n.01_4 coffee_table.n.01_1) - (ontop gift.n.01_1 floor.n.01_1) - (ontop gift.n.01_2 floor.n.01_1) - (ontop gift.n.01_3 floor.n.01_1) - (ontop gift.n.01_4 floor.n.01_1) + (ontop gift__box.n.01_1 floor.n.01_1) + (ontop gift__box.n.01_2 floor.n.01_1) + (ontop gift__box.n.01_3 floor.n.01_1) + (ontop gift__box.n.01_4 floor.n.01_1) (ontop tablecloth.n.01_1 floor.n.01_1) (inroom coffee_table.n.01_1 garden) (inroom floor.n.01_1 garden) @@ -39,22 +39,22 @@ (nextto ?hamburger.n.01 ?beer_bottle.n.01) ) (forpairs - (?gift.n.01 - gift.n.01) + (?gift__box.n.01 - gift__box.n.01) (?beer_bottle.n.01 - beer_bottle.n.01) - (nextto ?gift.n.01 ?beer_bottle.n.01) + (nextto ?gift__box.n.01 ?beer_bottle.n.01) ) (forpairs (?hamburger.n.01 - hamburger.n.01) - (?gift.n.01 - gift.n.01) - (nextto ?hamburger.n.01 ?gift.n.01) + (?gift__box.n.01 - gift__box.n.01) + (nextto ?hamburger.n.01 ?gift__box.n.01) ) (forall (?hamburger.n.01 - hamburger.n.01) (ontop ?hamburger.n.01 ?tablecloth.n.01_1) ) (forall - (?gift.n.01 - gift.n.01) - (ontop ?gift.n.01 ?tablecloth.n.01_1) + (?gift__box.n.01 - gift__box.n.01) + (ontop ?gift__box.n.01 ?tablecloth.n.01_1) ) (forall (?beer_bottle.n.01 - beer_bottle.n.01) diff --git a/bddl/activity_definitions/setting_up_garden_furniture/problem0.bddl b/bddl/activity_definitions/setting_up_garden_furniture/problem0.bddl index cef4af4f..41c8a927 100644 --- a/bddl/activity_definitions/setting_up_garden_furniture/problem0.bddl +++ b/bddl/activity_definitions/setting_up_garden_furniture/problem0.bddl @@ -16,11 +16,11 @@ (:init (ontop pitcher.n.02_1 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 lawn_chair.n.01_3 floor.n.01_1) - (ontop teacup.n.02_1 lawn_chair.n.01_3) - (ontop teacup.n.02_2 lawn_chair.n.01_3) + (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_3 floor.n.01_1) + (ontop teacup.n.02_1 lawn_chair.n.01_3) + (ontop teacup.n.02_2 lawn_chair.n.01_3) (ontop table.n.02_1 floor.n.01_1) (inroom floor.n.01_1 garden) (inroom lawn.n.01_1 garden) diff --git a/bddl/activity_definitions/setting_up_room_for_a_movie/problem0.bddl b/bddl/activity_definitions/setting_up_room_for_a_movie/problem0.bddl index fc4b68ca..39ee1f70 100644 --- a/bddl/activity_definitions/setting_up_room_for_a_movie/problem0.bddl +++ b/bddl/activity_definitions/setting_up_room_for_a_movie/problem0.bddl @@ -5,7 +5,7 @@ popcorn.n.02_1 - popcorn.n.02 sack.n.01_1 - sack.n.01 bowl.n.01_1 - bowl.n.01 - coca_cola.n.01_1 coca_cola.n.01_2 coca_cola.n.01_3 - coca_cola.n.01 + can__of__soda.n.01_1 can__of__soda.n.01_2 can__of__soda.n.01_3 - can__of__soda.n.01 shelf.n.01_1 - shelf.n.01 throw.n.04_1 - throw.n.04 table.n.02_1 - table.n.02 @@ -14,28 +14,28 @@ sofa.n.01_1 - sofa.n.01 agent.n.01_1 - agent.n.01 ) - - (:init - (filled sack.n.01_1 popcorn.n.02_1) + + (:init + (filled sack.n.01_1 popcorn.n.02_1) (inside sack.n.01_1 shelf.n.01_1) - (ontop coca_cola.n.01_1 shelf.n.01_1) - (ontop coca_cola.n.01_2 shelf.n.01_1) - (ontop coca_cola.n.01_3 shelf.n.01_1) - (ontop throw.n.04_1 table.n.02_1) - (ontop bowl.n.01_1 table.n.02_1) - (inroom floor.n.01_1 living_room) - (inroom table.n.02_1 living_room) - (inroom television_receiver.n.01_1 living_room) - (inroom shelf.n.01_1 living_room) - (inroom sofa.n.01_1 living_room) + (ontop can__of__soda.n.01_1 shelf.n.01_1) + (ontop can__of__soda.n.01_2 shelf.n.01_1) + (ontop can__of__soda.n.01_3 shelf.n.01_1) + (ontop throw.n.04_1 table.n.02_1) + (ontop bowl.n.01_1 table.n.02_1) + (inroom floor.n.01_1 living_room) + (inroom table.n.02_1 living_room) + (inroom television_receiver.n.01_1 living_room) + (inroom shelf.n.01_1 living_room) + (inroom sofa.n.01_1 living_room) (ontop agent.n.01_1 floor.n.01_1) ) - - (:goal - (and - (forall - (?coca_cola.n.01 - coca_cola.n.01) - (ontop ?coca_cola.n.01 ?table.n.02_1) + + (:goal + (and + (forall + (?can__of__soda.n.01 - can__of__soda.n.01) + (ontop ?can__of__soda.n.01 ?table.n.02_1) ) (ontop ?throw.n.04_1 ?sofa.n.01_1) (filled ?bowl.n.01_1 ?popcorn.n.02_1) diff --git a/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl b/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl index 793eab99..ad083c92 100644 --- a/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl +++ b/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl @@ -28,11 +28,11 @@ (ontop card.n.04_4 table.n.02_1) (ontop card.n.04_5 table.n.02_1) (inroom table.n.02_1 shared_office) - (inroom swivel_chair.n.01_1 shared_office) - (inroom swivel_chair.n.01_2 shared_office) - (inroom swivel_chair.n.01_3 shared_office) - (inroom swivel_chair.n.01_4 shared_office) - (inroom swivel_chair.n.01_5 shared_office) + (inroom swivel_chair.n.01_1 shared_office) + (inroom swivel_chair.n.01_2 shared_office) + (inroom swivel_chair.n.01_3 shared_office) + (inroom swivel_chair.n.01_4 shared_office) + (inroom swivel_chair.n.01_5 shared_office) (inroom floor.n.01_1 shared_office) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/slicing_vegetables/problem0.bddl b/bddl/activity_definitions/slicing_vegetables/problem0.bddl index 20a59853..aa80c837 100644 --- a/bddl/activity_definitions/slicing_vegetables/problem0.bddl +++ b/bddl/activity_definitions/slicing_vegetables/problem0.bddl @@ -5,8 +5,8 @@ bell_pepper.n.02_1 bell_pepper.n.02_2 - bell_pepper.n.02 diced__bell_pepper.n.01_1 - diced__bell_pepper.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - beetroot.n.01_1 beetroot.n.01_2 - beetroot.n.01 - diced__beetroot.n.01_1 - diced__beetroot.n.01 + beet.n.02_1 beet.n.02_2 - beet.n.02 + diced__beet.n.01_1 - diced__beet.n.01 chopping_board.n.01_1 - chopping_board.n.01 zucchini.n.02_1 - zucchini.n.02 diced__zucchini.n.01_1 - diced__zucchini.n.01 @@ -19,15 +19,15 @@ (:init (inside bell_pepper.n.02_1 electric_refrigerator.n.01_1) (inside bell_pepper.n.02_2 electric_refrigerator.n.01_1) - (inside beetroot.n.01_1 electric_refrigerator.n.01_1) - (inside beetroot.n.01_2 electric_refrigerator.n.01_1) + (inside beet.n.02_1 electric_refrigerator.n.01_1) + (inside beet.n.02_2 electric_refrigerator.n.01_1) (inside zucchini.n.02_1 electric_refrigerator.n.01_1) (ontop carving_knife.n.01_1 countertop.n.01_1) (ontop chopping_board.n.01_1 countertop.n.01_1) (inroom electric_refrigerator.n.01_1 kitchen) (inroom countertop.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) - (future diced__beetroot.n.01_1) + (future diced__beet.n.01_1) (future diced__bell_pepper.n.01_1) (future diced__zucchini.n.01_1) (ontop agent.n.01_1 floor.n.01_1) @@ -37,7 +37,7 @@ (and (real ?diced__zucchini.n.01_1) (real ?diced__bell_pepper.n.01_1) - (real ?diced__beetroot.n.01_1) + (real ?diced__beet.n.01_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/sorting_items_for_garage_sale/problem0.bddl b/bddl/activity_definitions/sorting_items_for_garage_sale/problem0.bddl index aee3612d..323f76e8 100644 --- a/bddl/activity_definitions/sorting_items_for_garage_sale/problem0.bddl +++ b/bddl/activity_definitions/sorting_items_for_garage_sale/problem0.bddl @@ -38,8 +38,8 @@ (ontop cooking_utensil.n.01_2 floor.n.01_1) (ontop tennis_racket.n.01_1 floor.n.01_1) (ontop tennis_racket.n.01_2 tennis_racket.n.01_1) - (ontop coat.n.01_1 floor.n.01_1) - (ontop coat.n.01_2 floor.n.01_1) + (ontop coat.n.01_1 floor.n.01_1) + (ontop coat.n.01_2 floor.n.01_1) (ontop blanket.n.01_1 floor.n.01_1) (ontop gym_shoe.n.01_1 textbook.n.01_3) (ontop gym_shoe.n.01_2 textbook.n.01_3) @@ -96,7 +96,7 @@ (inside ?blanket.n.01_1 ?packing_box.n.02) (folded ?blanket.n.01_1) (forall - (?coat.n.01 - coat.n.01) + (?coat.n.01 - coat.n.01) (and (inside ?coat.n.01 ?packing_box.n.02) (folded ?coat.n.01) diff --git a/bddl/activity_definitions/sorting_potatoes/problem0.bddl b/bddl/activity_definitions/sorting_potatoes/problem0.bddl index 409750cc..f56260b6 100644 --- a/bddl/activity_definitions/sorting_potatoes/problem0.bddl +++ b/bddl/activity_definitions/sorting_potatoes/problem0.bddl @@ -4,9 +4,9 @@ (:objects potato.n.01_1 potato.n.01_2 potato.n.01_3 potato.n.01_4 potato.n.01_5 - potato.n.01 carton.n.02_1 - carton.n.02 - bok_choy.n.01_1 bok_choy.n.01_2 - bok_choy.n.01 + bok_choy.n.02_1 bok_choy.n.02_2 - bok_choy.n.02 butternut_squash.n.01_1 butternut_squash.n.01_2 - butternut_squash.n.01 - sweet_potato.n.01_1 sweet_potato.n.01_2 sweet_potato.n.01_3 - sweet_potato.n.01 + sweet_potato.n.02_1 sweet_potato.n.02_2 sweet_potato.n.02_3 - sweet_potato.n.02 sack.n.01_1 sack.n.01_2 sack.n.01_3 - sack.n.01 table.n.02_1 - table.n.02 floor.n.01_1 - floor.n.01 @@ -19,13 +19,13 @@ (inside potato.n.01_3 carton.n.02_1) (inside potato.n.01_4 carton.n.02_1) (inside potato.n.01_5 carton.n.02_1) - (inside bok_choy.n.01_1 carton.n.02_1) - (inside bok_choy.n.01_2 carton.n.02_1) + (inside bok_choy.n.02_1 carton.n.02_1) + (inside bok_choy.n.02_2 carton.n.02_1) (inside butternut_squash.n.01_1 carton.n.02_1) (inside butternut_squash.n.01_2 carton.n.02_1) - (inside sweet_potato.n.01_1 carton.n.02_1) - (inside sweet_potato.n.01_2 carton.n.02_1) - (inside sweet_potato.n.01_3 carton.n.02_1) + (inside sweet_potato.n.02_1 carton.n.02_1) + (inside sweet_potato.n.02_2 carton.n.02_1) + (inside sweet_potato.n.02_3 carton.n.02_1) (ontop sack.n.01_1 table.n.02_1) (ontop sack.n.01_2 sack.n.01_1) (ontop sack.n.01_3 table.n.02_1) @@ -48,8 +48,8 @@ (?sack.n.01 - sack.n.01) (and (forall - (?sweet_potato.n.01 - sweet_potato.n.01) - (inside ?sweet_potato.n.01 ?sack.n.01) + (?sweet_potato.n.02 - sweet_potato.n.02) + (inside ?sweet_potato.n.02 ?sack.n.01) ) (forall (?potato.n.01 - potato.n.01) diff --git a/bddl/activity_definitions/sorting_vegetables/problem0.bddl b/bddl/activity_definitions/sorting_vegetables/problem0.bddl index 73f902a3..8ec32803 100644 --- a/bddl/activity_definitions/sorting_vegetables/problem0.bddl +++ b/bddl/activity_definitions/sorting_vegetables/problem0.bddl @@ -5,7 +5,7 @@ mixing_bowl.n.01_1 mixing_bowl.n.01_2 mixing_bowl.n.01_3 - mixing_bowl.n.01 kitchen_table.n.01_1 - kitchen_table.n.01 sack.n.01_1 sack.n.01_2 - sack.n.01 - bok_choy.n.01_1 bok_choy.n.01_2 bok_choy.n.01_3 - bok_choy.n.01 + bok_choy.n.02_1 bok_choy.n.02_2 bok_choy.n.02_3 - bok_choy.n.02 chard.n.02_1 chard.n.02_2 chard.n.02_3 - chard.n.02 sweet_corn.n.02_1 sweet_corn.n.02_2 sweet_corn.n.02_3 - sweet_corn.n.02 artichoke.n.02_1 artichoke.n.02_2 - artichoke.n.02 @@ -20,9 +20,9 @@ (ontop mixing_bowl.n.01_3 kitchen_table.n.01_1) (ontop sack.n.01_1 kitchen_table.n.01_1) (ontop sack.n.01_2 kitchen_table.n.01_1) - (inside bok_choy.n.01_1 sack.n.01_1) - (inside bok_choy.n.01_2 sack.n.01_1) - (inside bok_choy.n.01_3 sack.n.01_1) + (inside bok_choy.n.02_1 sack.n.01_1) + (inside bok_choy.n.02_2 sack.n.01_1) + (inside bok_choy.n.02_3 sack.n.01_1) (inside chard.n.02_1 sack.n.01_1) (inside chard.n.02_2 sack.n.01_1) (inside chard.n.02_3 sack.n.01_1) @@ -44,8 +44,8 @@ (?mixing_bowl.n.01 - mixing_bowl.n.01) (and (forall - (?bok_choy.n.01 - bok_choy.n.01) - (inside ?bok_choy.n.01 ?mixing_bowl.n.01) + (?bok_choy.n.02 - bok_choy.n.02) + (inside ?bok_choy.n.02 ?mixing_bowl.n.01) ) (forall (?chard.n.02 - chard.n.02) @@ -74,7 +74,7 @@ (inside ?sweet_corn.n.02_1 ?mixing_bowl.n.01) ) (not - (inside ?bok_choy.n.01_1 ?mixing_bowl.n.01) + (inside ?bok_choy.n.02_1 ?mixing_bowl.n.01) ) ) ) @@ -89,7 +89,7 @@ (inside ?artichoke.n.02_1 ?mixing_bowl.n.01) ) (not - (inside ?bok_choy.n.01_1 ?mixing_bowl.n.01) + (inside ?bok_choy.n.02_1 ?mixing_bowl.n.01) ) ) ) diff --git a/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl b/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl index 473b18a9..8cea1bfe 100644 --- a/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl +++ b/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl @@ -2,15 +2,15 @@ (:domain omnigibson) (:objects - beer_bottle.n.01_1 - beer_bottle.n.01 + bottle__of__beer.n.01_1 - bottle__of__beer.n.01 shelf.n.01_1 - shelf.n.01 beer_glass.n.01_1 beer_glass.n.01_2 - beer_glass.n.01 cabinet.n.01_1 - cabinet.n.01 - wine_bottle.n.01_1 - wine_bottle.n.01 - brandy__bottle.n.01_1 - brandy__bottle.n.01 + bottle__of__wine.n.01_1 - bottle__of__wine.n.01 + bottle__of__brandy.n.01_1 - bottle__of__brandy.n.01 dishtowel.n.01_1 - dishtowel.n.01 - tonic.n.01_1 - tonic.n.01 - lemonade__bottle.n.01_1 - lemonade__bottle.n.01 + bottle__of__tonic.n.01_1 - bottle__of__tonic.n.01 + bottle__of__lemonade.n.01_1 - bottle__of__lemonade.n.01 teaspoon.n.02_1 - teaspoon.n.02 shot_glass.n.01_1 - shot_glass.n.01 floor.n.01_1 - floor.n.01 @@ -19,14 +19,14 @@ ) (:init - (ontop beer_bottle.n.01_1 shelf.n.01_1) + (ontop bottle__of__beer.n.01_1 shelf.n.01_1) (ontop beer_glass.n.01_1 cabinet.n.01_1) - (ontop wine_bottle.n.01_1 shelf.n.01_1) + (ontop bottle__of__wine.n.01_1 shelf.n.01_1) (ontop beer_glass.n.01_2 cabinet.n.01_1) - (ontop brandy__bottle.n.01_1 shelf.n.01_1) + (ontop bottle__of__brandy.n.01_1 shelf.n.01_1) (ontop dishtowel.n.01_1 shelf.n.01_1) - (ontop tonic.n.01_1 shelf.n.01_1) - (ontop lemonade__bottle.n.01_1 shelf.n.01_1) + (ontop bottle__of__tonic.n.01_1 shelf.n.01_1) + (ontop bottle__of__lemonade.n.01_1 shelf.n.01_1) (ontop teaspoon.n.02_1 shelf.n.01_1) (ontop shot_glass.n.01_1 shelf.n.01_1) (inroom floor.n.01_1 kitchen) @@ -39,12 +39,12 @@ (:goal (and - (nextto ?wine_bottle.n.01_1 ?beer_bottle.n.01_1) + (nextto ?bottle__of__wine.n.01_1 ?bottle__of__beer.n.01_1) (ontop ?shot_glass.n.01_1 ?serving_cart.n.01_1) - (ontop ?brandy__bottle.n.01_1 ?serving_cart.n.01_1) - (ontop ?beer_bottle.n.01_1 ?serving_cart.n.01_1) - (ontop ?tonic.n.01_1 ?serving_cart.n.01_1) - (ontop ?lemonade__bottle.n.01_1 ?serving_cart.n.01_1) + (ontop ?bottle__of__brandy.n.01_1 ?serving_cart.n.01_1) + (ontop ?bottle__of__beer.n.01_1 ?serving_cart.n.01_1) + (ontop ?bottle__of__tonic.n.01_1 ?serving_cart.n.01_1) + (ontop ?bottle__of__lemonade.n.01_1 ?serving_cart.n.01_1) (ontop ?beer_glass.n.01_1 ?serving_cart.n.01_1) (ontop ?beer_glass.n.01_2 ?serving_cart.n.01_1) (ontop ?dishtowel.n.01_1 ?serving_cart.n.01_1) diff --git a/bddl/activity_definitions/store_a_fur_coat/problem0.bddl b/bddl/activity_definitions/store_a_fur_coat/problem0.bddl index 39bb6608..fcc53c7d 100644 --- a/bddl/activity_definitions/store_a_fur_coat/problem0.bddl +++ b/bddl/activity_definitions/store_a_fur_coat/problem0.bddl @@ -12,7 +12,7 @@ (:init (ontop wicker_basket.n.01_1 floor.n.01_1) - (inside fur_coat.n.01_1 wicker_basket.n.01_1) + (inside fur_coat.n.01_1 wicker_basket.n.01_1) (attached hanger.n.02_1 wardrobe.n.01_1) (inroom floor.n.01_1 closet) (inroom wardrobe.n.01_1 closet) @@ -21,7 +21,7 @@ (:goal (and - (draped ?fur_coat.n.01_1 ?hanger.n.02_1) + (draped ?fur_coat.n.01_1 ?hanger.n.02_1) (attached ?hanger.n.02_1 ?wardrobe.n.01_1) ) ) diff --git a/bddl/activity_definitions/store_batteries/problem0.bddl b/bddl/activity_definitions/store_batteries/problem0.bddl index e8a0fa97..a0001982 100644 --- a/bddl/activity_definitions/store_batteries/problem0.bddl +++ b/bddl/activity_definitions/store_batteries/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - 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 chest_of_drawers.n.01_1 - chest_of_drawers.n.01 floor.n.01_1 - floor.n.01 @@ -10,8 +10,8 @@ ) (:init - (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) (inroom shelf.n.01_1 bathroom) (inroom chest_of_drawers.n.01_1 bathroom) (inroom floor.n.01_1 bathroom) @@ -21,8 +21,8 @@ (:goal (and (forall - (?battery.n.01 - battery.n.01) - (inside ?battery.n.01 ?chest_of_drawers.n.01_1) + (?battery.n.02 - battery.n.02) + (inside ?battery.n.02 ?chest_of_drawers.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl b/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl index a0b26194..d886e400 100644 --- a/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl +++ b/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - daffodil.n.01_1 daffodil.n.01_2 daffodil.n.01_3 - daffodil.n.01 + daffodil_bulb.n.01_1 daffodil_bulb.n.01_2 daffodil_bulb.n.01_3 - daffodil_bulb.n.01 countertop.n.01_1 - countertop.n.01 cabinet.n.01_1 - cabinet.n.01 mixing_bowl.n.01_1 - mixing_bowl.n.01 @@ -11,9 +11,9 @@ ) (:init - (ontop daffodil.n.01_1 countertop.n.01_1) - (ontop daffodil.n.01_2 countertop.n.01_1) - (ontop daffodil.n.01_3 countertop.n.01_1) + (ontop daffodil_bulb.n.01_1 countertop.n.01_1) + (ontop daffodil_bulb.n.01_2 countertop.n.01_1) + (ontop daffodil_bulb.n.01_3 countertop.n.01_1) (ontop mixing_bowl.n.01_1 countertop.n.01_1) (inroom countertop.n.01_1 kitchen) (inroom cabinet.n.01_1 kitchen) @@ -24,8 +24,8 @@ (:goal (and (forall - (?daffodil.n.01 - daffodil.n.01) - (inside ?daffodil.n.01 ?mixing_bowl.n.01_1) + (?daffodil_bulb.n.01 - daffodil_bulb.n.01) + (inside ?daffodil_bulb.n.01 ?mixing_bowl.n.01_1) ) (inside ?mixing_bowl.n.01_1 ?cabinet.n.01_1) ) diff --git a/bddl/activity_definitions/store_whole_grains/problem0.bddl b/bddl/activity_definitions/store_whole_grains/problem0.bddl index 92024afb..d8c0713e 100644 --- a/bddl/activity_definitions/store_whole_grains/problem0.bddl +++ b/bddl/activity_definitions/store_whole_grains/problem0.bddl @@ -11,7 +11,7 @@ ) (:init - (ontop white_rice.n.01_1 sack.n.01_1) + (filled sack.n.01_1 white_rice.n.01_1) (ontop sack.n.01_1 floor.n.01_1) (inside mason_jar.n.01_1 cabinet.n.01_1) (inroom cabinet.n.01_1 kitchen) @@ -21,7 +21,7 @@ (:goal (and - (inside ?white_rice.n.01_1 ?mason_jar.n.01_1) + (contains ?mason_jar.n.01_1 ?white_rice.n.01_1) (inside ?mason_jar.n.01_1 ?cabinet.n.01_1) (ontop ?sack.n.01_1 ?floor.n.01_1) ) diff --git a/bddl/activity_definitions/store_winter_coats/problem0.bddl b/bddl/activity_definitions/store_winter_coats/problem0.bddl index d94da75c..b40b69db 100644 --- a/bddl/activity_definitions/store_winter_coats/problem0.bddl +++ b/bddl/activity_definitions/store_winter_coats/problem0.bddl @@ -10,8 +10,8 @@ ) (:init - (ontop coat.n.01_1 floor.n.01_1) - (ontop coat.n.01_2 floor.n.01_1) + (ontop coat.n.01_1 floor.n.01_1) + (ontop coat.n.01_2 floor.n.01_1) (attached hanger.n.02_1 wardrobe.n.01_1) (attached hanger.n.02_2 wardrobe.n.01_1) (inroom wardrobe.n.01_1 closet) @@ -22,7 +22,7 @@ (:goal (and (forpairs - (?coat.n.01 - coat.n.01) + (?coat.n.01 - coat.n.01) (?hanger.n.02 - hanger.n.02) (draped ?coat.n.01 ?hanger.n.02) ) diff --git a/bddl/activity_definitions/storing_food/problem0.bddl b/bddl/activity_definitions/storing_food/problem0.bddl index a664d89d..29415aa2 100644 --- a/bddl/activity_definitions/storing_food/problem0.bddl +++ b/bddl/activity_definitions/storing_food/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - oatmeal.n.01_1 oatmeal.n.01_2 - oatmeal.n.01 + box__of__oatmeal.n.01_1 box__of__oatmeal.n.01_2 - box__of__oatmeal.n.01 countertop.n.01_1 - countertop.n.01 chip.n.04_1 chip.n.04_2 - chip.n.04 bottle__of__olive_oil.n.01_1 bottle__of__olive_oil.n.01_2 - bottle__of__olive_oil.n.01 @@ -13,8 +13,8 @@ ) (:init - (ontop oatmeal.n.01_1 countertop.n.01_1) - (ontop oatmeal.n.01_2 countertop.n.01_1) + (ontop box__of__oatmeal.n.01_1 countertop.n.01_1) + (ontop box__of__oatmeal.n.01_2 countertop.n.01_1) (ontop chip.n.04_1 countertop.n.01_1) (ontop chip.n.04_2 countertop.n.01_1) (ontop bottle__of__olive_oil.n.01_1 countertop.n.01_1) @@ -29,8 +29,8 @@ (:goal (and - (inside ?oatmeal.n.01_1 ?cabinet.n.01_1) - (inside ?oatmeal.n.01_2 ?cabinet.n.01_1) + (inside ?box__of__oatmeal.n.01_1 ?cabinet.n.01_1) + (inside ?box__of__oatmeal.n.01_2 ?cabinet.n.01_1) (inside ?chip.n.04_1 ?cabinet.n.01_1) (inside ?chip.n.04_2 ?cabinet.n.01_1) (inside ?bottle__of__olive_oil.n.01_1 ?cabinet.n.01_1) diff --git a/bddl/activity_definitions/sweeping_patio/problem0.bddl b/bddl/activity_definitions/sweeping_patio/problem0.bddl index 6caf0e0e..55335b22 100644 --- a/bddl/activity_definitions/sweeping_patio/problem0.bddl +++ b/bddl/activity_definitions/sweeping_patio/problem0.bddl @@ -25,8 +25,8 @@ (inroom lawn.n.01_1 garden) (inroom driveway.n.01_1 garden) (inroom floor.n.01_1 garden) - (inroom rocking_chair.n.01_1 garden) - (inroom rocking_chair.n.01_2 garden) + (inroom rocking_chair.n.01_1 garden) + (inroom rocking_chair.n.01_2 garden) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/tidying_bathroom/problem0.bddl b/bddl/activity_definitions/tidying_bathroom/problem0.bddl index 2b9a7f7a..4b8b08c2 100644 --- a/bddl/activity_definitions/tidying_bathroom/problem0.bddl +++ b/bddl/activity_definitions/tidying_bathroom/problem0.bddl @@ -7,8 +7,7 @@ packing_box.n.02_1 - packing_box.n.02 toilet_tissue.n.01_1 toilet_tissue.n.01_2 - toilet_tissue.n.01 floor.n.01_1 - floor.n.01 - toilet.n.01_1 - toilet.n.01 - freshener.n.01_1 - freshener.n.01 + toilet.n.02_1 - toilet.n.02 deodorant__atomizer.n.01_1 - deodorant__atomizer.n.01 toothbrush.n.01_1 - toothbrush.n.01 hair_spray__can.n.01_1 - hair_spray__can.n.01 @@ -18,7 +17,6 @@ tank_top.n.01_1 tank_top.n.01_2 - tank_top.n.01 legging.n.01_1 - legging.n.01 wall.n.01_1 - wall.n.01 - toilet.n.02_1 - toilet.n.02 agent.n.01_1 - agent.n.01 ) @@ -30,21 +28,19 @@ (inside toilet_tissue.n.01_1 wicker_basket.n.01_1) (inside toilet_tissue.n.01_2 wicker_basket.n.01_1) (ontop wicker_basket.n.01_1 floor.n.01_1) - (ontop packing_box.n.02_1 toilet.n.01_1) - (ontop freshener.n.01_1 floor.n.01_1) - (ontop deodorant__atomizer.n.01_1 floor.n.01_1) - (ontop toothbrush.n.01_1 toilet.n.01_1) + (ontop packing_box.n.02_1 toilet.n.02_1) + (ontop deodorant__atomizer.n.01_1 floor.n.01_1) + (ontop toothbrush.n.01_1 toilet.n.02_1) (inside hair_spray__can.n.01_1 wicker_basket.n.01_1) (ontop hamper.n.02_1 floor.n.01_1) (ontop lingerie.n.01_1 floor.n.01_1) - (ontop short_pants.n.01_1 toilet.n.01_1) + (ontop short_pants.n.01_1 toilet.n.02_1) (inside tank_top.n.01_1 hamper.n.02_1) (ontop tank_top.n.01_2 floor.n.01_1) (ontop legging.n.01_1 floor.n.01_1) (inroom toilet.n.02_1 bathroom) (inroom floor.n.01_1 bathroom) - (inroom toilet.n.01_1 bathroom) - (inroom wall.n.01_1 bathroom) + (inroom wall.n.01_1 bathroom) (ontop agent.n.01_1 floor.n.01_1) ) @@ -52,7 +48,7 @@ (and (forall (?toilet_tissue.n.01 - toilet_tissue.n.01) - (ontop ?toilet_tissue.n.01 ?toilet.n.01_1) + (ontop ?toilet_tissue.n.01 ?toilet.n.02_1) ) (ontop ?wicker_basket.n.01_1 ?floor.n.01_1) (forall @@ -66,8 +62,7 @@ (?tank_top.n.01 - tank_top.n.01) (inside ?tank_top.n.01 ?hamper.n.02_1) ) - (ontop ?freshener.n.01_1 ?toilet.n.01_1) - (inside ?deodorant__atomizer.n.01_1 ?packing_box.n.02_1) + (inside ?deodorant__atomizer.n.01_1 ?packing_box.n.02_1) (inside ?toothbrush.n.01_1 ?packing_box.n.02_1) (inside ?hair_spray__can.n.01_1 ?packing_box.n.02_1) (inside ?lingerie.n.01_1 ?hamper.n.02_1) diff --git a/bddl/activity_definitions/toast_coconut/problem0.bddl b/bddl/activity_definitions/toast_coconut/problem0.bddl index e1fc0b95..f44618e3 100644 --- a/bddl/activity_definitions/toast_coconut/problem0.bddl +++ b/bddl/activity_definitions/toast_coconut/problem0.bddl @@ -3,6 +3,9 @@ (:objects coconut.n.01_1 - coconut.n.01 + cooked__coconut.n.01_1 - cooked__coconut.n.01 + mason_jar.n.01_1 - mason_jar.n.01 + cabinet.n.01_1 - cabinet.n.01 frying_pan.n.01_1 - frying_pan.n.01 stove.n.01_1 - stove.n.01 floor.n.01_1 - floor.n.01 @@ -10,23 +13,20 @@ ) (:init - (inside coconut.n.01_1 frying_pan.n.01_1) - (ontop frying_pan.n.01_1 stove.n.01_1) - (not - (hot coconut.n.01_1) - ) - (not - (cooked coconut.n.01_1) - ) + (filled coconut.n.01_1 mason_jar.n.01_1) + (inside mason_jar.n.01_1 cabinet.n.01_1) + (ontop frying_pan.n.01_1 stove.n.01_1) + (inroom cabinet.n.01_1 kitchen) (inroom stove.n.01_1 kitchen) (inroom floor.n.01_1 kitchen) (ontop agent.n.01_1 floor.n.01_1) + (future cooked__coconut.n.01_1) ) (:goal (and - (hot ?coconut.n.01_1) - (cooked ?coconut.n.01_1) + (real ?cooked__coconut.n.01_1) + (contains ?frying_pan.n.01_1 ?cooked__coconut.n.01_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/turning_on_radio/problem0.bddl b/bddl/activity_definitions/turning_on_radio/problem0.bddl index 1ddcd2e6..39c8ffb7 100644 --- a/bddl/activity_definitions/turning_on_radio/problem0.bddl +++ b/bddl/activity_definitions/turning_on_radio/problem0.bddl @@ -2,23 +2,23 @@ (:domain omnigibson) (:objects - radio.n.01_1 - radio.n.01 + radio_receiver.n.01_1 - radio_receiver.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) (:init (not - (toggled_on radio.n.01_1) + (toggled_on radio_receiver.n.01_1) ) - (ontop radio.n.01_1 floor.n.01_1) + (ontop radio_receiver.n.01_1 floor.n.01_1) (inroom floor.n.01_1 corridor) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and - (toggled_on ?radio.n.01_1) + (toggled_on ?radio_receiver.n.01_1) ) ) ) \ No newline at end of file diff --git a/bddl/activity_definitions/unloading_shopping_items/problem0.bddl b/bddl/activity_definitions/unloading_shopping_items/problem0.bddl index b109b39f..898467c4 100644 --- a/bddl/activity_definitions/unloading_shopping_items/problem0.bddl +++ b/bddl/activity_definitions/unloading_shopping_items/problem0.bddl @@ -5,8 +5,8 @@ carton.n.02_1 carton.n.02_2 - carton.n.02 floor.n.01_1 - floor.n.01 cabinet.n.01_1 - cabinet.n.01 - lotion__bottle.n.01_1 - lotion__bottle.n.01 - detergent__bottle.n.01_1 - detergent__bottle.n.01 + bottle__of__lotion.n.01_1 - bottle__of__lotion.n.01 + bottle__of__detergent.n.01_1 - bottle__of__detergent.n.01 picture_frame.n.01_1 picture_frame.n.01_2 picture_frame.n.01_3 - picture_frame.n.01 notebook.n.01_1 notebook.n.01_2 notebook.n.01_3 - notebook.n.01 painting.n.01_1 painting.n.01_2 - painting.n.01 @@ -20,8 +20,8 @@ (:init (ontop carton.n.02_1 floor.n.01_1) (ontop carton.n.02_2 floor.n.01_1) - (inside lotion__bottle.n.01_1 carton.n.02_1) - (inside detergent__bottle.n.01_1 carton.n.02_1) + (inside bottle__of__lotion.n.01_1 carton.n.02_1) + (inside bottle__of__detergent.n.01_1 carton.n.02_1) (inside picture_frame.n.01_1 carton.n.02_1) (inside picture_frame.n.01_2 carton.n.02_1) (inside picture_frame.n.01_3 carton.n.02_1) @@ -54,8 +54,8 @@ (?painting.n.01 - painting.n.01) (ontop ?painting.n.01 ?cabinet.n.01_1) ) - (ontop ?lotion__bottle.n.01_1 ?console_table.n.01_1) - (ontop ?detergent__bottle.n.01_1 ?cabinet.n.01_1) + (ontop ?bottle__of__lotion.n.01_1 ?console_table.n.01_1) + (ontop ?bottle__of__detergent.n.01_1 ?cabinet.n.01_1) (forall (?lampshade.n.01 - lampshade.n.01) (ontop ?lampshade.n.01 ?cabinet.n.01_1) diff --git a/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl b/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl index 62df4094..f79b1f9b 100644 --- a/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl +++ b/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl @@ -8,7 +8,7 @@ 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.01_1 - battery.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 @@ -21,7 +21,7 @@ (inside laptop.n.01_1 duffel_bag.n.01_1) (inside videodisk.n.01_1 duffel_bag.n.01_1) (inside videodisk.n.01_2 duffel_bag.n.01_1) - (inside battery.n.01_1 duffel_bag.n.01_1) + (inside battery.n.02_1 duffel_bag.n.01_1) (inside wire.n.02_1 duffel_bag.n.01_1) (inside book.n.02_1 duffel_bag.n.01_1) (inroom floor.n.01_1 living_room) @@ -44,7 +44,7 @@ (ontop ?videodisk.n.01 ?videodisk.n.01_2) ) ) - (ontop ?battery.n.01_1 ?shelf.n.01_1) + (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) diff --git a/bddl/activity_definitions/unpacking_suitcase/problem0.bddl b/bddl/activity_definitions/unpacking_suitcase/problem0.bddl index 9ae2eca8..7e3755c9 100644 --- a/bddl/activity_definitions/unpacking_suitcase/problem0.bddl +++ b/bddl/activity_definitions/unpacking_suitcase/problem0.bddl @@ -5,7 +5,7 @@ sock.n.01_1 sock.n.01_2 - sock.n.01 floor.n.01_1 - floor.n.01 carton.n.02_1 - carton.n.02 - perfume.n.02_1 - perfume.n.02 + bottle__of__perfume.n.01_1 - bottle__of__perfume.n.01 toothbrush.n.01_1 - toothbrush.n.01 notebook.n.01_1 - notebook.n.01 sofa.n.01_1 - sofa.n.01 @@ -16,7 +16,7 @@ (ontop carton.n.02_1 floor.n.01_1) (inside sock.n.01_1 carton.n.02_1) (inside sock.n.01_2 carton.n.02_1) - (inside perfume.n.02_1 carton.n.02_1) + (inside bottle__of__perfume.n.01_1 carton.n.02_1) (inside toothbrush.n.01_1 carton.n.02_1) (inside notebook.n.01_1 carton.n.02_1) (inroom floor.n.01_1 living_room) @@ -31,7 +31,7 @@ (?sock.n.01 - sock.n.01) (ontop ?sock.n.01 ?sofa.n.01_1) ) - (ontop ?perfume.n.02_1 ?sofa.n.01_1) + (ontop ?bottle__of__perfume.n.01_1 ?sofa.n.01_1) (ontop ?toothbrush.n.01_1 ?sofa.n.01_1) (ontop ?notebook.n.01_1 ?sofa.n.01_1) ) diff --git a/bddl/activity_definitions/wash_a_wool_coat/problem0.bddl b/bddl/activity_definitions/wash_a_wool_coat/problem0.bddl index 4fc0ddd9..143f249d 100644 --- a/bddl/activity_definitions/wash_a_wool_coat/problem0.bddl +++ b/bddl/activity_definitions/wash_a_wool_coat/problem0.bddl @@ -17,8 +17,8 @@ (:init (ontop wool_coat.n.01_1 clothes_dryer.n.01_1) - (covered wool_coat.n.01_1 dust.n.01_1) - (covered wool_coat.n.01_1 lint.n.01_1) + (covered wool_coat.n.01_1 dust.n.01_1) + (covered wool_coat.n.01_1 lint.n.01_1) (ontop scrub_brush.n.01_1 washer.n.03_1) (filled detergent__bottle.n.01_1 detergent.n.02_1) (ontop detergent__bottle.n.01_1 clothes_dryer.n.01_1) diff --git a/bddl/activity_definitions/waxing_floors/problem0.bddl b/bddl/activity_definitions/waxing_floors/problem0.bddl index 1b249f2b..e26b0f1d 100644 --- a/bddl/activity_definitions/waxing_floors/problem0.bddl +++ b/bddl/activity_definitions/waxing_floors/problem0.bddl @@ -4,17 +4,17 @@ (:objects dust.n.01_1 - dust.n.01 floor.n.01_1 - floor.n.01 - wax.n.01_1 - wax.n.01 + floor_wax.n.01_1 - floor_wax.n.01 rag.n.01_1 - rag.n.01 - wax__jar.n.01_1 - wax__jar.n.01 + floor_wax__bottle.n.01_1 - floor_wax__bottle.n.01 shelf.n.01_1 - shelf.n.01 agent.n.01_1 - agent.n.01 ) (:init (covered floor.n.01_1 dust.n.01_1) - (filled wax__jar.n.01_1 wax.n.01_1) - (ontop wax__jar.n.01_1 floor.n.01_1) + (filled floor_wax__bottle.n.01_1 floor_wax.n.01_1) + (ontop floor_wax__bottle.n.01_1 floor.n.01_1) (inside rag.n.01_1 shelf.n.01_1) (inroom floor.n.01_1 kitchen) (inroom shelf.n.01_1 kitchen) @@ -27,7 +27,7 @@ (not (covered ?floor.n.01_1 ?dust.n.01_1) ) - (covered ?floor.n.01_1 ?wax.n.01_1) + (covered ?floor.n.01_1 ?floor_wax.n.01_1) ) ) ) diff --git a/bddl/generated_data/output_hierarchy.json b/bddl/generated_data/output_hierarchy.json index 8034d2cb..314af017 100644 --- a/bddl/generated_data/output_hierarchy.json +++ b/bddl/generated_data/output_hierarchy.json @@ -1355,6 +1355,10 @@ "name": "margarine__box.n.01", "hasModel": true }, + { + "name": "marjoram__shaker.n.01", + "hasModel": true + }, { "name": "measure.n.09", "hasModel": true, @@ -1385,10 +1389,6 @@ "name": "onion_powder__shaker.n.01", "hasModel": true }, - { - "name": "oregano__shaker.n.01", - "hasModel": true - }, { "name": "package.n.02", "hasModel": true @@ -12655,6 +12655,10 @@ "name": "chocolate_cookie_dough.n.01", "hasModel": true }, + { + "name": "cookie_dough.n.01", + "hasModel": true + }, { "name": "edible_cookie_dough.n.01", "hasModel": true diff --git a/bddl/generated_data/propagated_annots_canonical.json b/bddl/generated_data/propagated_annots_canonical.json index c1a1cd07..c5b5d24e 100644 --- a/bddl/generated_data/propagated_annots_canonical.json +++ b/bddl/generated_data/propagated_annots_canonical.json @@ -14938,6 +14938,26 @@ "wetable": {}, "wrinkleable": {} }, + "cookie_dough.n.01": { + "deformable": {}, + "disinfectable": {}, + "dustyable": {}, + "foldable": {}, + "freezable": {}, + "grassyable": {}, + "heatable": {}, + "mixable": {}, + "moldyable": {}, + "rustable": {}, + "scratchable": {}, + "softBody": {}, + "stainable": {}, + "stickyable": {}, + "tarnishable": {}, + "unfoldable": {}, + "wetable": {}, + "wrinkleable": {} + }, "cookie_sheet.n.01": { "disinfectable": {}, "dustyable": {}, @@ -29394,6 +29414,26 @@ "microPhysicalSubstance": {}, "substance": {} }, + "marjoram__shaker.n.01": { + "disinfectable": {}, + "dustyable": {}, + "fillable": {}, + "freezable": {}, + "grassyable": {}, + "heatable": {}, + "mixable": {}, + "moldyable": {}, + "needsOrientation": {}, + "particleApplier": {}, + "rigidBody": {}, + "rustable": {}, + "scratchable": {}, + "stainable": {}, + "stickyable": {}, + "tarnishable": {}, + "wetable": {}, + "wrinkleable": {} + }, "marker.n.02": { "disinfectable": {}, "dustyable": {}, @@ -32167,26 +32207,6 @@ "wetable": {}, "wrinkleable": {} }, - "oregano__shaker.n.01": { - "disinfectable": {}, - "dustyable": {}, - "fillable": {}, - "freezable": {}, - "grassyable": {}, - "heatable": {}, - "mixable": {}, - "moldyable": {}, - "needsOrientation": {}, - "particleApplier": {}, - "rigidBody": {}, - "rustable": {}, - "scratchable": {}, - "stainable": {}, - "stickyable": {}, - "tarnishable": {}, - "wetable": {}, - "wrinkleable": {} - }, "organic_compound.n.01": { "freezable": {}, "heatable": {} diff --git a/bddl/generated_data/propagated_annots_params.json b/bddl/generated_data/propagated_annots_params.json index 227b90c2..645defe4 100644 --- a/bddl/generated_data/propagated_annots_params.json +++ b/bddl/generated_data/propagated_annots_params.json @@ -15049,6 +15049,26 @@ "wetable": {}, "wrinkleable": {} }, + "cookie_dough.n.01": { + "deformable": {}, + "disinfectable": {}, + "dustyable": {}, + "foldable": {}, + "freezable": {}, + "grassyable": {}, + "heatable": {}, + "mixable": {}, + "moldyable": {}, + "rustable": {}, + "scratchable": {}, + "softBody": {}, + "stainable": {}, + "stickyable": {}, + "tarnishable": {}, + "unfoldable": {}, + "wetable": {}, + "wrinkleable": {} + }, "cookie_sheet.n.01": { "disinfectable": {}, "dustyable": {}, @@ -29641,6 +29661,26 @@ "microPhysicalSubstance": {}, "substance": {} }, + "marjoram__shaker.n.01": { + "disinfectable": {}, + "dustyable": {}, + "fillable": {}, + "freezable": {}, + "grassyable": {}, + "heatable": {}, + "mixable": {}, + "moldyable": {}, + "needsOrientation": {}, + "particleApplier": {}, + "rigidBody": {}, + "rustable": {}, + "scratchable": {}, + "stainable": {}, + "stickyable": {}, + "tarnishable": {}, + "wetable": {}, + "wrinkleable": {} + }, "marker.n.02": { "disinfectable": {}, "dustyable": {}, @@ -32439,26 +32479,6 @@ "wetable": {}, "wrinkleable": {} }, - "oregano__shaker.n.01": { - "disinfectable": {}, - "dustyable": {}, - "fillable": {}, - "freezable": {}, - "grassyable": {}, - "heatable": {}, - "mixable": {}, - "moldyable": {}, - "needsOrientation": {}, - "particleApplier": {}, - "rigidBody": {}, - "rustable": {}, - "scratchable": {}, - "stainable": {}, - "stickyable": {}, - "tarnishable": {}, - "wetable": {}, - "wrinkleable": {} - }, "organic_compound.n.01": { "freezable": {}, "heatable": {} diff --git a/bddl/generated_data/properties_to_synsets.json b/bddl/generated_data/properties_to_synsets.json index bb49f62d..eca6ae4c 100644 --- a/bddl/generated_data/properties_to_synsets.json +++ b/bddl/generated_data/properties_to_synsets.json @@ -726,6 +726,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -1419,6 +1420,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -1547,7 +1549,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -3172,6 +3173,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -3865,6 +3867,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -3993,7 +3996,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -5843,6 +5845,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil.n.01", "cooking_oil__bottle.n.01", @@ -6790,6 +6793,7 @@ "marinara.n.01", "marinara__jar.n.01", "marjoram.n.02", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -6985,7 +6989,6 @@ "orange_peel.n.01", "orange_zest.n.01", "orchid.n.01", - "oregano__shaker.n.01", "organic_compound.n.01", "organism.n.01", "orzo.n.01", @@ -8847,6 +8850,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -9540,6 +9544,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -9668,7 +9673,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -11518,6 +11522,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil.n.01", "cooking_oil__bottle.n.01", @@ -12465,6 +12470,7 @@ "marinara.n.01", "marinara__jar.n.01", "marjoram.n.02", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -12660,7 +12666,6 @@ "orange_peel.n.01", "orange_zest.n.01", "orchid.n.01", - "oregano__shaker.n.01", "organic_compound.n.01", "organism.n.01", "orzo.n.01", @@ -14522,6 +14527,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -15215,6 +15221,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -15343,7 +15350,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -16968,6 +16974,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -17661,6 +17668,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -17789,7 +17797,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -19534,6 +19541,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -20227,6 +20235,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -20355,7 +20364,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -21980,6 +21988,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -22673,6 +22682,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -22801,7 +22811,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -24426,6 +24435,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -25119,6 +25129,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -25247,7 +25258,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -26872,6 +26882,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -27565,6 +27576,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -27693,7 +27705,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -29318,6 +29329,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -30011,6 +30023,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -30139,7 +30152,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -31764,6 +31776,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -32457,6 +32470,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -32585,7 +32599,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -34210,6 +34223,7 @@ "cooker.n.01", "cookie.n.01", "cookie_cutter.n.01", + "cookie_dough.n.01", "cookie_sheet.n.01", "cooking_oil__bottle.n.01", "cooking_utensil.n.01", @@ -34903,6 +34917,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "marshmallow.n.01", @@ -35031,7 +35046,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "outerwear.n.01", "oven.n.01", "overall.n.01", @@ -35984,6 +35998,7 @@ "coat.n.01", "cobweb.n.01", "collar.n.01", + "cookie_dough.n.01", "cornbread.n.01", "costume.n.01", "cotton.n.01", @@ -36235,6 +36250,7 @@ "coat.n.01", "cobweb.n.01", "collar.n.01", + "cookie_dough.n.01", "cornbread.n.01", "costume.n.01", "cotton.n.01", @@ -36442,6 +36458,7 @@ "chewing_gum.n.01", "chocolate_cake.n.01", "chocolate_cookie_dough.n.01", + "cookie_dough.n.01", "cornbread.n.01", "cotton.n.01", "crescent_roll.n.01", @@ -36546,6 +36563,7 @@ "coat.n.01", "cobweb.n.01", "collar.n.01", + "cookie_dough.n.01", "cornbread.n.01", "costume.n.01", "cotton.n.01", @@ -38150,6 +38168,7 @@ "margarine__box.n.01", "marigold.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "marker.n.02", "marker.n.03", "masher.n.02", @@ -38261,7 +38280,6 @@ "orange.n.01", "orange_juice__carton.n.01", "orchid.n.01", - "oregano__shaker.n.01", "oven.n.01", "oxtail.n.01", "pack__of__cigarettes.n.01", @@ -41313,6 +41331,7 @@ "maple_syrup__jar.n.01", "margarine__box.n.01", "marinara__jar.n.01", + "marjoram__shaker.n.01", "mason_jar.n.01", "mayonnaise__jar.n.01", "measure.n.09", @@ -41330,7 +41349,6 @@ "olive_oil__bottle.n.01", "onion_powder__shaker.n.01", "orange_juice__carton.n.01", - "oregano__shaker.n.01", "packing_box.n.02", "paprika__shaker.n.01", "parmesan__bottle.n.01", @@ -43331,9 +43349,9 @@ "ginger__shaker.n.01", "herb__jar.n.01", "lemon-pepper_seasoning__shaker.n.01", + "marjoram__shaker.n.01", "nutmeg__shaker.n.01", "onion_powder__shaker.n.01", - "oregano__shaker.n.01", "paprika__shaker.n.01", "rosemary__shaker.n.01", "sage__shaker.n.01", @@ -43358,9 +43376,9 @@ "hair_spray__can.n.01", "herb__jar.n.01", "lemon-pepper_seasoning__shaker.n.01", + "marjoram__shaker.n.01", "nutmeg__shaker.n.01", "onion_powder__shaker.n.01", - "oregano__shaker.n.01", "paprika__shaker.n.01", "perfume__bottle.n.01", "pesticide__atomizer.n.01", diff --git a/bddl/generated_data/syn_prop_annots_canonical.json b/bddl/generated_data/syn_prop_annots_canonical.json index 4811a02e..7c3bdc47 100644 --- a/bddl/generated_data/syn_prop_annots_canonical.json +++ b/bddl/generated_data/syn_prop_annots_canonical.json @@ -11822,6 +11822,26 @@ "heatable": {}, "freezable": {} }, + "cookie_dough.n.01": { + "softBody": {}, + "deformable": {}, + "foldable": {}, + "unfoldable": {}, + "wetable": {}, + "mixable": {}, + "stickyable": {}, + "dustyable": {}, + "grassyable": {}, + "scratchable": {}, + "stainable": {}, + "tarnishable": {}, + "moldyable": {}, + "rustable": {}, + "wrinkleable": {}, + "disinfectable": {}, + "heatable": {}, + "freezable": {} + }, "cookie_sheet.n.01": { "rigidBody": {}, "wetable": {}, @@ -21699,6 +21719,26 @@ "heatable": {}, "freezable": {} }, + "marjoram__shaker.n.01": { + "fillable": {}, + "particleApplier": {}, + "needsOrientation": {}, + "rigidBody": {}, + "wetable": {}, + "mixable": {}, + "stickyable": {}, + "dustyable": {}, + "grassyable": {}, + "scratchable": {}, + "stainable": {}, + "tarnishable": {}, + "moldyable": {}, + "rustable": {}, + "wrinkleable": {}, + "disinfectable": {}, + "heatable": {}, + "freezable": {} + }, "marshmallow.n.01": { "cookable": {}, "sliceable": {}, @@ -23304,26 +23344,6 @@ "heatable": {}, "freezable": {} }, - "oregano__shaker.n.01": { - "fillable": {}, - "particleApplier": {}, - "needsOrientation": {}, - "rigidBody": {}, - "wetable": {}, - "mixable": {}, - "stickyable": {}, - "dustyable": {}, - "grassyable": {}, - "scratchable": {}, - "stainable": {}, - "tarnishable": {}, - "moldyable": {}, - "rustable": {}, - "wrinkleable": {}, - "disinfectable": {}, - "heatable": {}, - "freezable": {} - }, "orzo.n.01": { "flammable": {}, "cookable": {}, diff --git a/bddl/generated_data/synsets.csv b/bddl/generated_data/synsets.csv index 0ba0c527..666d9598 100644 --- a/bddl/generated_data/synsets.csv +++ b/bddl/generated_data/synsets.csv @@ -724,6 +724,7 @@ cooked__white_rice.n.01,rice.n.01,1,0,0,1,0,0,0,,,,0,,0,0,,,,,,0,0,microPhysical cooked__white_wine.n.01,wine.n.01,1,0,0,1,0,0,0,,,,0,,,,,,,,,0,0,liquid cooked__wine_sauce.n.01,sauce.n.01,1,0,0,0,,0,0,,,,0,,,,,,,,,0,0,liquid cookie_cutter.n.01,kitchen_utensil.n.01,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,,0,0,rigidBody +cookie_dough.n.01,dough.n.01,1,,,,,,,,,,,,,,,,,,,,,softBody cookie_sheet.n.01,cooking_utensil.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,rigidBody cooking_oil__bottle.n.01,vessel.n.03,1,1,1,0,1,0,0,,,,0,,,,,,,,,0,0,rigidBody cooking_oil.n.01,vegetable_oil.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,,0,0,liquid @@ -1340,6 +1341,7 @@ marinara__jar.n.01,vessel.n.03,1,1,1,0,1,0,0,,,,0,,,,,,,,,0,0,rigidBody marinara.n.01,spaghetti_sauce.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,,0,0,liquid marker.n.03,writing_implement.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,rigidBody marjoram.n.02,herb.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,,0,0,microPhysicalSubstance +marjoram__shaker.n.01,container.n.01,1,0,1,0,0,0,0,,,,0,,0,0,0,1,0,1,,0,0,rigidBody marshmallow.n.01,candy.n.01,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,,0,0,softBody martini.n.01,cocktail.n.01,0,0,0,1,0,0,0,0,0,0,0,0,0,0,,,,,,0,0,liquid mashed_potato.n.02,starches.n.01,1,0,0,0,,0,1,,,,0,,,,,,,,,0,0,liquid @@ -1448,7 +1450,6 @@ orange_juice__carton.n.01,vessel.n.03,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,r orange_juice.n.01,fruit_juice.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,,0,0,liquid orange_zest.n.01,orange_peel.n.01,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,,0,0,microPhysicalSubstance orange.n.01,citrus.n.01,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,,0,0,rigidBody -oregano__shaker.n.01,container.n.01,1,0,1,0,0,0,0,,,,0,,0,0,0,1,0,1,,0,0,rigidBody orzo.n.01,pasta.n.02,0,0,0,1,0,0,1,,,,0,,0,0,,,,,,0,1,macroPhysicalSubstance oven.n.01,kitchen_appliance.n.01,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,,1,0,rigidBody overall.n.01,work-clothing.n.01,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,0,0,cloth diff --git a/bddl/generated_data/synsets_to_descriptors.json b/bddl/generated_data/synsets_to_descriptors.json index 916d216e..f874097b 100644 --- a/bddl/generated_data/synsets_to_descriptors.json +++ b/bddl/generated_data/synsets_to_descriptors.json @@ -45053,6 +45053,64 @@ "wrinkly" ] ], + "cookie_dough.n.01": [ + [ + "disinfected", + "disinfected" + ], + [ + "dusty", + "dusty" + ], + [ + "folded", + "folded" + ], + [ + "frozen", + "frozen" + ], + [ + "grassy", + "grassy" + ], + [ + "hot", + "hot" + ], + [ + "moldy", + "moldy" + ], + [ + "rusty", + "rusty" + ], + [ + "scratched", + "scratched" + ], + [ + "stained", + "stained" + ], + [ + "sticky", + "sticky" + ], + [ + "tarnished", + "tarnished" + ], + [ + "wet", + "wet" + ], + [ + "wrinkly", + "wrinkly" + ] + ], "cookie_sheet.n.01": [ [ "disinfected", @@ -88631,6 +88689,60 @@ "hot" ] ], + "marjoram__shaker.n.01": [ + [ + "disinfected", + "disinfected" + ], + [ + "dusty", + "dusty" + ], + [ + "frozen", + "frozen" + ], + [ + "grassy", + "grassy" + ], + [ + "hot", + "hot" + ], + [ + "moldy", + "moldy" + ], + [ + "rusty", + "rusty" + ], + [ + "scratched", + "scratched" + ], + [ + "stained", + "stained" + ], + [ + "sticky", + "sticky" + ], + [ + "tarnished", + "tarnished" + ], + [ + "wet", + "wet" + ], + [ + "wrinkly", + "wrinkly" + ] + ], "marker.n.02": [ [ "disinfected", @@ -96889,60 +97001,6 @@ "wrinkly" ] ], - "oregano__shaker.n.01": [ - [ - "disinfected", - "disinfected" - ], - [ - "dusty", - "dusty" - ], - [ - "frozen", - "frozen" - ], - [ - "grassy", - "grassy" - ], - [ - "hot", - "hot" - ], - [ - "moldy", - "moldy" - ], - [ - "rusty", - "rusty" - ], - [ - "scratched", - "scratched" - ], - [ - "stained", - "stained" - ], - [ - "sticky", - "sticky" - ], - [ - "tarnished", - "tarnished" - ], - [ - "wet", - "wet" - ], - [ - "wrinkly", - "wrinkly" - ] - ], "organic_compound.n.01": [ [ "frozen", diff --git a/tests/tm_csvs/make_a_blended_iced_cappuccino.csv b/tests/tm_csvs/make_a_blended_iced_cappuccino.csv index 13530c25..4056c968 100644 --- a/tests/tm_csvs/make_a_blended_iced_cappuccino.csv +++ b/tests/tm_csvs/make_a_blended_iced_cappuccino.csv @@ -2,7 +2,7 @@ STEP 1,Unnamed: 1 input-objects, water.n.06_1, instant_coffee.n.01_1, -cane_sugar.n.01_1, +cane_sugar.n.02_1, chocolate_milk.n.01_1, ice_cube.n.01_1, ice_cube.n.01_2, diff --git a/tests/tm_csvs/make_a_cappuccino.csv b/tests/tm_csvs/make_a_cappuccino.csv index 33f2c99c..8621dea3 100644 --- a/tests/tm_csvs/make_a_cappuccino.csv +++ b/tests/tm_csvs/make_a_cappuccino.csv @@ -11,7 +11,7 @@ teacup.n.02_1,contains STEP 2 , input-objects, espresso.n.01_1, -cane_sugar.n.01_1, +cane_sugar.n.02_1, whole_milk.n.01_1, foam.n.01_1, output-objects, diff --git a/tests/tm_csvs/make_a_cheese_pastry.csv b/tests/tm_csvs/make_a_cheese_pastry.csv index 1b02751f..915dda80 100644 --- a/tests/tm_csvs/make_a_cheese_pastry.csv +++ b/tests/tm_csvs/make_a_cheese_pastry.csv @@ -1,7 +1,7 @@ STEP 1,Unnamed: 1 input-objects, raw_egg.n.01_1, -cane_sugar.n.01_1, +cane_sugar.n.02_1, lemon_juice.n.01_1, vanilla.n.02_1, cream_cheese.n.01_1, diff --git a/tests/tm_csvs/make_a_frappe.csv b/tests/tm_csvs/make_a_frappe.csv index 91ca3d70..e1e85842 100644 --- a/tests/tm_csvs/make_a_frappe.csv +++ b/tests/tm_csvs/make_a_frappe.csv @@ -2,7 +2,7 @@ STEP 1,Unnamed: 1 input-objects, water.n.06_1, instant_coffee.n.01_1, -cane_sugar.n.01_1, +cane_sugar.n.02_1, ice_cube.n.01_1, ice_cube.n.01_2, ice_cube.n.01_3, diff --git a/tests/tm_csvs/make_a_vinegar_cleaning_solution.csv b/tests/tm_csvs/make_a_vinegar_cleaning_solution.csv index a690d29b..8b52b99c 100644 --- a/tests/tm_csvs/make_a_vinegar_cleaning_solution.csv +++ b/tests/tm_csvs/make_a_vinegar_cleaning_solution.csv @@ -8,4 +8,4 @@ vinegar_cleaning_solution.n.01_1, tool, tablespoon.n.02_1, container, -flask.n.01_1,contains +erlenmeyer_flask.n.01_1,contains diff --git a/tests/tm_csvs/make_batter.csv b/tests/tm_csvs/make_batter.csv index 7b2afc16..3abfefe1 100644 --- a/tests/tm_csvs/make_batter.csv +++ b/tests/tm_csvs/make_batter.csv @@ -8,7 +8,7 @@ water.n.06_1, output-objects, pancake_batter.n.01_1, tool, -mixer.n.04_1, +electric_mixer.n.01_1, container, mixing_bowl.n.01_1,contains diff --git a/tests/tm_csvs/make_blueberry_mousse.csv b/tests/tm_csvs/make_blueberry_mousse.csv index c6bf1e37..3944e0f7 100644 --- a/tests/tm_csvs/make_blueberry_mousse.csv +++ b/tests/tm_csvs/make_blueberry_mousse.csv @@ -3,15 +3,6 @@ input-objects, lemon_juice.n.01_1, granulated_sugar.n.01_1, blueberry.n.02_1, -blueberry.n.02_2, -blueberry.n.02_3, -blueberry.n.02_4, -blueberry.n.02_5, -blueberry.n.02_6, -blueberry.n.02_7, -blueberry.n.02_8, -blueberry.n.02_9, -blueberry.n.02_10, output-objects, blueberry_compote.n.01_1, tool, diff --git a/tests/tm_csvs/make_cake_filling.csv b/tests/tm_csvs/make_cake_filling.csv index 015e4eb9..bd3e82b6 100644 --- a/tests/tm_csvs/make_cake_filling.csv +++ b/tests/tm_csvs/make_cake_filling.csv @@ -23,6 +23,6 @@ water.n.06_1, output-objects, cherry_filling.n.01_1, tool, -mixer.n.04_1, +electric_mixer.n.01_1, container, mixing_bowl.n.01_1,contains diff --git a/tests/tm_csvs/make_chicken_curry.csv b/tests/tm_csvs/make_chicken_curry.csv index a0cbb44a..47891265 100644 --- a/tests/tm_csvs/make_chicken_curry.csv +++ b/tests/tm_csvs/make_chicken_curry.csv @@ -19,7 +19,7 @@ diced__beefsteak_tomato.n.01_1, tool, carving_knife.n.01_1, container, -chopping_board.n.01_1 +chopping_board.n.01_1, STEP 3 input-objects, vidalia_onion.n.01_1, @@ -28,7 +28,7 @@ diced__vidalia_onion.n.01_1, tool, carving_knife.n.01_1, container, -chopping_board.n.01_1 +chopping_board.n.01_1, STEP 4, input-objects, diced__chicken_breast.n.01_1, diff --git a/tests/tm_csvs/make_clam_chowder.csv b/tests/tm_csvs/make_clam_chowder.csv index efe3f042..bdff2db5 100644 --- a/tests/tm_csvs/make_clam_chowder.csv +++ b/tests/tm_csvs/make_clam_chowder.csv @@ -1,15 +1,15 @@ STEP 1,Unnamed: 1,Unnamed: 2 input-objects,, -clam.n.01_1,sliced, -onion.n.03_1,sliced, -potato.n.01_1,sliced, +clam.n.03_1,, +diced__vidalia_onion.n.01_1,, +diced__potato.n.01_1,sliced, flour.n.01_1,, -cream.n.02_1,, +heavy_cream.n.01_1,, salt.n.02_1,, -butter.n.01_1,melted, +melted__butter.n.01_1,, output-objects,, chowder.n.01_1,hot,cooked tool,, stove.n.01_1,, container,, -stockpot.n.01_1,filled, +stockpot.n.01_1,contains, diff --git a/tests/tm_csvs/make_gazpacho.csv b/tests/tm_csvs/make_gazpacho.csv index dcf80480..128fa01a 100644 --- a/tests/tm_csvs/make_gazpacho.csv +++ b/tests/tm_csvs/make_gazpacho.csv @@ -12,4 +12,4 @@ gazpacho.n.01_1, tool, blender.n.01_1, container, -bowl.n.01_1,filled +bowl.n.01_1,contains diff --git a/tests/tm_csvs/make_granola.csv b/tests/tm_csvs/make_granola.csv index d46efad2..eb64aa3f 100644 --- a/tests/tm_csvs/make_granola.csv +++ b/tests/tm_csvs/make_granola.csv @@ -1,6 +1,6 @@ STEP 1,Unnamed: 1 input-objects, -oat.n.01_1, +oat.n.02_1, honey.n.01_1, cinnamon.n.03_1, pecan.n.03_1, diff --git a/tests/tm_csvs/make_lamb_stew.csv b/tests/tm_csvs/make_lamb_stew.csv index 0b7f977e..1ab6becb 100644 --- a/tests/tm_csvs/make_lamb_stew.csv +++ b/tests/tm_csvs/make_lamb_stew.csv @@ -11,7 +11,7 @@ STEP 2, input-objects, carrot.n.03_1, output-objects, -diced__carrot.n.03_1, +diced__carrot.n.01_1, tool, carving_knife.n.01_1, container, @@ -39,7 +39,7 @@ input-objects, diced__lamb.n.01_1, olive_oil.n.01_1, diced__vidalia_onion.n.01_1, -diced__carrot.n.03_1, +diced__carrot.n.01_1, diced__potato.n.01_1, beef_broth.n.01_1, salt.n.02_1, diff --git a/tests/tm_csvs/make_macaroni_and_cheese.csv b/tests/tm_csvs/make_macaroni_and_cheese.csv index 9cdf4adf..eaa82c15 100644 --- a/tests/tm_csvs/make_macaroni_and_cheese.csv +++ b/tests/tm_csvs/make_macaroni_and_cheese.csv @@ -32,4 +32,4 @@ macaroni_and_cheese.n.01_1,cooked, tool,, oven.n.01_1,, container,, -casserole.n.01_1,inside, +casserole.n.02_1,inside, diff --git a/tests/tm_csvs/make_oatmeal.csv b/tests/tm_csvs/make_oatmeal.csv index 36dec341..074c18ec 100644 --- a/tests/tm_csvs/make_oatmeal.csv +++ b/tests/tm_csvs/make_oatmeal.csv @@ -3,7 +3,7 @@ input-objects, salt.n.02_1, cinnamon.n.03_1, honey.n.01_1, -oat.n.01_1, +oat.n.02_1, low-fat_milk.n.01_1, water.n.06_1, output-objects, diff --git a/tests/tm_csvs/make_pasta_sauce.csv b/tests/tm_csvs/make_pasta_sauce.csv index 0ce43d7a..6b23ef19 100644 --- a/tests/tm_csvs/make_pasta_sauce.csv +++ b/tests/tm_csvs/make_pasta_sauce.csv @@ -41,7 +41,7 @@ basil.n.03_1, basil.n.03_2, basil.n.03_3, basil.n.03_4, -oregano.n.01_1, +marjoram.n.02_1, granulated_sugar.n.01_1, salt.n.02_1, output-objects, diff --git a/tests/tm_csvs/make_pizza.csv b/tests/tm_csvs/make_pizza.csv index f505ca5b..4a73ab6f 100644 --- a/tests/tm_csvs/make_pizza.csv +++ b/tests/tm_csvs/make_pizza.csv @@ -41,7 +41,7 @@ pepperoni.n.01_4,cooked pepperoni.n.01_5,cooked pepperoni.n.01_6,cooked pepperoni.n.01_7,cooked -oregano.n.01_1, +marjoram.n.02_1, half__mushroom.n.05_1,not cooked half__mushroom.n.05_2,not cooked half__mushroom.n.05_3,not cooked diff --git a/tests/tm_csvs/make_pizza_sauce.csv b/tests/tm_csvs/make_pizza_sauce.csv index 6381c4ca..3fe00370 100644 --- a/tests/tm_csvs/make_pizza_sauce.csv +++ b/tests/tm_csvs/make_pizza_sauce.csv @@ -2,7 +2,7 @@ STEP 1,Unnamed: 1 input-objects, beefsteak_tomato.n.01_1, tomato_paste.n.01_1, -oregano.n.01_1, +marjoram.n.02_1, clove.n.03_1, clove.n.03_2, salt.n.02_1, diff --git a/tests/tm_csvs/make_seafood_stew.csv b/tests/tm_csvs/make_seafood_stew.csv index 18b13e6d..5dea3bce 100644 --- a/tests/tm_csvs/make_seafood_stew.csv +++ b/tests/tm_csvs/make_seafood_stew.csv @@ -3,7 +3,7 @@ STEP 1, input-objects, bell_pepper.n.02_1, output-objects, -diced__bell_pepper.n.02_1, +diced__bell_pepper.n.01_1, tool, carving_knife.n.01_1, container, @@ -12,11 +12,11 @@ STEP 2, input-objects, clove.n.03_1, clove.n.03_2, -clove.n.03_3, +clove.n.03_3,clove.n.03 clove.n.03_4, clove.n.03_5, output-objects, -diced__clove.n.03_1, +diced__clove.n.01_1, tool, carving_knife.n.01_1, container, @@ -32,28 +32,28 @@ container, chopping_board.n.01_1,ontop STEP 5, input-objects, -diced__bell_pepper.n.02_1, -diced__clove.n.03_1, +diced__bell_pepper.n.01_1, +diced__clove.n.01_1, olive_oil.n.01_1, diced__beefsteak_tomato.n.01_1, tomato_sauce.n.01_1, chicken_broth.n.01_1, -clam.n.01_1,not cooked -clam.n.01_2,not cooked -clam.n.01_3,not cooked -clam.n.01_4,not cooked -clam.n.01_5,not cooked -clam.n.01_6,not cooked -shrimp.n.03_1,not cooked -shrimp.n.03_2,not cooked -shrimp.n.03_3,not cooked -shrimp.n.03_4,not cooked -shrimp.n.03_5,not cooked +clam.n.03_1,not cooked +clam.n.03_2,not cooked +clam.n.03_3,not cooked +clam.n.03_4,not cooked +clam.n.03_5,not cooked +clam.n.03_6,not cooked +prawn.n.01_1,not cooked +prawn.n.01_2,not cooked +prawn.n.01_3,not cooked +prawn.n.01_4,not cooked +prawn.n.01_5,not cooked scallop.n.02_1,not cooked scallop.n.02_2,not cooked scallop.n.02_3,not cooked scallop.n.02_4,not cooked -oregano.n.01_1, +marjoram.n.02_1, parsley.n.02_1, output-objects, fish_stew.n.01_1, diff --git a/tests/tm_csvs/make_soup.csv b/tests/tm_csvs/make_soup.csv index 054af295..db24ccd0 100644 --- a/tests/tm_csvs/make_soup.csv +++ b/tests/tm_csvs/make_soup.csv @@ -2,7 +2,7 @@ STEP 1,Unnamed: 1,Unnamed: 2 input-objects,, carrot.n.03_1,, output-objects,, -diced__carrot.n.03_1,, +diced__carrot.n.01_1,, tool,, carving_knife.n.01_1,, container,, @@ -19,7 +19,7 @@ chopping_board.n.01_1,, STEP 3,, input-objects,, chicken_broth.n.01_1,, -diced__carrot.n.03_1,, +diced__carrot.n.01_1,, diced__celery.n.02_1,, chicken.n.01_1,not cooked, salt.n.02_1,, diff --git a/tests/tm_csvs/make_stew.csv b/tests/tm_csvs/make_stew.csv index 701c821a..2eb671af 100644 --- a/tests/tm_csvs/make_stew.csv +++ b/tests/tm_csvs/make_stew.csv @@ -4,7 +4,7 @@ carrot.n.03_1, carrot.n.03_2, carrot.n.03_3, output-objects, -diced__carrot.n.03_1, +diced__carrot.n.01_1, tool, carving_knife.n.01_1, container, @@ -21,21 +21,8 @@ container, chopping_board.n.01_1,ontop STEP 3, input-objects, -diced__carrot.n.03_1, +diced__carrot.n.01_1, pea.n.01_1, -pea.n.01_2, -pea.n.01_3, -pea.n.01_4, -pea.n.01_5, -pea.n.01_6, -pea.n.01_7, -pea.n.01_8, -pea.n.01_9, -pea.n.01_10, -pea.n.01_11, -pea.n.01_12, -pea.n.01_13, -pea.n.01_14, diced__vidalia_onion.n.01_1, ground_beef.n.01_1, beef_broth.n.01_1, diff --git a/tests/tm_csvs/make_warm_drinks_for_the_holidays.csv b/tests/tm_csvs/make_warm_drinks_for_the_holidays.csv index 3b85f361..8c2465aa 100644 --- a/tests/tm_csvs/make_warm_drinks_for_the_holidays.csv +++ b/tests/tm_csvs/make_warm_drinks_for_the_holidays.csv @@ -9,4 +9,4 @@ hot_toddy.n.01_1, tool, tablespoon.n.02_1, container, -mug.n.04_1,filled +mug.n.04_1,contains diff --git a/tests/tm_csvs/making_coffee.csv b/tests/tm_csvs/making_coffee.csv index 8356bce6..abbbacfb 100644 --- a/tests/tm_csvs/making_coffee.csv +++ b/tests/tm_csvs/making_coffee.csv @@ -7,4 +7,4 @@ drip_coffee.n.01_1,hot tool, coffee_maker.n.01_1, container, -mug.n.04_1,filled +mug.n.04_1,contains