From c04f22d056a3b313722d2025bcd6efd8eec73e39 Mon Sep 17 00:00:00 2001 From: sanjanasrivastava Date: Fri, 28 Feb 2025 23:02:44 -0800 Subject: [PATCH] starred instances added --- .../adding_chemicals_to_lawn/problem0.bddl | 2 +- .../adding_chemicals_to_pool/problem0.bddl | 2 +- .../adding_fabric_softener/problem0.bddl | 4 +-- .../applying_pesticides/problem0.bddl | 2 +- .../attach_a_camera_to_a_tripod/problem0.bddl | 2 +- .../boil_water_in_the_microwave/problem0.bddl | 2 +- .../boxing_food_after_dinner/problem0.bddl | 2 +- .../bringing_in_kindling/problem0.bddl | 14 +++++----- .../bringing_in_mail/problem0.bddl | 2 +- .../bringing_in_wood/problem0.bddl | 2 +- .../bringing_laundry/problem0.bddl | 2 +- .../bringing_newspaper_in/problem0.bddl | 2 +- .../bringing_water/problem0.bddl | 2 +- .../brushing_lint_off_clothing/problem0.bddl | 10 +++---- .../buy_a_air_conditioner/problem0.bddl | 2 +- .../buy_a_belt/problem0.bddl | 2 +- .../buy_a_good_avocado/problem0.bddl | 2 +- .../buy_a_keg/problem0.bddl | 2 +- .../buy_alcohol/problem0.bddl | 2 +- .../buy_basic_garden_tools/problem0.bddl | 2 +- .../buy_boxes_for_packing/problem0.bddl | 2 +- .../buy_candle_making_supplies/problem0.bddl | 2 +- .../buy_dog_food/problem0.bddl | 2 +- .../buy_eggs/problem0.bddl | 2 +- .../buy_fish/problem0.bddl | 14 +++++----- .../buy_food_for_a_party/problem0.bddl | 4 +-- .../buy_food_for_camping/problem0.bddl | 4 +-- .../buy_good_chocolate/problem0.bddl | 4 +-- .../problem0.bddl | 4 +-- .../buy_meat_from_a_butcher/problem0.bddl | 4 +-- .../buy_mulch/problem0.bddl | 4 +-- .../buy_natural_beef/problem0.bddl | 4 +-- .../buy_natural_supplements/problem0.bddl | 4 +-- .../buy_pet_food_for_less/problem0.bddl | 4 +-- .../buy_rechargeable_batteries/problem0.bddl | 4 +-- .../buy_salad_greens/problem0.bddl | 4 +-- .../buy_school_supplies/problem0.bddl | 4 +-- .../problem0.bddl | 4 +-- .../problem0.bddl | 4 +-- .../buying_cleaning_supplies/problem0.bddl | 6 ++-- .../problem0.bddl | 6 ++-- .../buying_fast_food/problem0.bddl | 4 +-- .../buying_gardening_supplies/problem0.bddl | 4 +-- .../buying_groceries/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../buying_office_supplies/problem0.bddl | 2 +- .../buying_postage_stamps/problem0.bddl | 4 +-- .../can_beans/problem0.bddl | 2 +- .../can_fruit/problem0.bddl | 2 +- .../can_meat/problem0.bddl | 2 +- .../can_vegetables/problem0.bddl | 2 +- .../canning_food/problem0.bddl | 4 +-- .../carrying_in_groceries/problem0.bddl | 4 +-- .../problem0.bddl | 2 +- .../carrying_water/problem0.bddl | 14 +++++----- .../changing_dogs_water/problem0.bddl | 2 +- .../changing_sheets/problem0.bddl | 4 +-- .../chlorinating_the_pool/problem0.bddl | 2 +- .../chop_an_onion/problem0.bddl | 2 +- .../clean_a_LED_screen/problem0.bddl | 2 +- .../clean_a_broiler_pan/problem0.bddl | 2 +- .../clean_a_company_office/problem0.bddl | 2 +- .../clean_a_couch/problem0.bddl | 2 +- .../clean_a_drain/problem0.bddl | 2 +- .../clean_a_faucet/problem0.bddl | 2 +- .../clean_a_felt_pool_table_top/problem0.bddl | 2 +- .../clean_a_fence/problem0.bddl | 2 +- .../clean_a_hot_water_dispenser/problem0.bddl | 2 +- .../clean_a_kitchen_sink/problem0.bddl | 2 +- .../clean_a_kitchen_table/problem0.bddl | 4 +-- .../clean_a_patio/problem0.bddl | 2 +- .../clean_a_piano/problem0.bddl | 2 +- .../clean_a_sauna/problem0.bddl | 6 ++-- .../clean_a_shower/problem0.bddl | 2 +- .../clean_a_sofa/problem0.bddl | 2 +- .../clean_a_turkey/problem0.bddl | 2 +- .../clean_a_whiteboard/problem0.bddl | 14 +++++----- .../clean_an_electric_kettle/problem0.bddl | 16 +++++------ .../clean_an_office_chair/problem0.bddl | 2 +- .../clean_conch_shells/problem0.bddl | 2 +- .../clean_decking/problem0.bddl | 2 +- .../clean_deer_antlers/problem0.bddl | 2 +- .../clean_grease/problem0.bddl | 16 +++++------ .../clean_mirrors/problem0.bddl | 2 +- .../clean_mussels/problem0.bddl | 2 +- .../clean_outdoor_tiles/problem0.bddl | 2 +- .../clean_oysters/problem0.bddl | 2 +- .../clean_piano_keys/problem0.bddl | 2 +- .../clean_quartz/problem0.bddl | 2 +- .../clean_stainless_steel_sinks/problem0.bddl | 2 +- .../clean_stucco/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../clean_up_broken_glass/problem0.bddl | 2 +- .../clean_up_gasoline/problem0.bddl | 12 ++++---- .../clean_up_spilled_egg/problem0.bddl | 2 +- .../clean_up_water_damage/problem0.bddl | 2 +- .../clean_up_your_desk/problem0.bddl | 4 +-- .../clean_walls/problem0.bddl | 2 +- .../clean_wood_doors/problem0.bddl | 2 +- .../clean_wood_siding/problem0.bddl | 2 +- .../clean_your_electronics/problem0.bddl | 2 +- .../problem0.bddl | 10 +++---- .../clean_your_laundry_room/problem0.bddl | 4 +-- .../problem0.bddl | 2 +- .../cleaning_bathrooms/problem0.bddl | 8 +++--- .../cleaning_bathtub/problem0.bddl | 12 ++++---- .../cleaning_bedroom/problem0.bddl | 4 +-- .../cleaning_carpets/problem0.bddl | 8 +++--- .../cleaning_driveway/problem0.bddl | 2 +- .../cleaning_floors/problem0.bddl | 14 +++++----- .../cleaning_freezer/problem0.bddl | 16 +++++------ .../cleaning_garage/problem0.bddl | 20 ++++++------- .../cleaning_garden_path/problem0.bddl | 2 +- .../cleaning_garden_tools/problem0.bddl | 4 +-- .../cleaning_glasses_off_bar/problem0.bddl | 2 +- .../cleaning_kitchen_cupboard/problem0.bddl | 16 +++++------ .../cleaning_microwave_oven/problem0.bddl | 16 +++++------ .../cleaning_out_drawers/problem0.bddl | 14 +++++----- .../cleaning_oven/problem0.bddl | 20 ++++++------- .../cleaning_parks/problem0.bddl | 2 +- .../cleaning_patio_furniture/problem0.bddl | 2 +- .../cleaning_restaurant_table/problem0.bddl | 4 +-- .../cleaning_shed/problem0.bddl | 2 +- .../cleaning_shoes/problem0.bddl | 14 +++++----- .../cleaning_sneakers/problem0.bddl | 20 ++++++------- .../cleaning_stove/problem0.bddl | 12 ++++---- .../problem0.bddl | 14 +++++----- .../cleaning_the_hot_tub/problem0.bddl | 8 +++--- .../cleaning_the_pool/problem0.bddl | 12 ++++---- .../cleaning_toilet/problem0.bddl | 12 ++++---- .../cleaning_up_after_a_meal/problem0.bddl | 24 ++++++++-------- .../cleaning_up_after_an_event/problem0.bddl | 8 +++--- .../problem0.bddl | 2 +- .../cleaning_up_plates_and_food/problem0.bddl | 4 +-- .../cleaning_up_refrigerator/problem0.bddl | 16 +++++------ .../cleaning_windows/problem0.bddl | 18 ++++++------ .../problem0.bddl | 4 +-- .../problem0.bddl | 4 +-- .../clearing_table_after_coffee/problem0.bddl | 2 +- .../clearing_table_after_dinner/problem0.bddl | 4 +-- .../clearing_table_after_supper/problem0.bddl | 4 +-- .../cold_brew_coffee/problem0.bddl | 2 +- .../collecting_childrens_toys/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../collecting_wood/problem0.bddl | 2 +- .../cook_arepas/problem0.bddl | 14 +++++----- .../cook_broccolini/problem0.bddl | 14 +++++----- .../cook_lasagne/problem0.bddl | 8 +++--- .../covering_boat/problem0.bddl | 2 +- .../de_clutter_your_garage/problem0.bddl | 6 ++-- .../problem0.bddl | 4 +-- .../problem0.bddl | 6 ++-- .../defrosting_freezer/problem0.bddl | 22 +++++++-------- .../problem0.bddl | 4 +-- .../disinfect_laundry/problem0.bddl | 2 +- .../dispose_of_a_pizza_box/problem0.bddl | 2 +- .../doing_housework_for_adult/problem0.bddl | 6 ++-- .../drying_table/problem0.bddl | 2 +- .../emptying_trash_cans/problem0.bddl | 2 +- .../fixing_broken_chair/problem0.bddl | 6 ++-- .../folding_clean_laundry/problem0.bddl | 2 +- .../folding_clothes/problem0.bddl | 2 +- .../folding_piece_of_cloth/problem0.bddl | 2 +- .../freeze_fruit/problem0.bddl | 2 +- .../freeze_lasagna/problem0.bddl | 4 +-- .../freeze_pies/problem0.bddl | 2 +- .../freeze_quiche/problem0.bddl | 2 +- .../freeze_vegetables/problem0.bddl | 2 +- .../getting_organized_for_work/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../hand_washing_clothing/problem0.bddl | 2 +- .../hang_a_dartboard/problem0.bddl | 2 +- .../hang_icicle_lights/problem0.bddl | 2 +- .../hang_paper_lanterns/problem0.bddl | 2 +- .../hanging_blinds/problem0.bddl | 2 +- .../hanging_outdoor_lights/problem0.bddl | 2 +- .../hanging_pictures/problem0.bddl | 2 +- .../hanging_shades/problem0.bddl | 2 +- .../heating_food_up/problem0.bddl | 2 +- .../hiding_Easter_eggs/problem0.bddl | 6 ++-- .../installing_a_fax_machine/problem0.bddl | 8 +++--- .../installing_a_fence/problem0.bddl | 4 +-- .../installing_a_modem/problem0.bddl | 8 +++--- .../installing_a_printer/problem0.bddl | 6 ++-- .../installing_a_scanner/problem0.bddl | 8 +++--- .../installing_alarms/problem0.bddl | 8 +++--- .../installing_carpet/problem0.bddl | 2 +- .../lay_sod/problem0.bddl | 2 +- .../laying_clothes_out/problem0.bddl | 4 +-- .../laying_out_a_feast/problem0.bddl | 2 +- .../laying_out_snacks_at_work/problem0.bddl | 14 +++++----- .../laying_paving_stones/problem0.bddl | 8 +++--- .../problem0.bddl | 2 +- .../laying_tile_floors/problem0.bddl | 2 +- .../laying_wood_floors/problem0.bddl | 10 +++---- .../lighting_fireplace/problem0.bddl | 10 +++---- .../loading_the_dishwasher/problem0.bddl | 4 +-- .../make_a_car_emergency_kit/problem0.bddl | 16 +++++------ .../make_a_chia_breakfast_bowl/problem0.bddl | 28 +++++++++---------- .../make_a_clothes_line/problem0.bddl | 2 +- .../make_a_lunch_box/problem0.bddl | 14 +++++----- .../make_cinnamon_toast/problem0.bddl | 20 ++++++------- .../problem0.bddl | 2 +- .../make_the_workplace_exciting/problem0.bddl | 4 +-- .../making_the_bed/problem0.bddl | 2 +- .../mopping_floors/problem0.bddl | 2 +- .../mopping_the_kitchen_floor/problem0.bddl | 2 +- .../moving_boxes_to_storage/problem0.bddl | 4 +-- .../mowing_the_lawn/problem0.bddl | 10 +++---- .../mulching/problem0.bddl | 2 +- .../organizing_art_supplies/problem0.bddl | 16 +++++------ .../organizing_boxes_in_garage/problem0.bddl | 16 +++++------ .../organizing_file_cabinet/problem0.bddl | 4 +-- .../problem0.bddl | 2 +- .../organizing_office_documents/problem0.bddl | 2 +- .../organizing_school_stuff/problem0.bddl | 2 +- .../outfit_a_basic_toolbox/problem0.bddl | 2 +- .../pack_a_beach_bag/problem0.bddl | 2 +- .../pack_a_pencil_case/problem0.bddl | 2 +- .../packing_bags_or_suitcase/problem0.bddl | 22 +++++++-------- .../problem0.bddl | 2 +- .../packing_hobby_equipment/problem0.bddl | 18 ++++++------ .../packing_moving_van/problem0.bddl | 14 +++++----- .../painting_house_exterior/problem0.bddl | 8 +++--- .../painting_porch/problem0.bddl | 2 +- .../passing_out_drinks/problem0.bddl | 2 +- .../paying_for_purchases/problem0.bddl | 2 +- .../picking_up_clothes/problem0.bddl | 2 +- .../picking_up_litter/problem0.bddl | 2 +- .../picking_up_take_out_food/problem0.bddl | 8 +++--- .../picking_up_toys/problem0.bddl | 2 +- .../problem0.bddl | 4 +-- .../planting_trees/problem0.bddl | 2 +- .../polish_wood_floors/problem0.bddl | 2 +- .../polishing_furniture/problem0.bddl | 10 +++---- .../polishing_shoes/problem0.bddl | 10 +++---- .../polishing_silver/problem0.bddl | 10 +++---- .../pouring_water_in_a_glass/problem0.bddl | 14 +++++----- .../prepare_a_breakfast_bar/problem0.bddl | 2 +- .../prepare_a_slow_dinner_party/problem0.bddl | 2 +- .../prepare_wine_and_cheese/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 8 +++--- .../problem0.bddl | 4 +-- .../put_together_a_goodie_bag/problem0.bddl | 2 +- .../problem0.bddl | 10 +++---- .../problem0.bddl | 12 ++++---- .../problem0.bddl | 4 +-- .../putting_away_bicycles/problem0.bddl | 8 +++--- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../putting_bike_in_garage/problem0.bddl | 2 +- .../putting_clean_laundry_away/problem0.bddl | 4 +-- .../problem0.bddl | 2 +- .../problem0.bddl | 10 +++---- .../putting_food_in_fridge/problem0.bddl | 2 +- .../putting_in_a_hot_tub/problem0.bddl | 2 +- .../putting_leftovers_away/problem0.bddl | 12 ++++---- .../problem0.bddl | 2 +- .../putting_meal_on_plate/problem0.bddl | 22 +++++++-------- .../putting_out_cat_food/problem0.bddl | 2 +- .../putting_out_condiments/problem0.bddl | 2 +- .../putting_out_dog_food/problem0.bddl | 2 +- .../putting_pesticides_on_lawn/problem0.bddl | 2 +- .../putting_roast_in_oven/problem0.bddl | 2 +- .../putting_shoes_on_rack/problem0.bddl | 10 +++---- .../putting_shopping_away/problem0.bddl | 4 +-- .../putting_tablecloth_on_table/problem0.bddl | 2 +- .../putting_towels_in_bathroom/problem0.bddl | 2 +- .../problem0.bddl | 4 +-- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../problem0.bddl | 4 +-- .../putting_up_posters/problem0.bddl | 2 +- .../putting_wood_in_fireplace/problem0.bddl | 2 +- .../re_shelving_library_books/problem0.bddl | 10 +++---- .../rearrange_your_room/problem0.bddl | 2 +- .../rearranging_furniture/problem0.bddl | 14 +++++----- .../problem0.bddl | 6 ++-- .../remove_a_wall_mirror/problem0.bddl | 2 +- .../remove_hard_water_spots/problem0.bddl | 2 +- .../remove_sod/problem0.bddl | 2 +- .../removing_ice_from_walkways/problem0.bddl | 2 +- .../returning_consumer_goods/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../rinsing_dishes/problem0.bddl | 2 +- .../sanding_wood_furniture/problem0.bddl | 2 +- .../scrubbing_bathroom_floor/problem0.bddl | 2 +- .../serving_food_on_the_table/problem0.bddl | 2 +- .../serving_hors_d_oeuvres/problem0.bddl | 18 ++++++------ .../set_a_dinner_table/problem0.bddl | 2 +- .../set_a_fancy_table/problem0.bddl | 6 ++-- .../set_a_table_for_a_tea_party/problem0.bddl | 2 +- .../set_up_a_buffet/problem0.bddl | 2 +- .../problem0.bddl | 22 +++++++-------- .../set_up_a_guinea_pig_cage/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../set_up_a_hot_dog_bar/problem0.bddl | 2 +- .../set_up_a_mouse_cage/problem0.bddl | 2 +- .../problem0.bddl | 6 ++-- .../setting_mousetraps/problem0.bddl | 10 +++---- .../setting_table_for_coffee/problem0.bddl | 4 +-- .../setting_the_fire/problem0.bddl | 2 +- .../setting_the_table/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../setting_up_for_an_event/problem0.bddl | 2 +- .../setting_up_garden_furniture/problem0.bddl | 4 +-- .../problem0.bddl | 18 ++++++------ .../setting_up_room_for_a_movie/problem0.bddl | 4 +-- .../setting_up_room_for_games/problem0.bddl | 14 +++++----- .../setting_up_silent_auction/problem0.bddl | 2 +- .../setting_up_toy_train_track/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../setup_a_garden_party/problem0.bddl | 2 +- .../problem0.bddl | 20 ++++++------- .../shoveling_coal/problem0.bddl | 4 +-- .../shoveling_snow/problem0.bddl | 4 +-- .../sorting_art_supplies/problem0.bddl | 2 +- .../sorting_books_on_shelf/problem0.bddl | 2 +- .../sorting_clothes/problem0.bddl | 2 +- .../sorting_household_items/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../spray_stucco/problem0.bddl | 2 +- .../spraying_for_bugs/problem0.bddl | 2 +- .../spraying_fruit_trees/problem0.bddl | 2 +- .../stacking_wood/problem0.bddl | 2 +- .../staining_wood_furniture/problem0.bddl | 2 +- .../stash_snacks_in_your_room/problem0.bddl | 22 +++++++-------- .../stock_a_bar/problem0.bddl | 2 +- .../stock_grocery_shelves/problem0.bddl | 22 +++++++-------- .../store_a_fur_coat/problem0.bddl | 2 +- .../store_a_kayak/problem0.bddl | 2 +- .../store_a_quilt/problem0.bddl | 2 +- .../store_an_uncooked_turkey/problem0.bddl | 12 ++++---- .../store_baby_clothes/problem0.bddl | 2 +- .../store_baking_soda/problem0.bddl | 2 +- .../store_batteries/problem0.bddl | 2 +- .../store_beer/problem0.bddl | 2 +- .../store_bobby_pins/problem0.bddl | 2 +- .../store_brownies/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../store_daffodil_bulbs/problem0.bddl | 2 +- .../store_feta_cheese/problem0.bddl | 2 +- .../store_firewood/problem0.bddl | 8 +++--- .../store_firewood_outdoors/problem0.bddl | 2 +- .../store_honey/problem0.bddl | 10 +++---- .../store_loose_leaf_tea/problem0.bddl | 2 +- .../store_nuts/problem0.bddl | 12 ++++---- .../store_produce/problem0.bddl | 4 +-- .../store_rugs/problem0.bddl | 2 +- .../store_silver_coins/problem0.bddl | 2 +- .../store_tulip_bulbs/problem0.bddl | 2 +- .../store_vintage_linens/problem0.bddl | 8 +++--- .../store_vodka/problem0.bddl | 8 +++--- .../store_whole_grains/problem0.bddl | 12 ++++---- .../store_winter_coats/problem0.bddl | 2 +- .../storing_food/problem0.bddl | 16 +++++------ .../sweeping_floors/problem0.bddl | 2 +- .../sweeping_garage/problem0.bddl | 2 +- .../sweeping_outside_entrance/problem0.bddl | 2 +- .../sweeping_patio/problem0.bddl | 2 +- .../sweeping_porch/problem0.bddl | 2 +- .../problem0.bddl | 2 +- .../taking_fish_out_of_freezer/problem0.bddl | 10 +++---- .../taking_trash_outside/problem0.bddl | 2 +- .../throwing_out_used_napkins/problem0.bddl | 2 +- .../tidy_your_garden/problem0.bddl | 2 +- .../tidying_bathroom/problem0.bddl | 4 +-- .../tidying_bedroom/problem0.bddl | 4 +-- .../tidying_living_room/problem0.bddl | 4 +-- .../tidying_up_wardrobe/problem0.bddl | 2 +- .../treating_clothes/problem0.bddl | 2 +- .../turning_off_the_hot_tub/problem0.bddl | 2 +- .../turning_on_the_hot_tub/problem0.bddl | 2 +- .../problem0.bddl | 4 +-- .../unhook_a_fish/problem0.bddl | 2 +- .../unloading_groceries/problem0.bddl | 4 +-- .../unloading_shopping_from_car/problem0.bddl | 4 +-- .../unloading_shopping_items/problem0.bddl | 26 ++++++++--------- .../unpacking_car_for_trip/problem0.bddl | 2 +- .../unpacking_childs_bag/problem0.bddl | 2 +- .../unpacking_hobby_equipment/problem0.bddl | 2 +- .../unpacking_moving_van/problem0.bddl | 6 ++-- .../problem0.bddl | 2 +- .../unpacking_suitcase/problem0.bddl | 8 +++--- .../vacuuming_floors/problem0.bddl | 6 ++-- .../vacuuming_vehicles/problem0.bddl | 10 +++---- .../wash_a_leotard/problem0.bddl | 2 +- .../wash_baby_bottles/problem0.bddl | 2 +- .../wash_duvets/problem0.bddl | 2 +- .../washing_floor/problem0.bddl | 18 ++++++------ .../washing_outside_walls/problem0.bddl | 2 +- .../washing_pots_and_pans/problem0.bddl | 18 ++++++------ .../washing_walls/problem0.bddl | 2 +- .../washing_windows/problem0.bddl | 2 +- .../water_your_lawn_efficiently/problem0.bddl | 2 +- .../watering_outdoor_flowers/problem0.bddl | 2 +- .../waxing_floors/problem0.bddl | 2 +- .../wrap_silverware/problem0.bddl | 2 +- 404 files changed, 1015 insertions(+), 1015 deletions(-) diff --git a/bddl/activity_definitions/adding_chemicals_to_lawn/problem0.bddl b/bddl/activity_definitions/adding_chemicals_to_lawn/problem0.bddl index c176335d..83428632 100644 --- a/bddl/activity_definitions/adding_chemicals_to_lawn/problem0.bddl +++ b/bddl/activity_definitions/adding_chemicals_to_lawn/problem0.bddl @@ -7,7 +7,7 @@ fertilizer__atomizer.n.01_1 - fertilizer__atomizer.n.01 herbicide.n.01_1 - herbicide.n.01 fertilizer.n.01_1 - fertilizer.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/adding_chemicals_to_pool/problem0.bddl b/bddl/activity_definitions/adding_chemicals_to_pool/problem0.bddl index e106951e..b55d6d1a 100644 --- a/bddl/activity_definitions/adding_chemicals_to_pool/problem0.bddl +++ b/bddl/activity_definitions/adding_chemicals_to_pool/problem0.bddl @@ -8,7 +8,7 @@ disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 disinfectant.n.01_1 - disinfectant.n.01 water.n.06_1 - water.n.06 - pool.n.01_1 - pool.n.01 + pool.n.01_1 pool.n.01_* - pool.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/adding_fabric_softener/problem0.bddl b/bddl/activity_definitions/adding_fabric_softener/problem0.bddl index 8cce2186..cfcd1257 100644 --- a/bddl/activity_definitions/adding_fabric_softener/problem0.bddl +++ b/bddl/activity_definitions/adding_fabric_softener/problem0.bddl @@ -3,11 +3,11 @@ (:objects wrinkle.n.01_1 - wrinkle.n.01 - washer.n.03_1 - washer.n.03 + washer.n.03_1 washer.n.03_* - washer.n.03 sheet.n.03_1 - sheet.n.03 floor.n.01_1 - floor.n.01 fabric_softener.n.01_1 - fabric_softener.n.01 - fabric_softener__bottle.n.01_1 - fabric_softener__bottle.n.01 + fabric_softener__bottle.n.01_1 - fabric_softener__bottle.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/applying_pesticides/problem0.bddl b/bddl/activity_definitions/applying_pesticides/problem0.bddl index 58828971..dca75356 100644 --- a/bddl/activity_definitions/applying_pesticides/problem0.bddl +++ b/bddl/activity_definitions/applying_pesticides/problem0.bddl @@ -4,7 +4,7 @@ (:objects pesticide__atomizer.n.01_1 - pesticide__atomizer.n.01 floor.n.01_1 - floor.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 pesticide.n.01_1 - pesticide.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/attach_a_camera_to_a_tripod/problem0.bddl b/bddl/activity_definitions/attach_a_camera_to_a_tripod/problem0.bddl index 7b9cd5b0..3ba0aaa4 100644 --- a/bddl/activity_definitions/attach_a_camera_to_a_tripod/problem0.bddl +++ b/bddl/activity_definitions/attach_a_camera_to_a_tripod/problem0.bddl @@ -4,7 +4,7 @@ (:objects digital_camera.n.01_1 - digital_camera.n.01 camera_tripod.n.01_1 - camera_tripod.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/boil_water_in_the_microwave/problem0.bddl b/bddl/activity_definitions/boil_water_in_the_microwave/problem0.bddl index bb826a7e..43246595 100644 --- a/bddl/activity_definitions/boil_water_in_the_microwave/problem0.bddl +++ b/bddl/activity_definitions/boil_water_in_the_microwave/problem0.bddl @@ -8,7 +8,7 @@ cabinet.n.01_1 - cabinet.n.01 sink.n.01_1 - sink.n.01 floor.n.01_1 - floor.n.01 - microwave.n.02_1 - microwave.n.02 + microwave.n.02_1 microwave.n.02_* - microwave.n.02 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/boxing_food_after_dinner/problem0.bddl b/bddl/activity_definitions/boxing_food_after_dinner/problem0.bddl index 1672493c..80382c5a 100644 --- a/bddl/activity_definitions/boxing_food_after_dinner/problem0.bddl +++ b/bddl/activity_definitions/boxing_food_after_dinner/problem0.bddl @@ -3,7 +3,7 @@ (:objects breakfast_table.n.01_1 - breakfast_table.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 kabob.n.01_1 kabob.n.01_2 kabob.n.01_3 - kabob.n.01 plate.n.04_1 plate.n.04_2 plate.n.04_3 - plate.n.04 tupperware.n.01_1 - tupperware.n.01 diff --git a/bddl/activity_definitions/bringing_in_kindling/problem0.bddl b/bddl/activity_definitions/bringing_in_kindling/problem0.bddl index c919e32e..22c2bc6b 100644 --- a/bddl/activity_definitions/bringing_in_kindling/problem0.bddl +++ b/bddl/activity_definitions/bringing_in_kindling/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - firewood.n.01_1 firewood.n.01_2 firewood.n.01_3 - firewood.n.01 - lawn.n.01_1 - lawn.n.01 - disinfectant.n.01_1 - disinfectant.n.01 - coffee_table.n.01_1 - coffee_table.n.01 - wood_fireplace.n.01_1 - wood_fireplace.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - agent.n.01_1 - agent.n.01 + firewood.n.01_1 firewood.n.01_2 firewood.n.01_3 - firewood.n.01 + lawn.n.01_1 - lawn.n.01 + disinfectant.n.01_1 - disinfectant.n.01 + coffee_table.n.01_1 - coffee_table.n.01 + wood_fireplace.n.01_1 wood_fireplace.n.01_* - wood_fireplace.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/bringing_in_mail/problem0.bddl b/bddl/activity_definitions/bringing_in_mail/problem0.bddl index fef8196c..5f8e8871 100644 --- a/bddl/activity_definitions/bringing_in_mail/problem0.bddl +++ b/bddl/activity_definitions/bringing_in_mail/problem0.bddl @@ -5,7 +5,7 @@ mailbox.n.01_1 - mailbox.n.01 lawn.n.01_1 - lawn.n.01 mail.n.04_1 - mail.n.04 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/bringing_in_wood/problem0.bddl b/bddl/activity_definitions/bringing_in_wood/problem0.bddl index e0f1f4ec..bb260a57 100644 --- a/bddl/activity_definitions/bringing_in_wood/problem0.bddl +++ b/bddl/activity_definitions/bringing_in_wood/problem0.bddl @@ -3,7 +3,7 @@ (:objects plywood.n.01_1 plywood.n.01_2 plywood.n.01_3 - plywood.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/bringing_laundry/problem0.bddl b/bddl/activity_definitions/bringing_laundry/problem0.bddl index 0f7dcd6b..1819afd2 100644 --- a/bddl/activity_definitions/bringing_laundry/problem0.bddl +++ b/bddl/activity_definitions/bringing_laundry/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - washer.n.03_1 - washer.n.03 + washer.n.03_1 washer.n.03_* - washer.n.03 stain.n.01_1 - stain.n.01 garment.n.01_1 garment.n.01_2 - garment.n.01 hamper.n.02_1 - hamper.n.02 diff --git a/bddl/activity_definitions/bringing_newspaper_in/problem0.bddl b/bddl/activity_definitions/bringing_newspaper_in/problem0.bddl index 5c63bf14..ab22b2f7 100644 --- a/bddl/activity_definitions/bringing_newspaper_in/problem0.bddl +++ b/bddl/activity_definitions/bringing_newspaper_in/problem0.bddl @@ -4,7 +4,7 @@ (:objects newspaper.n.03_1 - newspaper.n.03 driveway.n.01_1 - driveway.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/bringing_water/problem0.bddl b/bddl/activity_definitions/bringing_water/problem0.bddl index 987a83df..b210976d 100644 --- a/bddl/activity_definitions/bringing_water/problem0.bddl +++ b/bddl/activity_definitions/bringing_water/problem0.bddl @@ -4,7 +4,7 @@ (:objects water_bottle.n.01_1 water_bottle.n.01_2 - water_bottle.n.01 lawn.n.01_1 - lawn.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/brushing_lint_off_clothing/problem0.bddl b/bddl/activity_definitions/brushing_lint_off_clothing/problem0.bddl index 07bdef43..3d8ec0e9 100644 --- a/bddl/activity_definitions/brushing_lint_off_clothing/problem0.bddl +++ b/bddl/activity_definitions/brushing_lint_off_clothing/problem0.bddl @@ -3,11 +3,11 @@ (:objects dust.n.01_1 - dust.n.01 - sweater.n.01_1 sweater.n.01_2 sweater.n.01_3 sweater.n.01_4 - sweater.n.01 - floor.n.01_1 - floor.n.01 - bed.n.01_1 - bed.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - agent.n.01_1 - agent.n.01 + sweater.n.01_1 sweater.n.01_2 sweater.n.01_3 sweater.n.01_4 - sweater.n.01 + floor.n.01_1 - floor.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/buy_a_air_conditioner/problem0.bddl b/bddl/activity_definitions/buy_a_air_conditioner/problem0.bddl index afe2f9dc..2611d9e7 100644 --- a/bddl/activity_definitions/buy_a_air_conditioner/problem0.bddl +++ b/bddl/activity_definitions/buy_a_air_conditioner/problem0.bddl @@ -5,7 +5,7 @@ money.n.01_1 - money.n.01 air_conditioner.n.01_1 - air_conditioner.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_a_belt/problem0.bddl b/bddl/activity_definitions/buy_a_belt/problem0.bddl index 8febd25b..596c6ac9 100644 --- a/bddl/activity_definitions/buy_a_belt/problem0.bddl +++ b/bddl/activity_definitions/buy_a_belt/problem0.bddl @@ -3,7 +3,7 @@ (:objects shopping_basket.n.01_1 - shopping_basket.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 belt.n.02_1 - belt.n.02 money.n.01_1 - money.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/buy_a_good_avocado/problem0.bddl b/bddl/activity_definitions/buy_a_good_avocado/problem0.bddl index 9fc42253..37b6a206 100644 --- a/bddl/activity_definitions/buy_a_good_avocado/problem0.bddl +++ b/bddl/activity_definitions/buy_a_good_avocado/problem0.bddl @@ -5,7 +5,7 @@ avocado.n.01_1 - avocado.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 money.n.01_1 - money.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_a_keg/problem0.bddl b/bddl/activity_definitions/buy_a_keg/problem0.bddl index 91a1a522..3868a7b5 100644 --- a/bddl/activity_definitions/buy_a_keg/problem0.bddl +++ b/bddl/activity_definitions/buy_a_keg/problem0.bddl @@ -5,7 +5,7 @@ beer_barrel.n.01_1 - beer_barrel.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 credit_card.n.01_1 - credit_card.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_alcohol/problem0.bddl b/bddl/activity_definitions/buy_alcohol/problem0.bddl index 4d76e36f..06073dc5 100644 --- a/bddl/activity_definitions/buy_alcohol/problem0.bddl +++ b/bddl/activity_definitions/buy_alcohol/problem0.bddl @@ -8,7 +8,7 @@ grocery_shelf.n.01_1 - grocery_shelf.n.01 money.n.01_1 - money.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_basic_garden_tools/problem0.bddl b/bddl/activity_definitions/buy_basic_garden_tools/problem0.bddl index 319aa104..3dc36b1a 100644 --- a/bddl/activity_definitions/buy_basic_garden_tools/problem0.bddl +++ b/bddl/activity_definitions/buy_basic_garden_tools/problem0.bddl @@ -6,7 +6,7 @@ grocery_shelf.n.01_1 - grocery_shelf.n.01 rake.n.03_1 - rake.n.03 money.n.01_1 - money.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 backpack.n.01_1 - backpack.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/buy_boxes_for_packing/problem0.bddl b/bddl/activity_definitions/buy_boxes_for_packing/problem0.bddl index 6925fb5b..31871124 100644 --- a/bddl/activity_definitions/buy_boxes_for_packing/problem0.bddl +++ b/bddl/activity_definitions/buy_boxes_for_packing/problem0.bddl @@ -5,7 +5,7 @@ carton.n.02_1 carton.n.02_2 - carton.n.02 money.n.01_1 - money.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.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 76c5e6ea..157528d4 100644 --- a/bddl/activity_definitions/buy_candle_making_supplies/problem0.bddl +++ b/bddl/activity_definitions/buy_candle_making_supplies/problem0.bddl @@ -7,7 +7,7 @@ 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 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_dog_food/problem0.bddl b/bddl/activity_definitions/buy_dog_food/problem0.bddl index 969e26a2..65ce14f5 100644 --- a/bddl/activity_definitions/buy_dog_food/problem0.bddl +++ b/bddl/activity_definitions/buy_dog_food/problem0.bddl @@ -6,7 +6,7 @@ grocery_shelf.n.01_1 - grocery_shelf.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 money.n.01_1 - money.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_eggs/problem0.bddl b/bddl/activity_definitions/buy_eggs/problem0.bddl index e911ddfa..7de4f2b5 100644 --- a/bddl/activity_definitions/buy_eggs/problem0.bddl +++ b/bddl/activity_definitions/buy_eggs/problem0.bddl @@ -7,7 +7,7 @@ grocery_shelf.n.01_1 - grocery_shelf.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 money.n.01_1 - money.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/buy_fish/problem0.bddl b/bddl/activity_definitions/buy_fish/problem0.bddl index 72cd0543..5f8a7175 100644 --- a/bddl/activity_definitions/buy_fish/problem0.bddl +++ b/bddl/activity_definitions/buy_fish/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - salmon.n.03_1 - salmon.n.03 - grocery_shelf.n.01_1 - grocery_shelf.n.01 - money.n.01_1 - money.n.01 - disinfectant.n.01_1 - disinfectant.n.01 - checkout.n.03_1 - checkout.n.03 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + salmon.n.03_1 - salmon.n.03 + grocery_shelf.n.01_1 - grocery_shelf.n.01 + money.n.01_1 - money.n.01 + disinfectant.n.01_1 - disinfectant.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/buy_food_for_a_party/problem0.bddl b/bddl/activity_definitions/buy_food_for_a_party/problem0.bddl index 515e9600..02cdc49b 100644 --- a/bddl/activity_definitions/buy_food_for_a_party/problem0.bddl +++ b/bddl/activity_definitions/buy_food_for_a_party/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 chocolate_cake.n.01_1 - chocolate_cake.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 carton__of__milk.n.01_1 - carton__of__milk.n.01 diff --git a/bddl/activity_definitions/buy_food_for_camping/problem0.bddl b/bddl/activity_definitions/buy_food_for_camping/problem0.bddl index e1e37051..ac123593 100644 --- a/bddl/activity_definitions/buy_food_for_camping/problem0.bddl +++ b/bddl/activity_definitions/buy_food_for_camping/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 water_bottle.n.01_1 water_bottle.n.01_2 - water_bottle.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 grocery_shelf.n.01_4 - grocery_shelf.n.01 bottle__of__soda.n.01_1 bottle__of__soda.n.01_2 - bottle__of__soda.n.01 diff --git a/bddl/activity_definitions/buy_good_chocolate/problem0.bddl b/bddl/activity_definitions/buy_good_chocolate/problem0.bddl index 9eef4e06..578507aa 100644 --- a/bddl/activity_definitions/buy_good_chocolate/problem0.bddl +++ b/bddl/activity_definitions/buy_good_chocolate/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 box__of__chocolates.n.01_1 - box__of__chocolates.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 - grocery_shelf.n.01 bottle__of__cocoa.n.01_1 - bottle__of__cocoa.n.01 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 bfc39c1a..136c2b28 100644 --- a/bddl/activity_definitions/buy_home_use_medical_supplies/problem0.bddl +++ b/bddl/activity_definitions/buy_home_use_medical_supplies/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 sack.n.01_1 - sack.n.01 bottle__of__antihistamines.n.01_1 - bottle__of__antihistamines.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 diff --git a/bddl/activity_definitions/buy_meat_from_a_butcher/problem0.bddl b/bddl/activity_definitions/buy_meat_from_a_butcher/problem0.bddl index 8d547a87..bdcaacd4 100644 --- a/bddl/activity_definitions/buy_meat_from_a_butcher/problem0.bddl +++ b/bddl/activity_definitions/buy_meat_from_a_butcher/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 steak.n.01_1 steak.n.01_2 - steak.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 - grocery_shelf.n.01 brisket.n.01_1 - brisket.n.01 diff --git a/bddl/activity_definitions/buy_mulch/problem0.bddl b/bddl/activity_definitions/buy_mulch/problem0.bddl index 77c67e67..5889d271 100644 --- a/bddl/activity_definitions/buy_mulch/problem0.bddl +++ b/bddl/activity_definitions/buy_mulch/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 pot_plant.n.01_1 pot_plant.n.01_2 pot_plant.n.01_3 - pot_plant.n.01 floor.n.01_1 - floor.n.01 grocery_shelf.n.01_1 - grocery_shelf.n.01 diff --git a/bddl/activity_definitions/buy_natural_beef/problem0.bddl b/bddl/activity_definitions/buy_natural_beef/problem0.bddl index aea22e07..f3966b56 100644 --- a/bddl/activity_definitions/buy_natural_beef/problem0.bddl +++ b/bddl/activity_definitions/buy_natural_beef/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 pack__of__ground_beef.n.01_1 pack__of__ground_beef.n.01_2 pack__of__ground_beef.n.01_3 - pack__of__ground_beef.n.01 money.n.01_1 money.n.01_2 money.n.01_3 - money.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/buy_natural_supplements/problem0.bddl b/bddl/activity_definitions/buy_natural_supplements/problem0.bddl index 2843b985..0f81837e 100644 --- a/bddl/activity_definitions/buy_natural_supplements/problem0.bddl +++ b/bddl/activity_definitions/buy_natural_supplements/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 bottle__of__supplements.n.01_1 bottle__of__supplements.n.01_2 bottle__of__supplements.n.01_3 bottle__of__supplements.n.01_4 - bottle__of__supplements.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 - grocery_shelf.n.01 money.n.01_1 money.n.01_2 money.n.01_3 - money.n.01 diff --git a/bddl/activity_definitions/buy_pet_food_for_less/problem0.bddl b/bddl/activity_definitions/buy_pet_food_for_less/problem0.bddl index 6e8e4710..628c4b56 100644 --- a/bddl/activity_definitions/buy_pet_food_for_less/problem0.bddl +++ b/bddl/activity_definitions/buy_pet_food_for_less/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 can__of__dog_food.n.01_1 can__of__dog_food.n.01_2 - can__of__dog_food.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 - grocery_shelf.n.01 money.n.01_1 money.n.01_2 money.n.01_3 - money.n.01 diff --git a/bddl/activity_definitions/buy_rechargeable_batteries/problem0.bddl b/bddl/activity_definitions/buy_rechargeable_batteries/problem0.bddl index 28626ef8..58c9dcc1 100644 --- a/bddl/activity_definitions/buy_rechargeable_batteries/problem0.bddl +++ b/bddl/activity_definitions/buy_rechargeable_batteries/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 checkout.n.03_1 - checkout.n.03 battery.n.02_1 battery.n.02_2 - battery.n.02 grocery_shelf.n.01_1 - grocery_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 - shopping_cart.n.01_1 - shopping_cart.n.01 + shopping_cart.n.01_1 shopping_cart.n.01_* - shopping_cart.n.01 sack.n.01_1 - sack.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/buy_salad_greens/problem0.bddl b/bddl/activity_definitions/buy_salad_greens/problem0.bddl index 4bd0dc17..82a65dae 100644 --- a/bddl/activity_definitions/buy_salad_greens/problem0.bddl +++ b/bddl/activity_definitions/buy_salad_greens/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 lettuce.n.03_1 - lettuce.n.03 grocery_shelf.n.01_1 - grocery_shelf.n.01 spinach.n.02_1 - spinach.n.02 diff --git a/bddl/activity_definitions/buy_school_supplies/problem0.bddl b/bddl/activity_definitions/buy_school_supplies/problem0.bddl index 07665426..5faa3667 100644 --- a/bddl/activity_definitions/buy_school_supplies/problem0.bddl +++ b/bddl/activity_definitions/buy_school_supplies/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 bottle__of__glue.n.01_1 - bottle__of__glue.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 notebook.n.01_1 notebook.n.01_2 - notebook.n.01 diff --git a/bddl/activity_definitions/buy_school_supplies_for_high_school/problem0.bddl b/bddl/activity_definitions/buy_school_supplies_for_high_school/problem0.bddl index c30e5bb4..9ba9b46f 100644 --- a/bddl/activity_definitions/buy_school_supplies_for_high_school/problem0.bddl +++ b/bddl/activity_definitions/buy_school_supplies_for_high_school/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 backpack.n.01_1 - backpack.n.01 laptop.n.01_1 - laptop.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 diff --git a/bddl/activity_definitions/buy_used_gardening_equipment/problem0.bddl b/bddl/activity_definitions/buy_used_gardening_equipment/problem0.bddl index 74cad95e..1c5195ff 100644 --- a/bddl/activity_definitions/buy_used_gardening_equipment/problem0.bddl +++ b/bddl/activity_definitions/buy_used_gardening_equipment/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 money.n.01_1 money.n.01_2 - money.n.01 glove.n.02_1 glove.n.02_2 - glove.n.02 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 diff --git a/bddl/activity_definitions/buying_cleaning_supplies/problem0.bddl b/bddl/activity_definitions/buying_cleaning_supplies/problem0.bddl index d68d89d2..fe90e7cd 100644 --- a/bddl/activity_definitions/buying_cleaning_supplies/problem0.bddl +++ b/bddl/activity_definitions/buying_cleaning_supplies/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 bottle__of__liquid_soap.n.01_1 - bottle__of__liquid_soap.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 - grocery_shelf.n.01 vacuum.n.04_1 - vacuum.n.04 @@ -12,7 +12,7 @@ atomizer.n.01_1 - atomizer.n.01 money.n.01_1 money.n.01_2 money.n.01_3 money.n.01_4 money.n.01_5 money.n.01_6 - money.n.01 floor.n.01_1 - floor.n.01 - shopping_cart.n.01_1 - shopping_cart.n.01 + shopping_cart.n.01_1 shopping_cart.n.01_* - shopping_cart.n.01 agent.n.01_1 - agent.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 27e07cf5..27ff4310 100644 --- a/bddl/activity_definitions/buying_everyday_consumer_goods/problem0.bddl +++ b/bddl/activity_definitions/buying_everyday_consumer_goods/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 checkout.n.03_1 - checkout.n.03 credit_card.n.01_1 - credit_card.n.01 bottle__of__milk.n.01_1 bottle__of__milk.n.01_2 - bottle__of__milk.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 - apple.n.01_1 apple.n.01_2 - apple.n.01 - pineapple.n.02_1 - pineapple.n.02 + apple.n.01_1 apple.n.01_2 - apple.n.01 + pineapple.n.02_1 - pineapple.n.02 sack.n.01_1 sack.n.01_2 - sack.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/buying_fast_food/problem0.bddl b/bddl/activity_definitions/buying_fast_food/problem0.bddl index 07d22e97..1cb595b0 100644 --- a/bddl/activity_definitions/buying_fast_food/problem0.bddl +++ b/bddl/activity_definitions/buying_fast_food/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 credit_card.n.01_1 - credit_card.n.01 hamburger.n.01_1 hamburger.n.01_2 - hamburger.n.01 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 diff --git a/bddl/activity_definitions/buying_gardening_supplies/problem0.bddl b/bddl/activity_definitions/buying_gardening_supplies/problem0.bddl index 0b25cedf..41a4e728 100644 --- a/bddl/activity_definitions/buying_gardening_supplies/problem0.bddl +++ b/bddl/activity_definitions/buying_gardening_supplies/problem0.bddl @@ -2,8 +2,8 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 - checkout.n.03_1 - checkout.n.03 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 rake.n.03_1 - rake.n.03 pruner.n.02_1 - pruner.n.02 grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 diff --git a/bddl/activity_definitions/buying_groceries/problem0.bddl b/bddl/activity_definitions/buying_groceries/problem0.bddl index 057950b6..3eee5ca7 100644 --- a/bddl/activity_definitions/buying_groceries/problem0.bddl +++ b/bddl/activity_definitions/buying_groceries/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - cash_register.n.01_1 - cash_register.n.01 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 checkout.n.03_1 - checkout.n.03 sack.n.01_1 sack.n.01_2 - sack.n.01 prawn.n.01_1 - prawn.n.01 diff --git a/bddl/activity_definitions/buying_groceries_for_a_feast/problem0.bddl b/bddl/activity_definitions/buying_groceries_for_a_feast/problem0.bddl index ca8a0cf3..d026ffa5 100644 --- a/bddl/activity_definitions/buying_groceries_for_a_feast/problem0.bddl +++ b/bddl/activity_definitions/buying_groceries_for_a_feast/problem0.bddl @@ -5,7 +5,7 @@ grocery.n.02_1 grocery.n.02_2 grocery.n.02_3 grocery.n.02_4 grocery.n.02_5 grocery.n.02_6 - grocery.n.02 grocery_shelf.n.01_1 grocery_shelf.n.01_2 - grocery_shelf.n.01 checkout.n.03_1 - checkout.n.03 - cash_register.n.01_1 - cash_register.n.01 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 shopping_cart.n.01_1 - shopping_cart.n.01 money.n.01_1 money.n.01_2 money.n.01_3 - money.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/buying_office_supplies/problem0.bddl b/bddl/activity_definitions/buying_office_supplies/problem0.bddl index ddb485f3..6ba334c1 100644 --- a/bddl/activity_definitions/buying_office_supplies/problem0.bddl +++ b/bddl/activity_definitions/buying_office_supplies/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 grocery_shelf.n.01_1 - grocery_shelf.n.01 cash_register.n.01_1 - cash_register.n.01 pen.n.01_1 - pen.n.01 diff --git a/bddl/activity_definitions/buying_postage_stamps/problem0.bddl b/bddl/activity_definitions/buying_postage_stamps/problem0.bddl index 4f5e9157..cd1ac20c 100644 --- a/bddl/activity_definitions/buying_postage_stamps/problem0.bddl +++ b/bddl/activity_definitions/buying_postage_stamps/problem0.bddl @@ -2,9 +2,9 @@ (:domain omnigibson) (:objects - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 floor.n.01_1 - floor.n.01 - cash_register.n.01_1 - cash_register.n.01 + cash_register.n.01_1 cash_register.n.01_* - cash_register.n.01 postage.n.02_1 postage.n.02_2 postage.n.02_3 - postage.n.02 money.n.01_1 money.n.01_2 - money.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/can_beans/problem0.bddl b/bddl/activity_definitions/can_beans/problem0.bddl index 5e9ecce8..e8adec33 100644 --- a/bddl/activity_definitions/can_beans/problem0.bddl +++ b/bddl/activity_definitions/can_beans/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 stockpot.n.01_1 - stockpot.n.01 countertop.n.01_1 - countertop.n.01 black_bean.n.01_1 - black_bean.n.01 diff --git a/bddl/activity_definitions/can_fruit/problem0.bddl b/bddl/activity_definitions/can_fruit/problem0.bddl index 2ac261a6..2ae12fbe 100644 --- a/bddl/activity_definitions/can_fruit/problem0.bddl +++ b/bddl/activity_definitions/can_fruit/problem0.bddl @@ -4,7 +4,7 @@ (:objects water.n.06_1 - water.n.06 stockpot.n.01_1 - stockpot.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 hinged_jar.n.01_1 hinged_jar.n.01_2 - hinged_jar.n.01 peach.n.03_1 peach.n.03_2 peach.n.03_3 peach.n.03_4 - peach.n.03 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 diff --git a/bddl/activity_definitions/can_meat/problem0.bddl b/bddl/activity_definitions/can_meat/problem0.bddl index 86ca778d..3a49d051 100644 --- a/bddl/activity_definitions/can_meat/problem0.bddl +++ b/bddl/activity_definitions/can_meat/problem0.bddl @@ -3,7 +3,7 @@ (:objects hinged_jar.n.01_1 hinged_jar.n.01_2 - hinged_jar.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 countertop.n.01_1 - countertop.n.01 carving_knife.n.01_1 - carving_knife.n.01 chopping_board.n.01_1 - chopping_board.n.01 diff --git a/bddl/activity_definitions/can_vegetables/problem0.bddl b/bddl/activity_definitions/can_vegetables/problem0.bddl index 362a2027..917e6a05 100644 --- a/bddl/activity_definitions/can_vegetables/problem0.bddl +++ b/bddl/activity_definitions/can_vegetables/problem0.bddl @@ -5,7 +5,7 @@ asparagus.n.02_1 asparagus.n.02_2 asparagus.n.02_3 - asparagus.n.02 chopping_board.n.01_1 - chopping_board.n.01 mason_jar.n.01_1 mason_jar.n.01_2 mason_jar.n.01_3 - mason_jar.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 lid.n.02_1 lid.n.02_2 lid.n.02_3 - lid.n.02 countertop.n.01_1 - countertop.n.01 carving_knife.n.01_1 - carving_knife.n.01 diff --git a/bddl/activity_definitions/canning_food/problem0.bddl b/bddl/activity_definitions/canning_food/problem0.bddl index 64c9152d..fe30b78d 100644 --- a/bddl/activity_definitions/canning_food/problem0.bddl +++ b/bddl/activity_definitions/canning_food/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - steak.n.01_1 - steak.n.01 + steak.n.01_1 - steak.n.01 diced__steak.n.01_1 - diced__steak.n.01 pineapple.n.02_1 - pineapple.n.02 diced__pineapple.n.01_1 - diced__pineapple.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 hinged_jar.n.01_1 hinged_jar.n.01_2 - hinged_jar.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 chopping_board.n.01_1 - chopping_board.n.01 countertop.n.01_1 - countertop.n.01 carving_knife.n.01_1 - carving_knife.n.01 diff --git a/bddl/activity_definitions/carrying_in_groceries/problem0.bddl b/bddl/activity_definitions/carrying_in_groceries/problem0.bddl index 1dccec11..d1ab3dc3 100644 --- a/bddl/activity_definitions/carrying_in_groceries/problem0.bddl +++ b/bddl/activity_definitions/carrying_in_groceries/problem0.bddl @@ -9,8 +9,8 @@ beefsteak_tomato.n.01_1 - beefsteak_tomato.n.01 pack__of__bread.n.01_1 - pack__of__bread.n.01 carton__of__milk.n.01_1 - carton__of__milk.n.01 - countertop.n.01_1 - countertop.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/carrying_out_garden_furniture/problem0.bddl b/bddl/activity_definitions/carrying_out_garden_furniture/problem0.bddl index 9fcaa13e..2d203b5e 100644 --- a/bddl/activity_definitions/carrying_out_garden_furniture/problem0.bddl +++ b/bddl/activity_definitions/carrying_out_garden_furniture/problem0.bddl @@ -5,7 +5,7 @@ lawn_chair.n.01_1 lawn_chair.n.01_2 - lawn_chair.n.01 floor.n.01_1 - floor.n.01 barrow.n.03_1 - barrow.n.03 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 driveway.n.01_1 - driveway.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/carrying_water/problem0.bddl b/bddl/activity_definitions/carrying_water/problem0.bddl index af27b7f9..1a3deccc 100644 --- a/bddl/activity_definitions/carrying_water/problem0.bddl +++ b/bddl/activity_definitions/carrying_water/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - water_bottle.n.01_1 - water_bottle.n.01 - shelf.n.01_1 - shelf.n.01 - backpack.n.01_1 - backpack.n.01 - water.n.06_1 - water.n.06 - sink.n.01_1 - sink.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - agent.n.01_1 - agent.n.01 + water_bottle.n.01_1 - water_bottle.n.01 + shelf.n.01_1 - shelf.n.01 + backpack.n.01_1 - backpack.n.01 + water.n.06_1 - water.n.06 + sink.n.01_1 - sink.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/changing_dogs_water/problem0.bddl b/bddl/activity_definitions/changing_dogs_water/problem0.bddl index 47d1bc7f..d012bfd5 100644 --- a/bddl/activity_definitions/changing_dogs_water/problem0.bddl +++ b/bddl/activity_definitions/changing_dogs_water/problem0.bddl @@ -5,7 +5,7 @@ water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 bowl.n.01_1 - bowl.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/changing_sheets/problem0.bddl b/bddl/activity_definitions/changing_sheets/problem0.bddl index a212b05b..c848f00e 100644 --- a/bddl/activity_definitions/changing_sheets/problem0.bddl +++ b/bddl/activity_definitions/changing_sheets/problem0.bddl @@ -3,8 +3,8 @@ (:objects sheet.n.03_1 sheet.n.03_2 - sheet.n.03 - bed.n.01_1 - bed.n.01 - floor.n.01_1 - floor.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/chlorinating_the_pool/problem0.bddl b/bddl/activity_definitions/chlorinating_the_pool/problem0.bddl index a63d2c91..e22f039f 100644 --- a/bddl/activity_definitions/chlorinating_the_pool/problem0.bddl +++ b/bddl/activity_definitions/chlorinating_the_pool/problem0.bddl @@ -7,7 +7,7 @@ chlorine__bottle.n.01_1 - chlorine__bottle.n.01 bucket.n.01_1 - bucket.n.01 floor.n.01_1 - floor.n.01 - pool.n.01_1 - pool.n.01 + pool.n.01_1 pool.n.01_* - pool.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/chop_an_onion/problem0.bddl b/bddl/activity_definitions/chop_an_onion/problem0.bddl index 96430377..3342dc47 100644 --- a/bddl/activity_definitions/chop_an_onion/problem0.bddl +++ b/bddl/activity_definitions/chop_an_onion/problem0.bddl @@ -3,7 +3,7 @@ (:objects chopping_board.n.01_1 - chopping_board.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 vidalia_onion.n.01_1 - vidalia_onion.n.01 diced__vidalia_onion.n.01_1 - diced__vidalia_onion.n.01 carving_knife.n.01_1 - carving_knife.n.01 diff --git a/bddl/activity_definitions/clean_a_LED_screen/problem0.bddl b/bddl/activity_definitions/clean_a_LED_screen/problem0.bddl index 43e35265..1f205297 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 - television_receiver.n.01_1 - television_receiver.n.01 + television_receiver.n.01_1 television_receiver.n.01_* - television_receiver.n.01 rag.n.01_1 - rag.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_a_broiler_pan/problem0.bddl b/bddl/activity_definitions/clean_a_broiler_pan/problem0.bddl index 4670ffe5..5ce43318 100644 --- a/bddl/activity_definitions/clean_a_broiler_pan/problem0.bddl +++ b/bddl/activity_definitions/clean_a_broiler_pan/problem0.bddl @@ -6,7 +6,7 @@ sink.n.01_1 - sink.n.01 water.n.06_1 - water.n.06 stain.n.01_1 - stain.n.01 - grill.n.02_1 - grill.n.02 + grill.n.02_1 grill.n.02_* - grill.n.02 liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 countertop.n.01_1 - countertop.n.01 diff --git a/bddl/activity_definitions/clean_a_company_office/problem0.bddl b/bddl/activity_definitions/clean_a_company_office/problem0.bddl index cc615525..22a9dc3f 100644 --- a/bddl/activity_definitions/clean_a_company_office/problem0.bddl +++ b/bddl/activity_definitions/clean_a_company_office/problem0.bddl @@ -15,7 +15,7 @@ folder.n.02_1 - folder.n.02 rag.n.01_1 - rag.n.01 dust.n.01_1 - dust.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_a_couch/problem0.bddl b/bddl/activity_definitions/clean_a_couch/problem0.bddl index afbe732c..14a8838d 100644 --- a/bddl/activity_definitions/clean_a_couch/problem0.bddl +++ b/bddl/activity_definitions/clean_a_couch/problem0.bddl @@ -3,7 +3,7 @@ (:objects vacuum.n.04_1 - vacuum.n.04 - sofa.n.01_1 - sofa.n.01 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 rag.n.01_1 - rag.n.01 dust.n.01_1 - dust.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_a_drain/problem0.bddl b/bddl/activity_definitions/clean_a_drain/problem0.bddl index 8e34e4ef..eee2543a 100644 --- a/bddl/activity_definitions/clean_a_drain/problem0.bddl +++ b/bddl/activity_definitions/clean_a_drain/problem0.bddl @@ -7,7 +7,7 @@ water.n.06_1 - water.n.06 rag.n.01_1 - rag.n.01 mildew.n.02_1 - mildew.n.02 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_a_faucet/problem0.bddl b/bddl/activity_definitions/clean_a_faucet/problem0.bddl index 5834f0b6..f2ebe7a2 100644 --- a/bddl/activity_definitions/clean_a_faucet/problem0.bddl +++ b/bddl/activity_definitions/clean_a_faucet/problem0.bddl @@ -5,7 +5,7 @@ detergent.n.02_1 - detergent.n.02 detergent__bottle.n.01_1 - detergent__bottle.n.01 rag.n.01_1 - rag.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 stain.n.01_1 - stain.n.01 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_a_felt_pool_table_top/problem0.bddl b/bddl/activity_definitions/clean_a_felt_pool_table_top/problem0.bddl index e418e3da..335058a6 100644 --- a/bddl/activity_definitions/clean_a_felt_pool_table_top/problem0.bddl +++ b/bddl/activity_definitions/clean_a_felt_pool_table_top/problem0.bddl @@ -5,7 +5,7 @@ rug.n.01_1 - rug.n.01 floor.n.01_1 - floor.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 - pool_table.n.01_1 - pool_table.n.01 + pool_table.n.01_1 pool_table.n.01_* - pool_table.n.01 dust.n.01_1 - dust.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_a_fence/problem0.bddl b/bddl/activity_definitions/clean_a_fence/problem0.bddl index 5337994e..9a5c7129 100644 --- a/bddl/activity_definitions/clean_a_fence/problem0.bddl +++ b/bddl/activity_definitions/clean_a_fence/problem0.bddl @@ -3,7 +3,7 @@ (:objects stain.n.01_1 - stain.n.01 - rail_fence.n.01_1 - rail_fence.n.01 + rail_fence.n.01_1 rail_fence.n.01_* - rail_fence.n.01 water.n.06_1 - water.n.06 bucket.n.01_1 - bucket.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 diff --git a/bddl/activity_definitions/clean_a_hot_water_dispenser/problem0.bddl b/bddl/activity_definitions/clean_a_hot_water_dispenser/problem0.bddl index 34c685ac..8ff91b9b 100644 --- a/bddl/activity_definitions/clean_a_hot_water_dispenser/problem0.bddl +++ b/bddl/activity_definitions/clean_a_hot_water_dispenser/problem0.bddl @@ -5,7 +5,7 @@ water.n.06_1 - water.n.06 rag.n.01_1 - rag.n.01 dust.n.01_1 - dust.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_a_kitchen_sink/problem0.bddl b/bddl/activity_definitions/clean_a_kitchen_sink/problem0.bddl index 1d4f21af..b3e9daef 100644 --- a/bddl/activity_definitions/clean_a_kitchen_sink/problem0.bddl +++ b/bddl/activity_definitions/clean_a_kitchen_sink/problem0.bddl @@ -3,7 +3,7 @@ (:objects stain.n.01_1 - stain.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 crumb.n.03_1 - crumb.n.03 water.n.06_1 - water.n.06 sponge.n.01_1 - sponge.n.01 diff --git a/bddl/activity_definitions/clean_a_kitchen_table/problem0.bddl b/bddl/activity_definitions/clean_a_kitchen_table/problem0.bddl index 0f9bc3f5..c0877f19 100644 --- a/bddl/activity_definitions/clean_a_kitchen_table/problem0.bddl +++ b/bddl/activity_definitions/clean_a_kitchen_table/problem0.bddl @@ -4,14 +4,14 @@ (:objects chopping_board.n.01_1 - chopping_board.n.01 cooking_oil.n.01_1 - cooking_oil.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 dust.n.01_1 - dust.n.01 liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 rag.n.01_1 - rag.n.01 crumb.n.03_1 - crumb.n.03 water.n.06_1 - water.n.06 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 countertop.n.01_1 - countertop.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_a_patio/problem0.bddl b/bddl/activity_definitions/clean_a_patio/problem0.bddl index 4de1afee..56649ccb 100644 --- a/bddl/activity_definitions/clean_a_patio/problem0.bddl +++ b/bddl/activity_definitions/clean_a_patio/problem0.bddl @@ -3,7 +3,7 @@ (:objects dust.n.01_1 - dust.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 broom.n.01_1 - broom.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_a_piano/problem0.bddl b/bddl/activity_definitions/clean_a_piano/problem0.bddl index 8c53cc4e..2dc1a77d 100644 --- a/bddl/activity_definitions/clean_a_piano/problem0.bddl +++ b/bddl/activity_definitions/clean_a_piano/problem0.bddl @@ -3,7 +3,7 @@ (:objects dust.n.01_1 - dust.n.01 - piano.n.01_1 - piano.n.01 + piano.n.01_1 piano.n.01_* - piano.n.01 rag.n.01_1 - rag.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_a_sauna/problem0.bddl b/bddl/activity_definitions/clean_a_sauna/problem0.bddl index 67f20a5e..2e3c90a3 100644 --- a/bddl/activity_definitions/clean_a_sauna/problem0.bddl +++ b/bddl/activity_definitions/clean_a_sauna/problem0.bddl @@ -13,10 +13,10 @@ water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 rag.n.01_1 - rag.n.01 - bench.n.01_1 - bench.n.01 - sauna_heater.n.01_1 - sauna_heater.n.01 + bench.n.01_1 bench.n.01_* - bench.n.01 + sauna_heater.n.01_1 sauna_heater.n.01_* - sauna_heater.n.01 cabinet.n.03_1 - cabinet.n.03 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_a_shower/problem0.bddl b/bddl/activity_definitions/clean_a_shower/problem0.bddl index 1086130a..a374a633 100644 --- a/bddl/activity_definitions/clean_a_shower/problem0.bddl +++ b/bddl/activity_definitions/clean_a_shower/problem0.bddl @@ -7,7 +7,7 @@ detergent.n.02_1 - detergent.n.02 detergent__bottle.n.01_1 - detergent__bottle.n.01 water.n.06_1 - water.n.06 - showerhead.n.01_1 - showerhead.n.01 + showerhead.n.01_1 showerhead.n.01_* - showerhead.n.01 stain.n.01_1 - stain.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_a_sofa/problem0.bddl b/bddl/activity_definitions/clean_a_sofa/problem0.bddl index 1b15bde6..91d3643a 100644 --- a/bddl/activity_definitions/clean_a_sofa/problem0.bddl +++ b/bddl/activity_definitions/clean_a_sofa/problem0.bddl @@ -3,7 +3,7 @@ (:objects rag.n.01_1 - rag.n.01 - sofa.n.01_1 - sofa.n.01 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 dust.n.01_1 - dust.n.01 vacuum.n.04_1 - vacuum.n.04 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_a_turkey/problem0.bddl b/bddl/activity_definitions/clean_a_turkey/problem0.bddl index bbe62ba5..8a914517 100644 --- a/bddl/activity_definitions/clean_a_turkey/problem0.bddl +++ b/bddl/activity_definitions/clean_a_turkey/problem0.bddl @@ -10,7 +10,7 @@ cabinet.n.01_1 - cabinet.n.01 hand_towel.n.01_1 - hand_towel.n.01 water.n.06_1 - water.n.06 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_a_whiteboard/problem0.bddl b/bddl/activity_definitions/clean_a_whiteboard/problem0.bddl index 1b783e63..b9172973 100644 --- a/bddl/activity_definitions/clean_a_whiteboard/problem0.bddl +++ b/bddl/activity_definitions/clean_a_whiteboard/problem0.bddl @@ -2,14 +2,14 @@ (:domain omnigibson) (:objects - paper_towel.n.01_1 - paper_towel.n.01 - desk.n.01_1 - desk.n.01 - display_panel.n.01_1 - display_panel.n.01 - rubbing_alcohol.n.01_1 - rubbing_alcohol.n.01 + paper_towel.n.01_1 - paper_towel.n.01 + desk.n.01_1 - desk.n.01 + display_panel.n.01_1 display_panel.n.01_* - display_panel.n.01 + rubbing_alcohol.n.01_1 - rubbing_alcohol.n.01 rubbing_alcohol__atomizer.n.01_1 - rubbing_alcohol__atomizer.n.01 - tarnish.n.02_1 - tarnish.n.02 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + tarnish.n.02_1 - tarnish.n.02 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/clean_an_electric_kettle/problem0.bddl b/bddl/activity_definitions/clean_an_electric_kettle/problem0.bddl index 97691b41..52a8c3fd 100644 --- a/bddl/activity_definitions/clean_an_electric_kettle/problem0.bddl +++ b/bddl/activity_definitions/clean_an_electric_kettle/problem0.bddl @@ -2,17 +2,17 @@ (:domain omnigibson) (:objects - electric_kettle.n.01_1 - electric_kettle.n.01 - sink.n.01_1 - sink.n.01 - liquid_soap.n.01_1 - liquid_soap.n.01 + electric_kettle.n.01_1 - electric_kettle.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - stain.n.01_1 - stain.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + stain.n.01_1 - stain.n.01 tea.n.01_1 - tea.n.01 - water.n.06_1 - water.n.06 + water.n.06_1 - water.n.06 countertop.n.01_1 - countertop.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/clean_an_office_chair/problem0.bddl b/bddl/activity_definitions/clean_an_office_chair/problem0.bddl index 3fba335e..71aefd1e 100644 --- a/bddl/activity_definitions/clean_an_office_chair/problem0.bddl +++ b/bddl/activity_definitions/clean_an_office_chair/problem0.bddl @@ -4,7 +4,7 @@ (:objects hand_towel.n.01_1 - hand_towel.n.01 floor.n.01_1 - floor.n.01 - swivel_chair.n.01_1 - swivel_chair.n.01 + swivel_chair.n.01_1 swivel_chair.n.01_* - swivel_chair.n.01 dust.n.01_1 - dust.n.01 lint.n.01_1 - lint.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_conch_shells/problem0.bddl b/bddl/activity_definitions/clean_conch_shells/problem0.bddl index 0120820e..f737c850 100644 --- a/bddl/activity_definitions/clean_conch_shells/problem0.bddl +++ b/bddl/activity_definitions/clean_conch_shells/problem0.bddl @@ -3,7 +3,7 @@ (:objects conch.n.01_1 conch.n.01_2 - conch.n.01 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 rag.n.01_1 - rag.n.01 diff --git a/bddl/activity_definitions/clean_decking/problem0.bddl b/bddl/activity_definitions/clean_decking/problem0.bddl index ff5febe8..a7b24093 100644 --- a/bddl/activity_definitions/clean_decking/problem0.bddl +++ b/bddl/activity_definitions/clean_decking/problem0.bddl @@ -3,7 +3,7 @@ (:objects board.n.02_1 - board.n.02 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 entire_leaf.n.01_1 entire_leaf.n.01_2 entire_leaf.n.01_3 entire_leaf.n.01_4 entire_leaf.n.01_5 - entire_leaf.n.01 mud.n.03_1 - mud.n.03 rail_fence.n.01_1 - rail_fence.n.01 diff --git a/bddl/activity_definitions/clean_deer_antlers/problem0.bddl b/bddl/activity_definitions/clean_deer_antlers/problem0.bddl index ef07dffe..6169e5bc 100644 --- a/bddl/activity_definitions/clean_deer_antlers/problem0.bddl +++ b/bddl/activity_definitions/clean_deer_antlers/problem0.bddl @@ -3,7 +3,7 @@ (:objects antler.n.01_1 - antler.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 floor.n.01_1 - floor.n.01 hand_towel.n.01_1 - hand_towel.n.01 dust.n.01_1 - dust.n.01 diff --git a/bddl/activity_definitions/clean_grease/problem0.bddl b/bddl/activity_definitions/clean_grease/problem0.bddl index 7a98a391..194614b9 100644 --- a/bddl/activity_definitions/clean_grease/problem0.bddl +++ b/bddl/activity_definitions/clean_grease/problem0.bddl @@ -2,16 +2,16 @@ (:domain omnigibson) (:objects - scrub_brush.n.01_1 - scrub_brush.n.01 - cabinet.n.01_1 - cabinet.n.01 - liquid_soap.n.01_1 - liquid_soap.n.01 - liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 - cooking_oil.n.01_1 - cooking_oil.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + cabinet.n.01_1 - cabinet.n.01 + liquid_soap.n.01_1 - liquid_soap.n.01 + liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 + cooking_oil.n.01_1 - cooking_oil.n.01 water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 - stove.n.01_1 - stove.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + stove.n.01_1 stove.n.01_* - stove.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/clean_mirrors/problem0.bddl b/bddl/activity_definitions/clean_mirrors/problem0.bddl index 0bb54543..0ce4c7ed 100644 --- a/bddl/activity_definitions/clean_mirrors/problem0.bddl +++ b/bddl/activity_definitions/clean_mirrors/problem0.bddl @@ -11,7 +11,7 @@ dust.n.01_1 - dust.n.01 baby_oil.n.01_1 - baby_oil.n.01 toothpaste.n.01_1 - toothpaste.n.01 - mirror.n.01_1 - mirror.n.01 + mirror.n.01_1 mirror.n.01_* - mirror.n.01 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_mussels/problem0.bddl b/bddl/activity_definitions/clean_mussels/problem0.bddl index 53bb23ae..a9eec8de 100644 --- a/bddl/activity_definitions/clean_mussels/problem0.bddl +++ b/bddl/activity_definitions/clean_mussels/problem0.bddl @@ -7,7 +7,7 @@ mussel.n.01_1 mussel.n.01_2 mussel.n.01_3 mussel.n.01_4 - mussel.n.01 paper_towel.n.01_1 - paper_towel.n.01 countertop.n.01_1 - countertop.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 sand.n.04_1 - sand.n.04 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_outdoor_tiles/problem0.bddl b/bddl/activity_definitions/clean_outdoor_tiles/problem0.bddl index ba046c80..2a6ec1a5 100644 --- a/bddl/activity_definitions/clean_outdoor_tiles/problem0.bddl +++ b/bddl/activity_definitions/clean_outdoor_tiles/problem0.bddl @@ -3,7 +3,7 @@ (:objects tile.n.01_1 tile.n.01_2 tile.n.01_3 tile.n.01_4 - tile.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 bucket.n.01_1 - bucket.n.01 swab.n.02_1 - swab.n.02 liquid_soap.n.01_1 - liquid_soap.n.01 diff --git a/bddl/activity_definitions/clean_oysters/problem0.bddl b/bddl/activity_definitions/clean_oysters/problem0.bddl index 06f0192b..6ba3f0a1 100644 --- a/bddl/activity_definitions/clean_oysters/problem0.bddl +++ b/bddl/activity_definitions/clean_oysters/problem0.bddl @@ -7,7 +7,7 @@ dirt.n.02_1 - dirt.n.02 sand.n.04_1 - sand.n.04 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 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 countertop.n.01_1 - countertop.n.01 tupperware.n.01_1 - tupperware.n.01 water.n.06_1 - water.n.06 diff --git a/bddl/activity_definitions/clean_piano_keys/problem0.bddl b/bddl/activity_definitions/clean_piano_keys/problem0.bddl index f6428576..e267e176 100644 --- a/bddl/activity_definitions/clean_piano_keys/problem0.bddl +++ b/bddl/activity_definitions/clean_piano_keys/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - piano.n.01_1 - piano.n.01 + piano.n.01_1 piano.n.01_* - piano.n.01 rag.n.01_1 - rag.n.01 dust.n.01_1 - dust.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_quartz/problem0.bddl b/bddl/activity_definitions/clean_quartz/problem0.bddl index 6e0bd5f5..f45d0944 100644 --- a/bddl/activity_definitions/clean_quartz/problem0.bddl +++ b/bddl/activity_definitions/clean_quartz/problem0.bddl @@ -3,7 +3,7 @@ (:objects rag.n.01_1 - rag.n.01 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 dirt.n.02_1 - dirt.n.02 water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 diff --git a/bddl/activity_definitions/clean_stainless_steel_sinks/problem0.bddl b/bddl/activity_definitions/clean_stainless_steel_sinks/problem0.bddl index 69c9ab46..c526ff45 100644 --- a/bddl/activity_definitions/clean_stainless_steel_sinks/problem0.bddl +++ b/bddl/activity_definitions/clean_stainless_steel_sinks/problem0.bddl @@ -6,7 +6,7 @@ sodium_carbonate__jar.n.01_1 - sodium_carbonate__jar.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 liquid_soap.n.01_1 - liquid_soap.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 sponge.n.01_1 - sponge.n.01 paper_towel.n.01_1 - paper_towel.n.01 adhesive_material.n.01_1 - adhesive_material.n.01 diff --git a/bddl/activity_definitions/clean_stucco/problem0.bddl b/bddl/activity_definitions/clean_stucco/problem0.bddl index d779f183..3df6d8b6 100644 --- a/bddl/activity_definitions/clean_stucco/problem0.bddl +++ b/bddl/activity_definitions/clean_stucco/problem0.bddl @@ -3,7 +3,7 @@ (:objects mold.n.05_1 - mold.n.05 - wall.n.01_1 - wall.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 stucco.n.01_1 - stucco.n.01 bucket.n.01_1 - bucket.n.01 driveway.n.01_1 - driveway.n.01 diff --git a/bddl/activity_definitions/clean_the_exterior_of_your_garage/problem0.bddl b/bddl/activity_definitions/clean_the_exterior_of_your_garage/problem0.bddl index 093c7b83..7c9ed330 100644 --- a/bddl/activity_definitions/clean_the_exterior_of_your_garage/problem0.bddl +++ b/bddl/activity_definitions/clean_the_exterior_of_your_garage/problem0.bddl @@ -3,7 +3,7 @@ (:objects sponge.n.01_1 - sponge.n.01 - door.n.01_1 - door.n.01 + door.n.01_1 door.n.01_* - door.n.01 stain.n.01_1 - stain.n.01 liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 diff --git a/bddl/activity_definitions/clean_the_outside_of_a_house/problem0.bddl b/bddl/activity_definitions/clean_the_outside_of_a_house/problem0.bddl index 51d10550..9ba5d37d 100644 --- a/bddl/activity_definitions/clean_the_outside_of_a_house/problem0.bddl +++ b/bddl/activity_definitions/clean_the_outside_of_a_house/problem0.bddl @@ -9,7 +9,7 @@ liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 bucket.n.01_1 - bucket.n.01 water.n.06_1 - water.n.06 - wall.n.01_1 - wall.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 driveway.n.01_1 - driveway.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_up_after_a_dinner_party/problem0.bddl b/bddl/activity_definitions/clean_up_after_a_dinner_party/problem0.bddl index 275415c2..8409d6a3 100644 --- a/bddl/activity_definitions/clean_up_after_a_dinner_party/problem0.bddl +++ b/bddl/activity_definitions/clean_up_after_a_dinner_party/problem0.bddl @@ -7,7 +7,7 @@ hamburger.n.01_1 hamburger.n.01_2 - hamburger.n.01 burrito.n.01_1 burrito.n.01_2 - burrito.n.01 tupperware.n.01_1 tupperware.n.01_2 - tupperware.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 cabinet.n.01_1 - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_up_broken_glass/problem0.bddl b/bddl/activity_definitions/clean_up_broken_glass/problem0.bddl index de46a684..1302cb93 100644 --- a/bddl/activity_definitions/clean_up_broken_glass/problem0.bddl +++ b/bddl/activity_definitions/clean_up_broken_glass/problem0.bddl @@ -3,7 +3,7 @@ (:objects broken__glass.n.01_1 - broken__glass.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 broom.n.01_1 - broom.n.01 dustpan.n.02_1 - dustpan.n.02 recycling_bin.n.01_1 - recycling_bin.n.01 diff --git a/bddl/activity_definitions/clean_up_gasoline/problem0.bddl b/bddl/activity_definitions/clean_up_gasoline/problem0.bddl index d694ba9e..6c436bd1 100644 --- a/bddl/activity_definitions/clean_up_gasoline/problem0.bddl +++ b/bddl/activity_definitions/clean_up_gasoline/problem0.bddl @@ -2,15 +2,15 @@ (:domain omnigibson) (:objects - gasoline.n.01_1 - gasoline.n.01 - driveway.n.01_1 - driveway.n.01 - liquid_soap.n.01_1 - liquid_soap.n.01 + gasoline.n.01_1 - gasoline.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 + liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 water.n.06_1 - water.n.06 bucket.n.01_1 - bucket.n.01 - swab.n.02_1 - swab.n.02 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + swab.n.02_1 - swab.n.02 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl b/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl index 6bbd1215..f69c864a 100644 --- a/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl +++ b/bddl/activity_definitions/clean_up_spilled_egg/problem0.bddl @@ -3,7 +3,7 @@ (:objects beaten_egg.n.01_1 - beaten_egg.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 sink.n.01_1 - sink.n.01 paper_towel.n.01_1 - paper_towel.n.01 water.n.06_1 - water.n.06 diff --git a/bddl/activity_definitions/clean_up_water_damage/problem0.bddl b/bddl/activity_definitions/clean_up_water_damage/problem0.bddl index 98e9cb92..63455b00 100644 --- a/bddl/activity_definitions/clean_up_water_damage/problem0.bddl +++ b/bddl/activity_definitions/clean_up_water_damage/problem0.bddl @@ -4,7 +4,7 @@ (:objects disinfectant.n.01_1 - disinfectant.n.01 disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 dehumidifier.n.01_1 - dehumidifier.n.01 mold.n.05_1 - mold.n.05 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_up_your_desk/problem0.bddl b/bddl/activity_definitions/clean_up_your_desk/problem0.bddl index 26d27179..1ac2a7e2 100644 --- a/bddl/activity_definitions/clean_up_your_desk/problem0.bddl +++ b/bddl/activity_definitions/clean_up_your_desk/problem0.bddl @@ -4,7 +4,7 @@ (:objects laptop.n.01_1 - laptop.n.01 notebook.n.01_1 - notebook.n.01 - desk.n.01_1 - desk.n.01 + desk.n.01_1 desk.n.01_* - desk.n.01 mail.n.04_1 mail.n.04_2 - mail.n.04 folder.n.02_1 folder.n.02_2 - folder.n.02 shears.n.01_1 - shears.n.01 @@ -12,7 +12,7 @@ pencil.n.01_1 - pencil.n.01 pen.n.01_1 pen.n.01_2 - pen.n.01 stapler.n.01_1 - stapler.n.01 - shelf.n.01_1 - shelf.n.01 + shelf.n.01_1 shelf.n.01_* - shelf.n.01 tray.n.01_1 - tray.n.01 paperback_book.n.01_1 paperback_book.n.01_2 - paperback_book.n.01 pencil_box.n.01_1 - pencil_box.n.01 diff --git a/bddl/activity_definitions/clean_walls/problem0.bddl b/bddl/activity_definitions/clean_walls/problem0.bddl index b192ce6b..a20c7a88 100644 --- a/bddl/activity_definitions/clean_walls/problem0.bddl +++ b/bddl/activity_definitions/clean_walls/problem0.bddl @@ -6,7 +6,7 @@ liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 stain.n.01_1 - stain.n.01 swab.n.02_1 - swab.n.02 - wall.n.01_1 - wall.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 sink.n.01_1 - sink.n.01 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/clean_wood_doors/problem0.bddl b/bddl/activity_definitions/clean_wood_doors/problem0.bddl index 83ab96b3..4425a821 100644 --- a/bddl/activity_definitions/clean_wood_doors/problem0.bddl +++ b/bddl/activity_definitions/clean_wood_doors/problem0.bddl @@ -8,7 +8,7 @@ liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 stain.n.01_1 - stain.n.01 - door.n.01_1 - door.n.01 + door.n.01_1 door.n.01_* - door.n.01 water.n.06_1 - water.n.06 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_wood_siding/problem0.bddl b/bddl/activity_definitions/clean_wood_siding/problem0.bddl index 33fa966b..752790c7 100644 --- a/bddl/activity_definitions/clean_wood_siding/problem0.bddl +++ b/bddl/activity_definitions/clean_wood_siding/problem0.bddl @@ -5,7 +5,7 @@ adhesive_material.n.01_1 - adhesive_material.n.01 rubbing_alcohol.n.01_1 - rubbing_alcohol.n.01 rubbing_alcohol__atomizer.n.01_1 - rubbing_alcohol__atomizer.n.01 - door.n.01_1 - door.n.01 + door.n.01_1 door.n.01_* - door.n.01 sponge.n.01_1 - sponge.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clean_your_electronics/problem0.bddl b/bddl/activity_definitions/clean_your_electronics/problem0.bddl index 818db2eb..2d9bd9b8 100644 --- a/bddl/activity_definitions/clean_your_electronics/problem0.bddl +++ b/bddl/activity_definitions/clean_your_electronics/problem0.bddl @@ -3,7 +3,7 @@ (:objects dust.n.01_1 - dust.n.01 - television_receiver.n.01_1 - television_receiver.n.01 + television_receiver.n.01_1 television_receiver.n.01_* - television_receiver.n.01 laptop.n.01_1 - laptop.n.01 printer.n.03_1 - printer.n.03 rag.n.01_1 - rag.n.01 diff --git a/bddl/activity_definitions/clean_your_house_after_a_wild_party/problem0.bddl b/bddl/activity_definitions/clean_your_house_after_a_wild_party/problem0.bddl index f2303e8e..62775a88 100644 --- a/bddl/activity_definitions/clean_your_house_after_a_wild_party/problem0.bddl +++ b/bddl/activity_definitions/clean_your_house_after_a_wild_party/problem0.bddl @@ -4,9 +4,9 @@ (:objects plate.n.04_1 plate.n.04_2 plate.n.04_3 - plate.n.04 beer_bottle.n.01_1 beer_bottle.n.01_2 - beer_bottle.n.01 - countertop.n.01_1 - countertop.n.01 - floor.n.01_1 floor.n.01_2 floor.n.01_3 - floor.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_3 floor.n.01_* - floor.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 cup.n.01_1 cup.n.01_2 cup.n.01_3 - cup.n.01 sink.n.01_1 sink.n.01_2 - sink.n.01 recycling_bin.n.01_1 recycling_bin.n.01_2 - recycling_bin.n.01 @@ -23,8 +23,8 @@ adhesive_material.n.01_1 - adhesive_material.n.01 dust.n.01_1 - dust.n.01 stain.n.01_1 - stain.n.01 - toilet.n.02_1 - toilet.n.02 - dishwasher.n.01_1 - dishwasher.n.01 + toilet.n.02_1 toilet.n.02_* - toilet.n.02 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clean_your_laundry_room/problem0.bddl b/bddl/activity_definitions/clean_your_laundry_room/problem0.bddl index 049a7fac..9afa4554 100644 --- a/bddl/activity_definitions/clean_your_laundry_room/problem0.bddl +++ b/bddl/activity_definitions/clean_your_laundry_room/problem0.bddl @@ -3,11 +3,11 @@ (:objects rag.n.01_1 - rag.n.01 - clothes_dryer.n.01_1 - clothes_dryer.n.01 + clothes_dryer.n.01_1 clothes_dryer.n.01_* - clothes_dryer.n.01 water.n.06_1 - water.n.06 bleaching_agent.n.01_1 - bleaching_agent.n.01 bleaching_agent__atomizer.n.01_1 - bleaching_agent__atomizer.n.01 - washer.n.03_1 - washer.n.03 + washer.n.03_1 washer.n.03_* - washer.n.03 dust.n.01_1 - dust.n.01 mold.n.05_1 - mold.n.05 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/cleaning_around_pool_in_garden/problem0.bddl b/bddl/activity_definitions/cleaning_around_pool_in_garden/problem0.bddl index 07f7ae15..d1702714 100644 --- a/bddl/activity_definitions/cleaning_around_pool_in_garden/problem0.bddl +++ b/bddl/activity_definitions/cleaning_around_pool_in_garden/problem0.bddl @@ -6,7 +6,7 @@ dust.n.01_1 - dust.n.01 broom.n.01_1 - broom.n.01 floor.n.01_1 - floor.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_bathrooms/problem0.bddl b/bddl/activity_definitions/cleaning_bathrooms/problem0.bddl index 28bd1a3a..23179823 100644 --- a/bddl/activity_definitions/cleaning_bathrooms/problem0.bddl +++ b/bddl/activity_definitions/cleaning_bathrooms/problem0.bddl @@ -3,10 +3,10 @@ (:objects stain.n.01_1 - stain.n.01 - sink.n.01_1 - sink.n.01 - bathtub.n.01_1 - bathtub.n.01 - toilet.n.02_1 - toilet.n.02 - floor.n.01_1 - floor.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + bathtub.n.01_1 bathtub.n.01_* - bathtub.n.01 + toilet.n.02_1 toilet.n.02_* - toilet.n.02 + floor.n.01_1 floor.n.01_* - floor.n.01 bucket.n.01_1 - bucket.n.01 bar_soap.n.01_1 - bar_soap.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 diff --git a/bddl/activity_definitions/cleaning_bathtub/problem0.bddl b/bddl/activity_definitions/cleaning_bathtub/problem0.bddl index 406928b5..3785bd87 100644 --- a/bddl/activity_definitions/cleaning_bathtub/problem0.bddl +++ b/bddl/activity_definitions/cleaning_bathtub/problem0.bddl @@ -5,12 +5,12 @@ stain.n.01_1 - stain.n.01 water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 - bathtub.n.01_1 - bathtub.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - floor.n.01_1 - floor.n.01 - bucket.n.01_1 - bucket.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - agent.n.01_1 - agent.n.01 + bathtub.n.01_1 bathtub.n.01_* - bathtub.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + floor.n.01_1 - floor.n.01 + bucket.n.01_1 - bucket.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_bedroom/problem0.bddl b/bddl/activity_definitions/cleaning_bedroom/problem0.bddl index 3d253d47..1d07b69d 100644 --- a/bddl/activity_definitions/cleaning_bedroom/problem0.bddl +++ b/bddl/activity_definitions/cleaning_bedroom/problem0.bddl @@ -5,14 +5,14 @@ dust.n.01_1 - dust.n.01 floor.n.01_1 - floor.n.01 trouser.n.01_1 trouser.n.01_2 - trouser.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 jewelry.n.01_1 - jewelry.n.01 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 sheet.n.03_1 - sheet.n.03 - cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_2 cabinet.n.01_* - cabinet.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_carpets/problem0.bddl b/bddl/activity_definitions/cleaning_carpets/problem0.bddl index 91cee986..0ee51d16 100644 --- a/bddl/activity_definitions/cleaning_carpets/problem0.bddl +++ b/bddl/activity_definitions/cleaning_carpets/problem0.bddl @@ -3,14 +3,14 @@ (:objects stain.n.01_1 - stain.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.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 - cabinet.n.01_1 - cabinet.n.01 - door.n.01_1 - door.n.01 + cabinet.n.01_1 - cabinet.n.01 + door.n.01_1 - door.n.01 sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_driveway/problem0.bddl b/bddl/activity_definitions/cleaning_driveway/problem0.bddl index 2f69fb34..65a34b87 100644 --- a/bddl/activity_definitions/cleaning_driveway/problem0.bddl +++ b/bddl/activity_definitions/cleaning_driveway/problem0.bddl @@ -4,7 +4,7 @@ (:objects bunchgrass.n.01_1 - bunchgrass.n.01 dust.n.01_1 - dust.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 broom.n.01_1 - broom.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/cleaning_floors/problem0.bddl b/bddl/activity_definitions/cleaning_floors/problem0.bddl index 001a4500..25424095 100644 --- a/bddl/activity_definitions/cleaning_floors/problem0.bddl +++ b/bddl/activity_definitions/cleaning_floors/problem0.bddl @@ -4,15 +4,15 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - floor.n.01_1 - floor.n.01 - broom.n.01_1 - broom.n.01 - dustpan.n.02_1 - dustpan.n.02 + floor.n.01_1 floor.n.01_* - floor.n.01 + 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 - agent.n.01_1 - agent.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 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_freezer/problem0.bddl b/bddl/activity_definitions/cleaning_freezer/problem0.bddl index 8754b542..828fe4e6 100644 --- a/bddl/activity_definitions/cleaning_freezer/problem0.bddl +++ b/bddl/activity_definitions/cleaning_freezer/problem0.bddl @@ -3,15 +3,15 @@ (:objects stain.n.01_1 - stain.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 - prawn.n.01 - detergent.n.02_1 - detergent.n.02 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + prawn.n.01_1 prawn.n.01_2 prawn.n.01_3 - prawn.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 - sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + table.n.02_1 - table.n.02 + towel.n.01_1 - towel.n.01 + floor.n.01_1 - floor.n.01 + sink.n.01_1 - sink.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_garage/problem0.bddl b/bddl/activity_definitions/cleaning_garage/problem0.bddl index 01ca426b..7315d18a 100644 --- a/bddl/activity_definitions/cleaning_garage/problem0.bddl +++ b/bddl/activity_definitions/cleaning_garage/problem0.bddl @@ -4,16 +4,16 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - newspaper.n.03_1 newspaper.n.03_2 - newspaper.n.03 - bottle.n.01_1 bottle.n.01_2 - bottle.n.01 - cabinet.n.01_1 - cabinet.n.01 - broom.n.01_1 - broom.n.01 - rag.n.01_1 - rag.n.01 - table.n.02_1 - table.n.02 - recycling_bin.n.01_1 - recycling_bin.n.01 - sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + newspaper.n.03_1 newspaper.n.03_2 - newspaper.n.03 + bottle.n.01_1 bottle.n.01_2 - bottle.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + broom.n.01_1 - broom.n.01 + rag.n.01_1 - rag.n.01 + table.n.02_1 table.n.02_* - table.n.02 + recycling_bin.n.01_1 - recycling_bin.n.01 + sink.n.01_1 - sink.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_garden_path/problem0.bddl b/bddl/activity_definitions/cleaning_garden_path/problem0.bddl index e180e9ad..307cd785 100644 --- a/bddl/activity_definitions/cleaning_garden_path/problem0.bddl +++ b/bddl/activity_definitions/cleaning_garden_path/problem0.bddl @@ -3,7 +3,7 @@ (:objects plastic_bag.n.01_1 - plastic_bag.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 floor.n.01_1 - floor.n.01 paper.n.01_1 paper.n.01_2 paper.n.01_3 - paper.n.01 dust.n.01_1 - dust.n.01 diff --git a/bddl/activity_definitions/cleaning_garden_tools/problem0.bddl b/bddl/activity_definitions/cleaning_garden_tools/problem0.bddl index 39bd819d..c2c956bf 100644 --- a/bddl/activity_definitions/cleaning_garden_tools/problem0.bddl +++ b/bddl/activity_definitions/cleaning_garden_tools/problem0.bddl @@ -16,9 +16,9 @@ liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 mud.n.03_1 - mud.n.03 - water.n.06_1 - water.n.06 + water.n.06_1 - water.n.06 watering_can.n.01_1 - watering_can.n.01 - rail_fence.n.01_1 - rail_fence.n.01 + rail_fence.n.01_1 rail_fence.n.01_* - rail_fence.n.01 steel_wool.n.01_1 - steel_wool.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_glasses_off_bar/problem0.bddl b/bddl/activity_definitions/cleaning_glasses_off_bar/problem0.bddl index abc67da8..6af72d82 100644 --- a/bddl/activity_definitions/cleaning_glasses_off_bar/problem0.bddl +++ b/bddl/activity_definitions/cleaning_glasses_off_bar/problem0.bddl @@ -10,7 +10,7 @@ beer_glass.n.01_1 beer_glass.n.01_2 - beer_glass.n.01 beer.n.01_1 - beer.n.01 countertop.n.01_1 - countertop.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl b/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl index 19cbed53..d5361c8b 100644 --- a/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl +++ b/bddl/activity_definitions/cleaning_kitchen_cupboard/problem0.bddl @@ -3,15 +3,15 @@ (:objects dust.n.01_1 - dust.n.01 - cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 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 - agent.n.01_1 - agent.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 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_microwave_oven/problem0.bddl b/bddl/activity_definitions/cleaning_microwave_oven/problem0.bddl index 36022343..2b04b5ab 100644 --- a/bddl/activity_definitions/cleaning_microwave_oven/problem0.bddl +++ b/bddl/activity_definitions/cleaning_microwave_oven/problem0.bddl @@ -4,14 +4,14 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - microwave.n.02_1 - microwave.n.02 - rag.n.01_1 - rag.n.01 - countertop.n.01_1 - countertop.n.01 - ashcan.n.01_1 - ashcan.n.01 - floor.n.01_1 - floor.n.01 - cabinet.n.01_1 - cabinet.n.01 - sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + microwave.n.02_1 microwave.n.02_* - microwave.n.02 + rag.n.01_1 - rag.n.01 + countertop.n.01_1 - countertop.n.01 + ashcan.n.01_1 - ashcan.n.01 + floor.n.01_1 - floor.n.01 + cabinet.n.01_1 - cabinet.n.01 + sink.n.01_1 - sink.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_out_drawers/problem0.bddl b/bddl/activity_definitions/cleaning_out_drawers/problem0.bddl index b15c6627..dc309c96 100644 --- a/bddl/activity_definitions/cleaning_out_drawers/problem0.bddl +++ b/bddl/activity_definitions/cleaning_out_drawers/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - bowl.n.01_1 bowl.n.01_2 - bowl.n.01 - cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 - tablespoon.n.02_1 tablespoon.n.02_2 - tablespoon.n.02 - dinner_napkin.n.01_1 - dinner_napkin.n.01 - sink.n.01_1 - sink.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + bowl.n.01_1 bowl.n.01_2 - bowl.n.01 + cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 + tablespoon.n.02_1 tablespoon.n.02_2 - tablespoon.n.02 + dinner_napkin.n.01_1 - dinner_napkin.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_oven/problem0.bddl b/bddl/activity_definitions/cleaning_oven/problem0.bddl index 956bef6e..a264b6e3 100644 --- a/bddl/activity_definitions/cleaning_oven/problem0.bddl +++ b/bddl/activity_definitions/cleaning_oven/problem0.bddl @@ -3,16 +3,16 @@ (:objects stain.n.01_1 - stain.n.01 - dustpan.n.02_1 - dustpan.n.02 - floor.n.01_1 - floor.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - cabinet.n.01_1 - cabinet.n.01 - rag.n.01_1 rag.n.01_2 - rag.n.01 - newspaper.n.03_1 - newspaper.n.03 - sink.n.01_1 - sink.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - oven.n.01_1 - oven.n.01 - agent.n.01_1 - agent.n.01 + dustpan.n.02_1 - dustpan.n.02 + floor.n.01_1 - floor.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + cabinet.n.01_1 - cabinet.n.01 + rag.n.01_1 rag.n.01_2 - rag.n.01 + newspaper.n.03_1 - newspaper.n.03 + sink.n.01_1 - sink.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + oven.n.01_1 oven.n.01_* - oven.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_parks/problem0.bddl b/bddl/activity_definitions/cleaning_parks/problem0.bddl index 74087e50..f62884cd 100644 --- a/bddl/activity_definitions/cleaning_parks/problem0.bddl +++ b/bddl/activity_definitions/cleaning_parks/problem0.bddl @@ -3,7 +3,7 @@ (:objects water_bottle.n.01_1 water_bottle.n.01_2 water_bottle.n.01_3 - water_bottle.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 recycling_bin.n.01_1 - recycling_bin.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl b/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl index 36c33c28..85a8f6cf 100644 --- a/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl +++ b/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl @@ -4,7 +4,7 @@ (:objects lawn_chair.n.01_1 lawn_chair.n.01_2 lawn_chair.n.01_3 lawn_chair.n.01_4 - lawn_chair.n.01 floor.n.01_1 - floor.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 bucket.n.01_1 - bucket.n.01 liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 diff --git a/bddl/activity_definitions/cleaning_restaurant_table/problem0.bddl b/bddl/activity_definitions/cleaning_restaurant_table/problem0.bddl index caf2ad00..bf4409d7 100644 --- a/bddl/activity_definitions/cleaning_restaurant_table/problem0.bddl +++ b/bddl/activity_definitions/cleaning_restaurant_table/problem0.bddl @@ -5,14 +5,14 @@ dinner_napkin.n.01_1 - dinner_napkin.n.01 hand_towel.n.01_1 - hand_towel.n.01 breadcrumb.n.01_1 - breadcrumb.n.01 - breakfast_table.n.01_1 breakfast_table.n.01_2 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_2 breakfast_table.n.01_* - breakfast_table.n.01 rag.n.01_1 - rag.n.01 bowl.n.01_1 - bowl.n.01 disinfectant.n.01_1 - disinfectant.n.01 disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 ashcan.n.01_1 - ashcan.n.01 water.n.06_1 - water.n.06 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_shed/problem0.bddl b/bddl/activity_definitions/cleaning_shed/problem0.bddl index 565fb0fa..bb9b63e5 100644 --- a/bddl/activity_definitions/cleaning_shed/problem0.bddl +++ b/bddl/activity_definitions/cleaning_shed/problem0.bddl @@ -3,7 +3,7 @@ (:objects broom.n.01_1 - broom.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 vacuum.n.04_1 - vacuum.n.04 rake.n.03_1 - rake.n.03 shovel.n.01_1 - shovel.n.01 diff --git a/bddl/activity_definitions/cleaning_shoes/problem0.bddl b/bddl/activity_definitions/cleaning_shoes/problem0.bddl index be3d4cbf..6d1bca7e 100644 --- a/bddl/activity_definitions/cleaning_shoes/problem0.bddl +++ b/bddl/activity_definitions/cleaning_shoes/problem0.bddl @@ -4,14 +4,14 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - bed.n.01_1 - bed.n.01 - floor.n.01_1 - floor.n.01 - rag.n.01_1 - rag.n.01 - towel.n.01_1 - towel.n.01 - gym_shoe.n.01_1 gym_shoe.n.01_2 gym_shoe.n.01_3 gym_shoe.n.01_4 - gym_shoe.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + bed.n.01_1 - bed.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + rag.n.01_1 - rag.n.01 + towel.n.01_1 - towel.n.01 + gym_shoe.n.01_1 gym_shoe.n.01_2 gym_shoe.n.01_3 gym_shoe.n.01_4 - gym_shoe.n.01 sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_sneakers/problem0.bddl b/bddl/activity_definitions/cleaning_sneakers/problem0.bddl index 72b82b0e..9d288c69 100644 --- a/bddl/activity_definitions/cleaning_sneakers/problem0.bddl +++ b/bddl/activity_definitions/cleaning_sneakers/problem0.bddl @@ -4,16 +4,16 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - gym_shoe.n.01_1 gym_shoe.n.01_2 gym_shoe.n.01_3 gym_shoe.n.01_4 - gym_shoe.n.01 - countertop.n.01_1 - countertop.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - cabinet.n.01_1 - cabinet.n.01 - towel.n.01_1 - towel.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - sink.n.01_1 - sink.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - table.n.02_1 - table.n.02 - agent.n.01_1 - agent.n.01 + gym_shoe.n.01_1 gym_shoe.n.01_2 gym_shoe.n.01_3 gym_shoe.n.01_4 - gym_shoe.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + cabinet.n.01_1 - cabinet.n.01 + towel.n.01_1 - towel.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + table.n.02_1 table.n.02_* - table.n.02 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_stove/problem0.bddl b/bddl/activity_definitions/cleaning_stove/problem0.bddl index 6c7be282..4c804975 100644 --- a/bddl/activity_definitions/cleaning_stove/problem0.bddl +++ b/bddl/activity_definitions/cleaning_stove/problem0.bddl @@ -4,12 +4,12 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - stove.n.01_1 - stove.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - cabinet.n.01_1 - cabinet.n.01 - rag.n.01_1 - rag.n.01 - sink.n.01_1 - sink.n.01 - dishtowel.n.01_1 - dishtowel.n.01 + stove.n.01_1 stove.n.01_* - stove.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + cabinet.n.01_1 - cabinet.n.01 + rag.n.01_1 - rag.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + dishtowel.n.01_1 - dishtowel.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_table_after_clearing/problem0.bddl b/bddl/activity_definitions/cleaning_table_after_clearing/problem0.bddl index fee5c406..838d410d 100644 --- a/bddl/activity_definitions/cleaning_table_after_clearing/problem0.bddl +++ b/bddl/activity_definitions/cleaning_table_after_clearing/problem0.bddl @@ -3,13 +3,13 @@ (:objects stain.n.01_1 - stain.n.01 - table.n.02_1 - table.n.02 - bar_soap.n.01_1 - bar_soap.n.01 - sink.n.01_1 - sink.n.01 - floor.n.01_1 - floor.n.01 - dishtowel.n.01_1 - dishtowel.n.01 - cabinet.n.01_1 - cabinet.n.01 - agent.n.01_1 - agent.n.01 + table.n.02_1 table.n.02_* - table.n.02 + bar_soap.n.01_1 - bar_soap.n.01 + sink.n.01_1 - sink.n.01 + floor.n.01_1 - floor.n.01 + dishtowel.n.01_1 - dishtowel.n.01 + cabinet.n.01_1 - cabinet.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_the_hot_tub/problem0.bddl b/bddl/activity_definitions/cleaning_the_hot_tub/problem0.bddl index 0fe2e122..7ff9a4d1 100644 --- a/bddl/activity_definitions/cleaning_the_hot_tub/problem0.bddl +++ b/bddl/activity_definitions/cleaning_the_hot_tub/problem0.bddl @@ -3,11 +3,11 @@ (:objects stain.n.01_1 - stain.n.01 - pool.n.01_1 - pool.n.01 - floor.n.01_1 - floor.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 + pool.n.01_1 pool.n.01_* - pool.n.01 + floor.n.01_1 - floor.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl index 162d1fbb..14dc6ed2 100644 --- a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl +++ b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl @@ -3,13 +3,13 @@ (:objects stain.n.01_1 - stain.n.01 - pool.n.01_1 - pool.n.01 - floor.n.01_1 - floor.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - detergent.n.02_1 - detergent.n.02 - detergent__bottle.n.01_1 - detergent__bottle.n.01 + pool.n.01_1 pool.n.01_* - pool.n.01 + floor.n.01_1 - floor.n.01 + scrub_brush.n.01_1 - scrub_brush.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 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cleaning_toilet/problem0.bddl b/bddl/activity_definitions/cleaning_toilet/problem0.bddl index 8002a382..965ec417 100644 --- a/bddl/activity_definitions/cleaning_toilet/problem0.bddl +++ b/bddl/activity_definitions/cleaning_toilet/problem0.bddl @@ -3,13 +3,13 @@ (:objects stain.n.01_1 - stain.n.01 - toilet.n.02_1 - toilet.n.02 - 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 + toilet.n.02_1 toilet.n.02_* - toilet.n.02 + scrub_brush.n.01_1 - scrub_brush.n.01 + floor.n.01_1 floor.n.01_* - 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 + agent.n.01_1 - agent.n.01 ) (:init 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 1502def4..da08ee5d 100644 --- a/bddl/activity_definitions/cleaning_up_after_a_meal/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_after_a_meal/problem0.bddl @@ -3,19 +3,19 @@ (:objects stain.n.01_1 - stain.n.01 - bowl.n.01_1 bowl.n.01_2 - bowl.n.01 - table.n.02_1 - table.n.02 - sack.n.01_1 - sack.n.01 - chair.n.01_1 chair.n.01_2 - chair.n.01 - plate.n.04_1 plate.n.04_2 plate.n.04_3 plate.n.04_4 - plate.n.04 - cup.n.01_1 cup.n.01_2 - cup.n.01 - 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 + bowl.n.01_1 bowl.n.01_2 - bowl.n.01 + table.n.02_1 table.n.02_* - table.n.02 + sack.n.01_1 - sack.n.01 + chair.n.01_1 chair.n.01_2 - chair.n.01 + plate.n.04_1 plate.n.04_2 plate.n.04_3 plate.n.04_4 - plate.n.04 + cup.n.01_1 cup.n.01_2 - cup.n.01 + hamburger.n.01_1 hamburger.n.01_2 - hamburger.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - 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 + agent.n.01_1 - agent.n.01 ) (:init 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 eb382ece..55fc4caa 100644 --- a/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_after_an_event/problem0.bddl @@ -5,17 +5,17 @@ cup.n.01_1 cup.n.01_2 cup.n.01_3 cup.n.01_4 - cup.n.01 cabinet.n.01_1 - cabinet.n.01 floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - dishwasher.n.01_1 - dishwasher.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 hotdog.n.02_1 - hotdog.n.02 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.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 disinfectant.n.01_1 - disinfectant.n.01 curtain.n.01_1 - curtain.n.01 - window.n.01_1 - window.n.01 + window.n.01_1 window.n.01_* - window.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_up_branches_and_twigs/problem0.bddl b/bddl/activity_definitions/cleaning_up_branches_and_twigs/problem0.bddl index ae9256e1..abe99a08 100644 --- a/bddl/activity_definitions/cleaning_up_branches_and_twigs/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_branches_and_twigs/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 floor.n.01_1 - floor.n.01 grill.n.02_1 - grill.n.02 branch.n.02_1 branch.n.02_2 branch.n.02_3 - branch.n.02 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 28b755e5..4aa74fab 100644 --- a/bddl/activity_definitions/cleaning_up_plates_and_food/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_plates_and_food/problem0.bddl @@ -9,8 +9,8 @@ bowl.n.01_1 - bowl.n.01 ashcan.n.01_1 - ashcan.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - sink.n.01_1 - sink.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 cabinet.n.01_1 - cabinet.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cleaning_up_refrigerator/problem0.bddl b/bddl/activity_definitions/cleaning_up_refrigerator/problem0.bddl index 1a96aa31..5f694c49 100644 --- a/bddl/activity_definitions/cleaning_up_refrigerator/problem0.bddl +++ b/bddl/activity_definitions/cleaning_up_refrigerator/problem0.bddl @@ -4,14 +4,14 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - rag.n.01_1 rag.n.01_2 - rag.n.01 - cabinet.n.01_1 - cabinet.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - countertop.n.01_1 - countertop.n.01 - tray.n.01_1 tray.n.01_2 - tray.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - bowl.n.01_1 - bowl.n.01 - sink.n.01_1 - sink.n.01 + rag.n.01_1 rag.n.01_2 - rag.n.01 + cabinet.n.01_1 - cabinet.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + countertop.n.01_1 - countertop.n.01 + tray.n.01_1 tray.n.01_2 - tray.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + bowl.n.01_1 - bowl.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 agent.n.01_1 - agent.n.01 floor.n.01_1 - floor.n.01 ) diff --git a/bddl/activity_definitions/cleaning_windows/problem0.bddl b/bddl/activity_definitions/cleaning_windows/problem0.bddl index 37db3b55..5b430bc1 100644 --- a/bddl/activity_definitions/cleaning_windows/problem0.bddl +++ b/bddl/activity_definitions/cleaning_windows/problem0.bddl @@ -3,15 +3,15 @@ (:objects dust.n.01_1 - dust.n.01 - towel.n.01_1 towel.n.01_2 - towel.n.01 - 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 - table.n.02_1 - table.n.02 + towel.n.01_1 towel.n.01_2 - towel.n.01 + 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_* - window.n.01 + sink.n.01_1 - sink.n.01 + floor.n.01_1 floor.n.01_2 - floor.n.01 + table.n.02_1 - table.n.02 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clearing_food_from_table_into_fridge/problem0.bddl b/bddl/activity_definitions/clearing_food_from_table_into_fridge/problem0.bddl index ad21a265..2cf41ed5 100644 --- a/bddl/activity_definitions/clearing_food_from_table_into_fridge/problem0.bddl +++ b/bddl/activity_definitions/clearing_food_from_table_into_fridge/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - chicken_wing.n.01_1 - chicken_wing.n.01 + chicken_wing.n.01_1 - chicken_wing.n.01 half__apple_pie.n.01_1 - half__apple_pie.n.01 plate.n.04_1 plate.n.04_2 - plate.n.04 breakfast_table.n.01_1 - breakfast_table.n.01 tupperware.n.01_1 tupperware.n.01_2 - tupperware.n.01 countertop.n.01_1 - countertop.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clearing_table_after_breakfast/problem0.bddl b/bddl/activity_definitions/clearing_table_after_breakfast/problem0.bddl index 473a4af8..a4aab76a 100644 --- a/bddl/activity_definitions/clearing_table_after_breakfast/problem0.bddl +++ b/bddl/activity_definitions/clearing_table_after_breakfast/problem0.bddl @@ -9,8 +9,8 @@ chocolate_milk.n.01_1 - chocolate_milk.n.01 pitcher.n.02_1 - pitcher.n.02 water.n.06_1 - water.n.06 - sink.n.01_1 - sink.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/clearing_table_after_coffee/problem0.bddl b/bddl/activity_definitions/clearing_table_after_coffee/problem0.bddl index 46831e82..ecec950b 100644 --- a/bddl/activity_definitions/clearing_table_after_coffee/problem0.bddl +++ b/bddl/activity_definitions/clearing_table_after_coffee/problem0.bddl @@ -5,7 +5,7 @@ countertop.n.01_1 - countertop.n.01 mug.n.04_1 mug.n.04_2 - mug.n.04 drip_coffee.n.01_1 - drip_coffee.n.01 - dishwasher.n.01_1 - dishwasher.n.01 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clearing_table_after_dinner/problem0.bddl b/bddl/activity_definitions/clearing_table_after_dinner/problem0.bddl index db91fa14..5126a7a3 100644 --- a/bddl/activity_definitions/clearing_table_after_dinner/problem0.bddl +++ b/bddl/activity_definitions/clearing_table_after_dinner/problem0.bddl @@ -8,8 +8,8 @@ tupperware.n.01_1 tupperware.n.01_2 - tupperware.n.01 water.n.06_1 - water.n.06 breakfast_table.n.01_1 - breakfast_table.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - sink.n.01_1 - sink.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/clearing_table_after_supper/problem0.bddl b/bddl/activity_definitions/clearing_table_after_supper/problem0.bddl index 0d61e326..3d638e55 100644 --- a/bddl/activity_definitions/clearing_table_after_supper/problem0.bddl +++ b/bddl/activity_definitions/clearing_table_after_supper/problem0.bddl @@ -9,8 +9,8 @@ breakfast_table.n.01_1 - breakfast_table.n.01 tablefork.n.01_1 tablefork.n.01_2 tablefork.n.01_3 - tablefork.n.01 cabinet.n.01_1 - cabinet.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - dishwasher.n.01_1 - dishwasher.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cold_brew_coffee/problem0.bddl b/bddl/activity_definitions/cold_brew_coffee/problem0.bddl index cf5099ae..a22a7570 100644 --- a/bddl/activity_definitions/cold_brew_coffee/problem0.bddl +++ b/bddl/activity_definitions/cold_brew_coffee/problem0.bddl @@ -8,7 +8,7 @@ countertop.n.01_1 - countertop.n.01 sink.n.01_1 - sink.n.01 tablespoon.n.02_1 - tablespoon.n.02 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 agent.n.01_1 - agent.n.01 floor.n.01_1 - floor.n.01 ) diff --git a/bddl/activity_definitions/collecting_childrens_toys/problem0.bddl b/bddl/activity_definitions/collecting_childrens_toys/problem0.bddl index 53521d9f..05c1601f 100644 --- a/bddl/activity_definitions/collecting_childrens_toys/problem0.bddl +++ b/bddl/activity_definitions/collecting_childrens_toys/problem0.bddl @@ -8,7 +8,7 @@ train_set.n.01_1 - train_set.n.01 board_game.n.01_1 board_game.n.01_2 - board_game.n.01 coffee_table.n.01_1 - coffee_table.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/collecting_dishes_from_around_house/problem0.bddl b/bddl/activity_definitions/collecting_dishes_from_around_house/problem0.bddl index 788d2e25..d46f1ad3 100644 --- a/bddl/activity_definitions/collecting_dishes_from_around_house/problem0.bddl +++ b/bddl/activity_definitions/collecting_dishes_from_around_house/problem0.bddl @@ -6,7 +6,7 @@ coffee_table.n.01_1 - coffee_table.n.01 bowl.n.01_1 - bowl.n.01 console_table.n.01_1 - console_table.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/collecting_dishes_from_restaurant_tables/problem0.bddl b/bddl/activity_definitions/collecting_dishes_from_restaurant_tables/problem0.bddl index 5c12bfa3..a0e69e2a 100644 --- a/bddl/activity_definitions/collecting_dishes_from_restaurant_tables/problem0.bddl +++ b/bddl/activity_definitions/collecting_dishes_from_restaurant_tables/problem0.bddl @@ -6,7 +6,7 @@ breakfast_table.n.01_1 breakfast_table.n.01_2 - breakfast_table.n.01 plate.n.04_1 plate.n.04_2 - plate.n.04 water.n.06_1 - water.n.06 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/collecting_mail_from_the_letterbox/problem0.bddl b/bddl/activity_definitions/collecting_mail_from_the_letterbox/problem0.bddl index fc8219a6..12b54ef4 100644 --- a/bddl/activity_definitions/collecting_mail_from_the_letterbox/problem0.bddl +++ b/bddl/activity_definitions/collecting_mail_from_the_letterbox/problem0.bddl @@ -5,7 +5,7 @@ mailbox.n.01_1 - mailbox.n.01 envelope.n.01_1 - envelope.n.01 driveway.n.01_1 - driveway.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/collecting_wood/problem0.bddl b/bddl/activity_definitions/collecting_wood/problem0.bddl index 63d74c62..e5fa13ba 100644 --- a/bddl/activity_definitions/collecting_wood/problem0.bddl +++ b/bddl/activity_definitions/collecting_wood/problem0.bddl @@ -3,7 +3,7 @@ (:objects log.n.01_1 log.n.01_2 log.n.01_3 log.n.01_4 - log.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/cook_arepas/problem0.bddl b/bddl/activity_definitions/cook_arepas/problem0.bddl index 49dce74b..f33c62ee 100644 --- a/bddl/activity_definitions/cook_arepas/problem0.bddl +++ b/bddl/activity_definitions/cook_arepas/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - arepa.n.01_1 - arepa.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - cooking_oil.n.01_1 - cooking_oil.n.01 - griddle.n.01_1 - griddle.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 - countertop.n.01_1 - countertop.n.01 + arepa.n.01_1 - arepa.n.01 + electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + cooking_oil.n.01_1 - cooking_oil.n.01 + griddle.n.01_1 - griddle.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 stove.n.01_1 - stove.n.01 ) diff --git a/bddl/activity_definitions/cook_broccolini/problem0.bddl b/bddl/activity_definitions/cook_broccolini/problem0.bddl index 29ae1515..6635ab0c 100644 --- a/bddl/activity_definitions/cook_broccolini/problem0.bddl +++ b/bddl/activity_definitions/cook_broccolini/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - broccolini.n.01_1 - broccolini.n.01 - cookie_sheet.n.01_1 - cookie_sheet.n.01 - clove.n.03_1 clove.n.03_2 clove.n.03_3 - clove.n.03 - bell_pepper.n.02_1 - bell_pepper.n.02 - oven.n.01_1 - oven.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + broccolini.n.01_1 - broccolini.n.01 + cookie_sheet.n.01_1 - cookie_sheet.n.01 + clove.n.03_1 clove.n.03_2 clove.n.03_3 - clove.n.03 + bell_pepper.n.02_1 - bell_pepper.n.02 + oven.n.01_1 oven.n.01_* - oven.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/cook_lasagne/problem0.bddl b/bddl/activity_definitions/cook_lasagne/problem0.bddl index bfc43192..eb1ad467 100644 --- a/bddl/activity_definitions/cook_lasagne/problem0.bddl +++ b/bddl/activity_definitions/cook_lasagne/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - lasagna.n.01_1 - lasagna.n.01 - oven.n.01_1 - oven.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + lasagna.n.01_1 - lasagna.n.01 + oven.n.01_1 oven.n.01_* - oven.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/covering_boat/problem0.bddl b/bddl/activity_definitions/covering_boat/problem0.bddl index a3f3a9da..65490ac4 100644 --- a/bddl/activity_definitions/covering_boat/problem0.bddl +++ b/bddl/activity_definitions/covering_boat/problem0.bddl @@ -3,7 +3,7 @@ (:objects kayak.n.01_1 - kayak.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 tarpaulin.n.01_1 - tarpaulin.n.01 rope.n.01_1 rope.n.01_2 - rope.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/de_clutter_your_garage/problem0.bddl b/bddl/activity_definitions/de_clutter_your_garage/problem0.bddl index ae0105f2..a38f6a9a 100644 --- a/bddl/activity_definitions/de_clutter_your_garage/problem0.bddl +++ b/bddl/activity_definitions/de_clutter_your_garage/problem0.bddl @@ -4,15 +4,15 @@ (:objects ski.n.01_1 ski.n.01_2 - ski.n.01 floor.n.01_1 - floor.n.01 - door.n.01_1 - door.n.01 + door.n.01_1 door.n.01_* - door.n.01 bicycle.n.01_1 - bicycle.n.01 tennis_racket.n.01_1 - tennis_racket.n.01 carton.n.02_1 - carton.n.02 hockey_stick.n.01_1 - hockey_stick.n.01 shovel.n.01_1 - shovel.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 ashcan.n.01_1 - ashcan.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl b/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl index 81dd5101..54060dd6 100644 --- a/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl +++ b/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl @@ -3,11 +3,11 @@ (:objects dip.n.07_1 - dip.n.07 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 wreath.n.01_1 - wreath.n.01 floor.n.01_1 - floor.n.01 candlestick.n.01_1 - candlestick.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 bookcase.n.01_1 - bookcase.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl b/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl index 1df525c0..c1d1c8b4 100644 --- a/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl +++ b/bddl/activity_definitions/decorating_outside_for_parties/problem0.bddl @@ -4,13 +4,13 @@ (:objects balloon.n.01_1 balloon.n.01_2 balloon.n.01_3 balloon.n.01_4 - balloon.n.01 carton.n.02_1 - carton.n.02 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 centerpiece.n.02_1 - centerpiece.n.02 gift_box.n.01_1 - gift_box.n.01 bow.n.08_1 - bow.n.08 tree.n.01_1 - tree.n.01 - wall_nail.n.01_1 - wall_nail.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/defrosting_freezer/problem0.bddl b/bddl/activity_definitions/defrosting_freezer/problem0.bddl index 68af9b96..88ad4ebc 100644 --- a/bddl/activity_definitions/defrosting_freezer/problem0.bddl +++ b/bddl/activity_definitions/defrosting_freezer/problem0.bddl @@ -2,17 +2,17 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - sink.n.01_1 - sink.n.01 - countertop.n.01_1 - countertop.n.01 - dustpan.n.02_1 - dustpan.n.02 - bucket.n.01_1 - bucket.n.01 - scraper.n.01_1 - scraper.n.01 - towel.n.01_1 - towel.n.01 - rag.n.01_1 - rag.n.01 - crayfish.n.02_1 crayfish.n.02_2 crayfish.n.02_3 - crayfish.n.02 - agent.n.01_1 - agent.n.01 + floor.n.01_1 - floor.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + dustpan.n.02_1 - dustpan.n.02 + bucket.n.01_1 - bucket.n.01 + scraper.n.01_1 - scraper.n.01 + towel.n.01_1 - towel.n.01 + rag.n.01_1 - rag.n.01 + crayfish.n.02_1 crayfish.n.02_2 crayfish.n.02_3 - crayfish.n.02 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/delivering_groceries_to_doorstep/problem0.bddl b/bddl/activity_definitions/delivering_groceries_to_doorstep/problem0.bddl index 1fce65e6..2ed55bfe 100644 --- a/bddl/activity_definitions/delivering_groceries_to_doorstep/problem0.bddl +++ b/bddl/activity_definitions/delivering_groceries_to_doorstep/problem0.bddl @@ -5,9 +5,9 @@ bread_slice.n.01_1 - bread_slice.n.01 sack.n.01_1 - sack.n.01 carton__of__milk.n.01_1 - carton__of__milk.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 driveway.n.01_1 - driveway.n.01 - door.n.01_1 - door.n.01 + door.n.01_1 door.n.01_* - door.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/disinfect_laundry/problem0.bddl b/bddl/activity_definitions/disinfect_laundry/problem0.bddl index 119c1bef..b70ba49e 100644 --- a/bddl/activity_definitions/disinfect_laundry/problem0.bddl +++ b/bddl/activity_definitions/disinfect_laundry/problem0.bddl @@ -6,7 +6,7 @@ disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 jersey.n.03_1 jersey.n.03_2 jersey.n.03_3 - jersey.n.03 sink.n.01_1 - sink.n.01 - washer.n.03_1 - washer.n.03 + washer.n.03_1 washer.n.03_* - washer.n.03 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/dispose_of_a_pizza_box/problem0.bddl b/bddl/activity_definitions/dispose_of_a_pizza_box/problem0.bddl index 9ba8bff0..8a4c54e3 100644 --- a/bddl/activity_definitions/dispose_of_a_pizza_box/problem0.bddl +++ b/bddl/activity_definitions/dispose_of_a_pizza_box/problem0.bddl @@ -6,7 +6,7 @@ electric_refrigerator.n.01_1 - electric_refrigerator.n.01 pizza_box.n.01_1 - pizza_box.n.01 ashcan.n.01_1 - ashcan.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/doing_housework_for_adult/problem0.bddl b/bddl/activity_definitions/doing_housework_for_adult/problem0.bddl index e5e73267..d259e6fa 100644 --- a/bddl/activity_definitions/doing_housework_for_adult/problem0.bddl +++ b/bddl/activity_definitions/doing_housework_for_adult/problem0.bddl @@ -11,9 +11,9 @@ dust.n.01_1 - dust.n.01 rug.n.01_1 - rug.n.01 rag.n.01_1 - rag.n.01 - window.n.01_1 - window.n.01 - sink.n.01_1 - sink.n.01 - sofa.n.01_1 - sofa.n.01 + window.n.01_1 window.n.01_* - window.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/drying_table/problem0.bddl b/bddl/activity_definitions/drying_table/problem0.bddl index 24f66837..7aa9cce7 100644 --- a/bddl/activity_definitions/drying_table/problem0.bddl +++ b/bddl/activity_definitions/drying_table/problem0.bddl @@ -4,7 +4,7 @@ (:objects dishtowel.n.01_1 - dishtowel.n.01 water.n.06_1 - water.n.06 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 floor.n.01_1 - floor.n.01 cabinet.n.01_1 - cabinet.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/emptying_trash_cans/problem0.bddl b/bddl/activity_definitions/emptying_trash_cans/problem0.bddl index 696c29af..01018470 100644 --- a/bddl/activity_definitions/emptying_trash_cans/problem0.bddl +++ b/bddl/activity_definitions/emptying_trash_cans/problem0.bddl @@ -3,7 +3,7 @@ (:objects ashcan.n.01_1 ashcan.n.01_2 - ashcan.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 rag.n.01_1 rag.n.01_2 - rag.n.01 newspaper.n.03_1 - newspaper.n.03 water_bottle.n.01_1 - water_bottle.n.01 diff --git a/bddl/activity_definitions/fixing_broken_chair/problem0.bddl b/bddl/activity_definitions/fixing_broken_chair/problem0.bddl index cdd533be..48770658 100644 --- a/bddl/activity_definitions/fixing_broken_chair/problem0.bddl +++ b/bddl/activity_definitions/fixing_broken_chair/problem0.bddl @@ -2,9 +2,9 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 - armchair.n.01_1 - armchair.n.01 - agent.n.01_1 - agent.n.01 + floor.n.01_1 - floor.n.01 + armchair.n.01_1 armchair.n.01_* - armchair.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/folding_clean_laundry/problem0.bddl b/bddl/activity_definitions/folding_clean_laundry/problem0.bddl index 9dfe58df..731f9eb8 100644 --- a/bddl/activity_definitions/folding_clean_laundry/problem0.bddl +++ b/bddl/activity_definitions/folding_clean_laundry/problem0.bddl @@ -6,7 +6,7 @@ sock.n.01_1 sock.n.01_2 - sock.n.01 trouser.n.01_1 - trouser.n.01 dishtowel.n.01_1 dishtowel.n.01_2 - dishtowel.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/folding_clothes/problem0.bddl b/bddl/activity_definitions/folding_clothes/problem0.bddl index 63d281df..767a166f 100644 --- a/bddl/activity_definitions/folding_clothes/problem0.bddl +++ b/bddl/activity_definitions/folding_clothes/problem0.bddl @@ -8,7 +8,7 @@ dress.n.01_1 - dress.n.01 brassiere.n.01_1 - brassiere.n.01 tank_top.n.01_1 - tank_top.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/folding_piece_of_cloth/problem0.bddl b/bddl/activity_definitions/folding_piece_of_cloth/problem0.bddl index 34c08800..f616c271 100644 --- a/bddl/activity_definitions/folding_piece_of_cloth/problem0.bddl +++ b/bddl/activity_definitions/folding_piece_of_cloth/problem0.bddl @@ -3,7 +3,7 @@ (:objects drawers.n.01_1 - drawers.n.01 - clothes_dryer.n.01_1 - clothes_dryer.n.01 + clothes_dryer.n.01_1 clothes_dryer.n.01_* - clothes_dryer.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/freeze_fruit/problem0.bddl b/bddl/activity_definitions/freeze_fruit/problem0.bddl index e6d0db0a..e23f5930 100644 --- a/bddl/activity_definitions/freeze_fruit/problem0.bddl +++ b/bddl/activity_definitions/freeze_fruit/problem0.bddl @@ -10,7 +10,7 @@ tray.n.01_1 - tray.n.01 strawberry.n.01_1 strawberry.n.01_2 - strawberry.n.01 floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/freeze_lasagna/problem0.bddl b/bddl/activity_definitions/freeze_lasagna/problem0.bddl index 19bd77eb..0edbb501 100644 --- a/bddl/activity_definitions/freeze_lasagna/problem0.bddl +++ b/bddl/activity_definitions/freeze_lasagna/problem0.bddl @@ -9,9 +9,9 @@ tupperware.n.01_1 tupperware.n.01_2 - tupperware.n.01 cabinet.n.01_1 - cabinet.n.01 aluminum_foil.n.01_1 aluminum_foil.n.01_2 - aluminum_foil.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/freeze_pies/problem0.bddl b/bddl/activity_definitions/freeze_pies/problem0.bddl index 805166de..ad38226b 100644 --- a/bddl/activity_definitions/freeze_pies/problem0.bddl +++ b/bddl/activity_definitions/freeze_pies/problem0.bddl @@ -10,7 +10,7 @@ water.n.06_1 - water.n.06 sink.n.01_1 - sink.n.01 floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/freeze_quiche/problem0.bddl b/bddl/activity_definitions/freeze_quiche/problem0.bddl index fabe19d3..46356b19 100644 --- a/bddl/activity_definitions/freeze_quiche/problem0.bddl +++ b/bddl/activity_definitions/freeze_quiche/problem0.bddl @@ -7,7 +7,7 @@ cabinet.n.01_1 - cabinet.n.01 plastic_wrap.n.01_1 plastic_wrap.n.01_2 - plastic_wrap.n.01 floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 tray.n.01_1 - tray.n.01 countertop.n.01_1 - countertop.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/freeze_vegetables/problem0.bddl b/bddl/activity_definitions/freeze_vegetables/problem0.bddl index 2ef4ffea..0afa1373 100644 --- a/bddl/activity_definitions/freeze_vegetables/problem0.bddl +++ b/bddl/activity_definitions/freeze_vegetables/problem0.bddl @@ -9,7 +9,7 @@ carrot.n.03_1 carrot.n.03_2 - carrot.n.03 floor.n.01_1 - floor.n.01 chopping_board.n.01_1 - chopping_board.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 countertop.n.01_1 - countertop.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/getting_organized_for_work/problem0.bddl b/bddl/activity_definitions/getting_organized_for_work/problem0.bddl index b919ce97..2ec7e6d4 100644 --- a/bddl/activity_definitions/getting_organized_for_work/problem0.bddl +++ b/bddl/activity_definitions/getting_organized_for_work/problem0.bddl @@ -8,7 +8,7 @@ notebook.n.01_1 - notebook.n.01 pen.n.01_1 - pen.n.01 folder.n.02_1 - folder.n.02 - desk.n.01_1 - desk.n.01 + desk.n.01_1 desk.n.01_* - desk.n.01 floor.n.01_1 - floor.n.01 computer.n.01_1 - computer.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/getting_package_from_post_office/problem0.bddl b/bddl/activity_definitions/getting_package_from_post_office/problem0.bddl index 9c3b5301..328c119f 100644 --- a/bddl/activity_definitions/getting_package_from_post_office/problem0.bddl +++ b/bddl/activity_definitions/getting_package_from_post_office/problem0.bddl @@ -4,7 +4,7 @@ (:objects keyboard.n.01_1 - keyboard.n.01 cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 - desk.n.01_1 - desk.n.01 + desk.n.01_1 desk.n.01_* - desk.n.01 package.n.02_1 package.n.02_2 - package.n.02 magazine.n.02_1 - magazine.n.02 letter.n.01_1 - letter.n.01 diff --git a/bddl/activity_definitions/hand_washing_clothing/problem0.bddl b/bddl/activity_definitions/hand_washing_clothing/problem0.bddl index 4ede655a..4e8a92df 100644 --- a/bddl/activity_definitions/hand_washing_clothing/problem0.bddl +++ b/bddl/activity_definitions/hand_washing_clothing/problem0.bddl @@ -7,7 +7,7 @@ detergent.n.02_1 - detergent.n.02 detergent__bottle.n.01_1 - detergent__bottle.n.01 trouser.n.01_1 - trouser.n.01 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 bucket.n.01_1 - bucket.n.01 water.n.06_1 - water.n.06 diff --git a/bddl/activity_definitions/hang_a_dartboard/problem0.bddl b/bddl/activity_definitions/hang_a_dartboard/problem0.bddl index b251509f..1a5dd66d 100644 --- a/bddl/activity_definitions/hang_a_dartboard/problem0.bddl +++ b/bddl/activity_definitions/hang_a_dartboard/problem0.bddl @@ -4,7 +4,7 @@ (:objects table.n.02_1 - table.n.02 dartboard.n.01_1 - dartboard.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 dart.n.01_1 dart.n.01_2 dart.n.01_3 - dart.n.01 packing_box.n.02_1 - packing_box.n.02 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/hang_icicle_lights/problem0.bddl b/bddl/activity_definitions/hang_icicle_lights/problem0.bddl index 4b2de8c6..3cc6c6e4 100644 --- a/bddl/activity_definitions/hang_icicle_lights/problem0.bddl +++ b/bddl/activity_definitions/hang_icicle_lights/problem0.bddl @@ -5,7 +5,7 @@ icicle_lights.n.01_1 - icicle_lights.n.01 coffee_table.n.01_1 - coffee_table.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl b/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl index 72c33b44..c7dc942e 100644 --- a/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl +++ b/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl @@ -6,7 +6,7 @@ paper_lantern.n.01_1 - paper_lantern.n.01 pole.n.01_1 - pole.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/hanging_blinds/problem0.bddl b/bddl/activity_definitions/hanging_blinds/problem0.bddl index 12a318f2..5d7b3cd8 100644 --- a/bddl/activity_definitions/hanging_blinds/problem0.bddl +++ b/bddl/activity_definitions/hanging_blinds/problem0.bddl @@ -4,7 +4,7 @@ (:objects window_blind.n.01_1 - window_blind.n.01 table.n.02_1 - table.n.02 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/hanging_outdoor_lights/problem0.bddl b/bddl/activity_definitions/hanging_outdoor_lights/problem0.bddl index bc27f4e4..9b2aff45 100644 --- a/bddl/activity_definitions/hanging_outdoor_lights/problem0.bddl +++ b/bddl/activity_definitions/hanging_outdoor_lights/problem0.bddl @@ -5,7 +5,7 @@ icicle_lights.n.01_1 - icicle_lights.n.01 coffee_table.n.01_1 - coffee_table.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 tree.n.01_1 - tree.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/hanging_pictures/problem0.bddl b/bddl/activity_definitions/hanging_pictures/problem0.bddl index 59db2731..ace74b70 100644 --- a/bddl/activity_definitions/hanging_pictures/problem0.bddl +++ b/bddl/activity_definitions/hanging_pictures/problem0.bddl @@ -4,7 +4,7 @@ (:objects picture_frame.n.01_1 - picture_frame.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/hanging_shades/problem0.bddl b/bddl/activity_definitions/hanging_shades/problem0.bddl index f5a25ba8..e8002f3a 100644 --- a/bddl/activity_definitions/hanging_shades/problem0.bddl +++ b/bddl/activity_definitions/hanging_shades/problem0.bddl @@ -4,7 +4,7 @@ (:objects window_blind.n.01_1 - window_blind.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/heating_food_up/problem0.bddl b/bddl/activity_definitions/heating_food_up/problem0.bddl index 1db82dbb..768f552b 100644 --- a/bddl/activity_definitions/heating_food_up/problem0.bddl +++ b/bddl/activity_definitions/heating_food_up/problem0.bddl @@ -5,7 +5,7 @@ hamburger.n.01_1 - hamburger.n.01 plate.n.04_1 - plate.n.04 microwave.n.02_1 - microwave.n.02 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/hiding_Easter_eggs/problem0.bddl b/bddl/activity_definitions/hiding_Easter_eggs/problem0.bddl index 538dc466..802c4670 100644 --- a/bddl/activity_definitions/hiding_Easter_eggs/problem0.bddl +++ b/bddl/activity_definitions/hiding_Easter_eggs/problem0.bddl @@ -4,9 +4,9 @@ (:objects easter_egg.n.01_1 easter_egg.n.01_2 easter_egg.n.01_3 - easter_egg.n.01 wicker_basket.n.01_1 - wicker_basket.n.01 - lawn.n.01_1 - lawn.n.01 - tree.n.01_1 - tree.n.01 - scrub.n.01_1 - scrub.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 + tree.n.01_1 tree.n.01_* - tree.n.01 + scrub.n.01_1 scrub.n.01_* - scrub.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/installing_a_fax_machine/problem0.bddl b/bddl/activity_definitions/installing_a_fax_machine/problem0.bddl index b075283f..e2908532 100644 --- a/bddl/activity_definitions/installing_a_fax_machine/problem0.bddl +++ b/bddl/activity_definitions/installing_a_fax_machine/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - facsimile.n.02_1 - facsimile.n.02 - floor.n.01_1 - floor.n.01 - table.n.02_1 - table.n.02 - agent.n.01_1 - agent.n.01 + facsimile.n.02_1 - facsimile.n.02 + floor.n.01_1 - floor.n.01 + table.n.02_1 table.n.02_* - table.n.02 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/installing_a_fence/problem0.bddl b/bddl/activity_definitions/installing_a_fence/problem0.bddl index 6fef4018..28bd501e 100644 --- a/bddl/activity_definitions/installing_a_fence/problem0.bddl +++ b/bddl/activity_definitions/installing_a_fence/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 spray_paint.n.01_1 - spray_paint.n.01 spray_paint__can.n.01_1 - spray_paint__can.n.01 - rail_fence.n.01_1 - rail_fence.n.01 + rail_fence.n.01_1 rail_fence.n.01_* - rail_fence.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/installing_a_modem/problem0.bddl b/bddl/activity_definitions/installing_a_modem/problem0.bddl index 1ff94b83..60987464 100644 --- a/bddl/activity_definitions/installing_a_modem/problem0.bddl +++ b/bddl/activity_definitions/installing_a_modem/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - modem.n.01_1 - modem.n.01 - table.n.02_1 - table.n.02 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + modem.n.01_1 - modem.n.01 + table.n.02_1 table.n.02_* - table.n.02 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/installing_a_printer/problem0.bddl b/bddl/activity_definitions/installing_a_printer/problem0.bddl index 681677ca..477ce8ce 100644 --- a/bddl/activity_definitions/installing_a_printer/problem0.bddl +++ b/bddl/activity_definitions/installing_a_printer/problem0.bddl @@ -2,9 +2,9 @@ (:domain omnigibson) (:objects - printer.n.03_1 - printer.n.03 - floor.n.01_1 - floor.n.01 - table.n.02_1 - table.n.02 + printer.n.03_1 - printer.n.03 + floor.n.01_1 - floor.n.01 + table.n.02_1 table.n.02_* - table.n.02 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/installing_a_scanner/problem0.bddl b/bddl/activity_definitions/installing_a_scanner/problem0.bddl index c64724c0..66d7a1a3 100644 --- a/bddl/activity_definitions/installing_a_scanner/problem0.bddl +++ b/bddl/activity_definitions/installing_a_scanner/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - scanner.n.02_1 - scanner.n.02 - table.n.02_1 - table.n.02 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + scanner.n.02_1 - scanner.n.02 + table.n.02_1 table.n.02_* - table.n.02 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/installing_alarms/problem0.bddl b/bddl/activity_definitions/installing_alarms/problem0.bddl index 14717244..a3fb8d39 100644 --- a/bddl/activity_definitions/installing_alarms/problem0.bddl +++ b/bddl/activity_definitions/installing_alarms/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - alarm.n.02_1 alarm.n.02_2 - alarm.n.02 - table.n.02_1 table.n.02_2 - table.n.02 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + alarm.n.02_1 alarm.n.02_2 - alarm.n.02 + table.n.02_1 table.n.02_2 - table.n.02 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/installing_carpet/problem0.bddl b/bddl/activity_definitions/installing_carpet/problem0.bddl index 4a7f9ba5..dbea86c8 100644 --- a/bddl/activity_definitions/installing_carpet/problem0.bddl +++ b/bddl/activity_definitions/installing_carpet/problem0.bddl @@ -4,7 +4,7 @@ (:objects rug.n.01_1 rug.n.01_2 rug.n.01_3 - rug.n.01 table.n.02_1 table.n.02_2 - table.n.02 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/lay_sod/problem0.bddl b/bddl/activity_definitions/lay_sod/problem0.bddl index ecdadc89..0a459c8b 100644 --- a/bddl/activity_definitions/lay_sod/problem0.bddl +++ b/bddl/activity_definitions/lay_sod/problem0.bddl @@ -3,7 +3,7 @@ (:objects bunchgrass.n.01_1 - bunchgrass.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 carton.n.02_1 - carton.n.02 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/laying_clothes_out/problem0.bddl b/bddl/activity_definitions/laying_clothes_out/problem0.bddl index e159c92b..8feb3d9f 100644 --- a/bddl/activity_definitions/laying_clothes_out/problem0.bddl +++ b/bddl/activity_definitions/laying_clothes_out/problem0.bddl @@ -6,8 +6,8 @@ trouser.n.01_1 - trouser.n.01 wardrobe.n.01_1 - wardrobe.n.01 sandal.n.01_1 - sandal.n.01 - bed.n.01_1 - bed.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/laying_out_a_feast/problem0.bddl b/bddl/activity_definitions/laying_out_a_feast/problem0.bddl index bb667f99..cd5354e0 100644 --- a/bddl/activity_definitions/laying_out_a_feast/problem0.bddl +++ b/bddl/activity_definitions/laying_out_a_feast/problem0.bddl @@ -3,7 +3,7 @@ (:objects bowl.n.01_1 bowl.n.01_2 - bowl.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 lettuce.n.03_1 - lettuce.n.03 lamb.n.05_1 - lamb.n.05 potato.n.01_1 potato.n.01_2 - potato.n.01 diff --git a/bddl/activity_definitions/laying_out_snacks_at_work/problem0.bddl b/bddl/activity_definitions/laying_out_snacks_at_work/problem0.bddl index 6b7db534..95784ca5 100644 --- a/bddl/activity_definitions/laying_out_snacks_at_work/problem0.bddl +++ b/bddl/activity_definitions/laying_out_snacks_at_work/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - chip.n.04_1 - chip.n.04 - bowl.n.01_1 bowl.n.01_2 - bowl.n.01 - tortilla.n.01_1 - tortilla.n.01 - cabinet.n.01_1 - cabinet.n.01 - conference_table.n.01_1 - conference_table.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + chip.n.04_1 - chip.n.04 + bowl.n.01_1 bowl.n.01_2 - bowl.n.01 + tortilla.n.01_1 - tortilla.n.01 + cabinet.n.01_1 - cabinet.n.01 + conference_table.n.01_1 conference_table.n.01_* - conference_table.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/laying_paving_stones/problem0.bddl b/bddl/activity_definitions/laying_paving_stones/problem0.bddl index 27c839d8..52447952 100644 --- a/bddl/activity_definitions/laying_paving_stones/problem0.bddl +++ b/bddl/activity_definitions/laying_paving_stones/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - paving_stone.n.01_1 paving_stone.n.01_2 paving_stone.n.01_3 - paving_stone.n.01 - floor.n.01_1 - floor.n.01 - sealant.n.01_1 - sealant.n.01 + paving_stone.n.01_1 paving_stone.n.01_2 paving_stone.n.01_3 - paving_stone.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + sealant.n.01_1 - sealant.n.01 sealant__atomizer.n.01_1 - sealant__atomizer.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl b/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl index 277e5d94..1df958fa 100644 --- a/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl +++ b/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl @@ -11,7 +11,7 @@ wineglass.n.01_1 wineglass.n.01_2 wineglass.n.01_3 wineglass.n.01_4 - wineglass.n.01 water_glass.n.02_1 water_glass.n.02_2 water_glass.n.02_3 water_glass.n.02_4 - water_glass.n.02 chair.n.01_1 chair.n.01_2 chair.n.01_3 chair.n.01_4 - chair.n.01 - table.n.02_1 table.n.02_2 - table.n.02 + table.n.02_1 table.n.02_2 table.n.02_* - table.n.02 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/laying_tile_floors/problem0.bddl b/bddl/activity_definitions/laying_tile_floors/problem0.bddl index 748163d6..67bcd170 100644 --- a/bddl/activity_definitions/laying_tile_floors/problem0.bddl +++ b/bddl/activity_definitions/laying_tile_floors/problem0.bddl @@ -3,7 +3,7 @@ (:objects tile.n.01_1 tile.n.01_2 tile.n.01_3 tile.n.01_4 - tile.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/laying_wood_floors/problem0.bddl b/bddl/activity_definitions/laying_wood_floors/problem0.bddl index 778f695e..895ff72c 100644 --- a/bddl/activity_definitions/laying_wood_floors/problem0.bddl +++ b/bddl/activity_definitions/laying_wood_floors/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - plywood.n.01_1 plywood.n.01_2 plywood.n.01_3 plywood.n.01_4 - plywood.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - hammer.n.02_1 - hammer.n.02 - saw.n.02_1 - saw.n.02 - agent.n.01_1 - agent.n.01 + plywood.n.01_1 plywood.n.01_2 plywood.n.01_3 plywood.n.01_4 - plywood.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + hammer.n.02_1 - hammer.n.02 + saw.n.02_1 - saw.n.02 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/lighting_fireplace/problem0.bddl b/bddl/activity_definitions/lighting_fireplace/problem0.bddl index 5100162f..4d28fa17 100644 --- a/bddl/activity_definitions/lighting_fireplace/problem0.bddl +++ b/bddl/activity_definitions/lighting_fireplace/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - firewood.n.01_1 - firewood.n.01 - floor.n.01_1 - floor.n.01 - cigar_lighter.n.01_1 - cigar_lighter.n.01 - wood_fireplace.n.01_1 - wood_fireplace.n.01 - agent.n.01_1 - agent.n.01 + firewood.n.01_1 - firewood.n.01 + floor.n.01_1 - floor.n.01 + cigar_lighter.n.01_1 - cigar_lighter.n.01 + wood_fireplace.n.01_1 wood_fireplace.n.01_* - wood_fireplace.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/loading_the_dishwasher/problem0.bddl b/bddl/activity_definitions/loading_the_dishwasher/problem0.bddl index c6ac2968..e968ace0 100644 --- a/bddl/activity_definitions/loading_the_dishwasher/problem0.bddl +++ b/bddl/activity_definitions/loading_the_dishwasher/problem0.bddl @@ -4,10 +4,10 @@ (:objects stain.n.01_1 - stain.n.01 plate.n.04_1 plate.n.04_2 plate.n.04_3 - plate.n.04 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 - countertop.n.01 mug.n.04_1 - mug.n.04 bowl.n.01_1 bowl.n.01_2 - bowl.n.01 - dishwasher.n.01_1 - dishwasher.n.01 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/make_a_car_emergency_kit/problem0.bddl b/bddl/activity_definitions/make_a_car_emergency_kit/problem0.bddl index 1a8a9070..36ff4efe 100644 --- a/bddl/activity_definitions/make_a_car_emergency_kit/problem0.bddl +++ b/bddl/activity_definitions/make_a_car_emergency_kit/problem0.bddl @@ -2,14 +2,14 @@ (:domain omnigibson) (:objects - insectifuge__atomizer.n.01_1 - insectifuge__atomizer.n.01 - coffee_table.n.01_1 - coffee_table.n.01 - shears.n.01_1 - shears.n.01 - backpack.n.01_1 - backpack.n.01 - water_bottle.n.01_1 - water_bottle.n.01 - inhaler.n.01_1 - inhaler.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + insectifuge__atomizer.n.01_1 - insectifuge__atomizer.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 + shears.n.01_1 - shears.n.01 + backpack.n.01_1 - backpack.n.01 + water_bottle.n.01_1 - water_bottle.n.01 + inhaler.n.01_1 - inhaler.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init 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 eced8253..7191765a 100644 --- a/bddl/activity_definitions/make_a_chia_breakfast_bowl/problem0.bddl +++ b/bddl/activity_definitions/make_a_chia_breakfast_bowl/problem0.bddl @@ -2,20 +2,20 @@ (:domain omnigibson) (:objects - granola.n.01_1 - granola.n.01 - 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 - yogurt__carton.n.01_1 - yogurt__carton.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_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 - agent.n.01_1 - agent.n.01 + granola.n.01_1 - granola.n.01 + granola__box.n.01_1 - granola__box.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 + yogurt.n.01_1 - yogurt.n.01 + yogurt__carton.n.01_1 - yogurt__carton.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_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 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/make_a_clothes_line/problem0.bddl b/bddl/activity_definitions/make_a_clothes_line/problem0.bddl index 3fe088d9..f408cf51 100644 --- a/bddl/activity_definitions/make_a_clothes_line/problem0.bddl +++ b/bddl/activity_definitions/make_a_clothes_line/problem0.bddl @@ -3,7 +3,7 @@ (:objects clothesline_rope.n.01_1 - clothesline_rope.n.01 - pole.n.01_1 pole.n.01_2 - pole.n.01 + pole.n.01_1 pole.n.01_2 pole.n.01_* - pole.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/make_a_lunch_box/problem0.bddl b/bddl/activity_definitions/make_a_lunch_box/problem0.bddl index cbbfbcff..6354c73d 100644 --- a/bddl/activity_definitions/make_a_lunch_box/problem0.bddl +++ b/bddl/activity_definitions/make_a_lunch_box/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - club_sandwich.n.01_1 - club_sandwich.n.01 - countertop.n.01_1 - countertop.n.01 - bottle__of__apple_juice.n.01_1 - bottle__of__apple_juice.n.01 - sack.n.01_1 - sack.n.01 - plastic_wrap.n.01_1 - plastic_wrap.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + club_sandwich.n.01_1 - club_sandwich.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + bottle__of__apple_juice.n.01_1 - bottle__of__apple_juice.n.01 + sack.n.01_1 - sack.n.01 + plastic_wrap.n.01_1 - plastic_wrap.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/make_cinnamon_toast/problem0.bddl b/bddl/activity_definitions/make_cinnamon_toast/problem0.bddl index d3eec43c..4fbd9486 100644 --- a/bddl/activity_definitions/make_cinnamon_toast/problem0.bddl +++ b/bddl/activity_definitions/make_cinnamon_toast/problem0.bddl @@ -2,16 +2,16 @@ (:domain omnigibson) (:objects - french_toast.n.01_1 - french_toast.n.01 - oven.n.01_1 - oven.n.01 - plate.n.04_1 - plate.n.04 - breakfast_table.n.01_1 - breakfast_table.n.01 - maple_syrup.n.01_1 - maple_syrup.n.01 - maple_syrup__jar.n.01_1 - maple_syrup__jar.n.01 - cinnamon.n.03_1 - cinnamon.n.03 - cinnamon__shaker.n.01_1 - cinnamon__shaker.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + french_toast.n.01_1 - french_toast.n.01 + oven.n.01_1 - oven.n.01 + plate.n.04_1 - plate.n.04 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 + maple_syrup.n.01_1 - maple_syrup.n.01 + maple_syrup__jar.n.01_1 - maple_syrup__jar.n.01 + cinnamon.n.03_1 - cinnamon.n.03 + cinnamon__shaker.n.01_1 - cinnamon__shaker.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/make_gift_bags_for_baby_showers/problem0.bddl b/bddl/activity_definitions/make_gift_bags_for_baby_showers/problem0.bddl index adaa35b8..9d9c28bf 100644 --- a/bddl/activity_definitions/make_gift_bags_for_baby_showers/problem0.bddl +++ b/bddl/activity_definitions/make_gift_bags_for_baby_showers/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 doll.n.01_1 doll.n.01_2 doll.n.01_3 - doll.n.01 bookcase.n.01_1 - bookcase.n.01 cabinet.n.01_1 - cabinet.n.01 diff --git a/bddl/activity_definitions/make_the_workplace_exciting/problem0.bddl b/bddl/activity_definitions/make_the_workplace_exciting/problem0.bddl index ed5624aa..88f93519 100644 --- a/bddl/activity_definitions/make_the_workplace_exciting/problem0.bddl +++ b/bddl/activity_definitions/make_the_workplace_exciting/problem0.bddl @@ -3,12 +3,12 @@ (:objects poster.n.01_1 - poster.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 board_game.n.01_1 - board_game.n.01 floor.n.01_1 - floor.n.01 coffee_maker.n.01_1 - coffee_maker.n.01 carton.n.02_1 carton.n.02_2 - carton.n.02 - conference_table.n.01_1 - conference_table.n.01 + conference_table.n.01_1 conference_table.n.01_* - conference_table.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/making_the_bed/problem0.bddl b/bddl/activity_definitions/making_the_bed/problem0.bddl index d79758ec..600eaff3 100644 --- a/bddl/activity_definitions/making_the_bed/problem0.bddl +++ b/bddl/activity_definitions/making_the_bed/problem0.bddl @@ -4,7 +4,7 @@ (:objects pillow.n.01_1 - pillow.n.01 blanket.n.01_1 - blanket.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/mopping_floors/problem0.bddl b/bddl/activity_definitions/mopping_floors/problem0.bddl index 59a3c7ce..d133f6d6 100644 --- a/bddl/activity_definitions/mopping_floors/problem0.bddl +++ b/bddl/activity_definitions/mopping_floors/problem0.bddl @@ -4,7 +4,7 @@ (:objects stain.n.01_1 - stain.n.01 water.n.06_1 - water.n.06 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 liquid_soap.n.01_1 - liquid_soap.n.01 soap__bottle.n.01_1 - soap__bottle.n.01 bucket.n.01_1 - bucket.n.01 diff --git a/bddl/activity_definitions/mopping_the_kitchen_floor/problem0.bddl b/bddl/activity_definitions/mopping_the_kitchen_floor/problem0.bddl index 23e96529..243ad294 100644 --- a/bddl/activity_definitions/mopping_the_kitchen_floor/problem0.bddl +++ b/bddl/activity_definitions/mopping_the_kitchen_floor/problem0.bddl @@ -10,7 +10,7 @@ door.n.01_1 - door.n.01 sink.n.01_1 - sink.n.01 bucket.n.01_1 - bucket.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/moving_boxes_to_storage/problem0.bddl b/bddl/activity_definitions/moving_boxes_to_storage/problem0.bddl index adca6748..4c2ea369 100644 --- a/bddl/activity_definitions/moving_boxes_to_storage/problem0.bddl +++ b/bddl/activity_definitions/moving_boxes_to_storage/problem0.bddl @@ -3,8 +3,8 @@ (:objects carton.n.02_1 carton.n.02_2 - carton.n.02 - floor.n.01_1 floor.n.01_2 - floor.n.01 - agent.n.01_1 - agent.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/mowing_the_lawn/problem0.bddl b/bddl/activity_definitions/mowing_the_lawn/problem0.bddl index 7fbe0d44..f9655242 100644 --- a/bddl/activity_definitions/mowing_the_lawn/problem0.bddl +++ b/bddl/activity_definitions/mowing_the_lawn/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - bunchgrass.n.01_1 - bunchgrass.n.01 - lawn.n.01_1 - lawn.n.01 - floor.n.01_1 - floor.n.01 - lawn_mower.n.01_1 - lawn_mower.n.01 - agent.n.01_1 - agent.n.01 + bunchgrass.n.01_1 - bunchgrass.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 + floor.n.01_1 - floor.n.01 + lawn_mower.n.01_1 - lawn_mower.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/mulching/problem0.bddl b/bddl/activity_definitions/mulching/problem0.bddl index 1faa8984..4b7c22ce 100644 --- a/bddl/activity_definitions/mulching/problem0.bddl +++ b/bddl/activity_definitions/mulching/problem0.bddl @@ -3,7 +3,7 @@ (:objects mulch__bag.n.01_1 mulch__bag.n.01_2 mulch__bag.n.01_3 mulch__bag.n.01_4 mulch__bag.n.01_5 - mulch__bag.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 trowel.n.01_1 - trowel.n.01 mulch.n.01_1 - mulch.n.01 tree.n.01_1 - tree.n.01 diff --git a/bddl/activity_definitions/organizing_art_supplies/problem0.bddl b/bddl/activity_definitions/organizing_art_supplies/problem0.bddl index 7930b1a0..14d2d718 100644 --- a/bddl/activity_definitions/organizing_art_supplies/problem0.bddl +++ b/bddl/activity_definitions/organizing_art_supplies/problem0.bddl @@ -2,14 +2,14 @@ (:domain omnigibson) (:objects - pencil.n.01_1 - pencil.n.01 - floor.n.01_1 - floor.n.01 - carryall.n.01_1 - carryall.n.01 - sofa.n.01_1 - sofa.n.01 - paintbrush.n.01_1 - paintbrush.n.01 - marker.n.03_1 - marker.n.03 - pen.n.01_1 pen.n.01_2 - pen.n.01 - agent.n.01_1 - agent.n.01 + pencil.n.01_1 - pencil.n.01 + floor.n.01_1 - floor.n.01 + carryall.n.01_1 - carryall.n.01 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 + paintbrush.n.01_1 - paintbrush.n.01 + marker.n.03_1 - marker.n.03 + pen.n.01_1 pen.n.01_2 - pen.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/organizing_boxes_in_garage/problem0.bddl b/bddl/activity_definitions/organizing_boxes_in_garage/problem0.bddl index 92f967f1..f3fe9f2e 100644 --- a/bddl/activity_definitions/organizing_boxes_in_garage/problem0.bddl +++ b/bddl/activity_definitions/organizing_boxes_in_garage/problem0.bddl @@ -2,14 +2,14 @@ (:domain omnigibson) (:objects - carton.n.02_1 carton.n.02_2 - carton.n.02 - floor.n.01_1 - floor.n.01 - ball.n.01_1 ball.n.01_2 - ball.n.01 - plate.n.04_1 plate.n.04_2 plate.n.04_3 - plate.n.04 - cabinet.n.01_1 - cabinet.n.01 - saucepan.n.01_1 - saucepan.n.01 - bookcase.n.01_1 - bookcase.n.01 - agent.n.01_1 - agent.n.01 + carton.n.02_1 carton.n.02_2 - carton.n.02 + floor.n.01_1 floor.n.01_* - floor.n.01 + ball.n.01_1 ball.n.01_2 - ball.n.01 + plate.n.04_1 plate.n.04_2 plate.n.04_3 - plate.n.04 + cabinet.n.01_1 - cabinet.n.01 + saucepan.n.01_1 - saucepan.n.01 + bookcase.n.01_1 - bookcase.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl b/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl index 6850275a..29b1ad10 100644 --- a/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl +++ b/bddl/activity_definitions/organizing_file_cabinet/problem0.bddl @@ -6,8 +6,8 @@ marker.n.03_1 - marker.n.03 chair.n.01_1 - chair.n.01 document.n.01_1 document.n.01_2 document.n.01_3 document.n.01_4 - document.n.01 - table.n.02_1 - table.n.02 - cabinet.n.01_1 - cabinet.n.01 + table.n.02_1 table.n.02_* - table.n.02 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 folder.n.02_1 folder.n.02_2 - folder.n.02 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/organizing_items_for_yard_sale/problem0.bddl b/bddl/activity_definitions/organizing_items_for_yard_sale/problem0.bddl index 1becb207..fe5eb8e1 100644 --- a/bddl/activity_definitions/organizing_items_for_yard_sale/problem0.bddl +++ b/bddl/activity_definitions/organizing_items_for_yard_sale/problem0.bddl @@ -9,7 +9,7 @@ sofa.n.01_1 - sofa.n.01 vase.n.01_1 - vase.n.01 coatrack.n.01_1 - coatrack.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/organizing_office_documents/problem0.bddl b/bddl/activity_definitions/organizing_office_documents/problem0.bddl index 58b209ad..95beb2b0 100644 --- a/bddl/activity_definitions/organizing_office_documents/problem0.bddl +++ b/bddl/activity_definitions/organizing_office_documents/problem0.bddl @@ -5,7 +5,7 @@ legal_document.n.01_1 legal_document.n.01_2 - legal_document.n.01 floor.n.01_1 - floor.n.01 magazine_rack.n.01_1 - magazine_rack.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 post-it.n.01_1 - post-it.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/organizing_school_stuff/problem0.bddl b/bddl/activity_definitions/organizing_school_stuff/problem0.bddl index 619f5ade..da20e9af 100644 --- a/bddl/activity_definitions/organizing_school_stuff/problem0.bddl +++ b/bddl/activity_definitions/organizing_school_stuff/problem0.bddl @@ -3,7 +3,7 @@ (:objects marker.n.03_1 - marker.n.03 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 pencil.n.01_1 - pencil.n.01 pen.n.01_1 - pen.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/outfit_a_basic_toolbox/problem0.bddl b/bddl/activity_definitions/outfit_a_basic_toolbox/problem0.bddl index 1e5df551..409f462b 100644 --- a/bddl/activity_definitions/outfit_a_basic_toolbox/problem0.bddl +++ b/bddl/activity_definitions/outfit_a_basic_toolbox/problem0.bddl @@ -3,7 +3,7 @@ (:objects drill.n.01_1 - drill.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 pliers.n.01_1 - pliers.n.01 toolbox.n.01_1 - toolbox.n.01 flashlight.n.01_1 - flashlight.n.01 diff --git a/bddl/activity_definitions/pack_a_beach_bag/problem0.bddl b/bddl/activity_definitions/pack_a_beach_bag/problem0.bddl index a9e2b304..578fb033 100644 --- a/bddl/activity_definitions/pack_a_beach_bag/problem0.bddl +++ b/bddl/activity_definitions/pack_a_beach_bag/problem0.bddl @@ -6,7 +6,7 @@ floor.n.01_1 - floor.n.01 carryall.n.01_1 - carryall.n.01 bath_towel.n.01_1 - bath_towel.n.01 - door.n.01_1 - door.n.01 + door.n.01_1 door.n.01_* - door.n.01 club_sandwich.n.01_1 - club_sandwich.n.01 watermelon.n.02_1 - watermelon.n.02 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/pack_a_pencil_case/problem0.bddl b/bddl/activity_definitions/pack_a_pencil_case/problem0.bddl index 07b4ef5d..d4d269f8 100644 --- a/bddl/activity_definitions/pack_a_pencil_case/problem0.bddl +++ b/bddl/activity_definitions/pack_a_pencil_case/problem0.bddl @@ -8,7 +8,7 @@ pencil.n.01_1 - pencil.n.01 eraser.n.01_1 - eraser.n.01 shears.n.01_1 - shears.n.01 - desk.n.01_1 - desk.n.01 + desk.n.01_1 desk.n.01_* - desk.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl b/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl index 147901b8..981824ec 100644 --- a/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl +++ b/bddl/activity_definitions/packing_bags_or_suitcase/problem0.bddl @@ -2,17 +2,17 @@ (:domain omnigibson) (:objects - backpack.n.01_1 - backpack.n.01 - floor.n.01_1 - floor.n.01 - toothbrush.n.01_1 - toothbrush.n.01 - bed.n.01_1 - bed.n.01 - bottle__of__shampoo.n.01_1 - bottle__of__shampoo.n.01 - hardback.n.01_1 - hardback.n.01 - undergarment.n.01_1 undergarment.n.01_2 - undergarment.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 + backpack.n.01_1 - backpack.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + toothbrush.n.01_1 - toothbrush.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 + bottle__of__shampoo.n.01_1 - bottle__of__shampoo.n.01 + hardback.n.01_1 - hardback.n.01 + undergarment.n.01_1 undergarment.n.01_2 - undergarment.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 ) (:init 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 fe7f62d0..ab278983 100644 --- a/bddl/activity_definitions/packing_cleaning_suppies_into_car/problem0.bddl +++ b/bddl/activity_definitions/packing_cleaning_suppies_into_car/problem0.bddl @@ -3,7 +3,7 @@ (:objects car.n.01_1 - car.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.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 diff --git a/bddl/activity_definitions/packing_hobby_equipment/problem0.bddl b/bddl/activity_definitions/packing_hobby_equipment/problem0.bddl index d643ca14..f07e3769 100644 --- a/bddl/activity_definitions/packing_hobby_equipment/problem0.bddl +++ b/bddl/activity_definitions/packing_hobby_equipment/problem0.bddl @@ -2,15 +2,15 @@ (:domain omnigibson) (:objects - jigsaw_puzzle.n.01_1 jigsaw_puzzle.n.01_2 - jigsaw_puzzle.n.01 - sofa.n.01_1 - sofa.n.01 - carton.n.02_1 - carton.n.02 - floor.n.01_1 - floor.n.01 - baseball.n.02_1 - baseball.n.02 - soccer_ball.n.01_1 - soccer_ball.n.01 - window.n.01_1 - window.n.01 - bookcase.n.01_1 - bookcase.n.01 - agent.n.01_1 - agent.n.01 + jigsaw_puzzle.n.01_1 jigsaw_puzzle.n.01_2 - jigsaw_puzzle.n.01 + sofa.n.01_1 - sofa.n.01 + carton.n.02_1 - carton.n.02 + floor.n.01_1 - floor.n.01 + baseball.n.02_1 - baseball.n.02 + soccer_ball.n.01_1 - soccer_ball.n.01 + window.n.01_1 - window.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/packing_moving_van/problem0.bddl b/bddl/activity_definitions/packing_moving_van/problem0.bddl index 58f8b0f1..ecac5c75 100644 --- a/bddl/activity_definitions/packing_moving_van/problem0.bddl +++ b/bddl/activity_definitions/packing_moving_van/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - pickup.n.01_1 - pickup.n.01 - floor.n.01_1 - floor.n.01 - mattress.n.01_1 - mattress.n.01 - blanket.n.01_1 - blanket.n.01 - carton.n.02_1 carton.n.02_2 carton.n.02_3 - carton.n.02 - chair.n.01_1 chair.n.01_2 - chair.n.01 - agent.n.01_1 - agent.n.01 + pickup.n.01_1 - pickup.n.01 + floor.n.01_1 - floor.n.01 + mattress.n.01_1 - mattress.n.01 + blanket.n.01_1 - blanket.n.01 + carton.n.02_1 carton.n.02_2 carton.n.02_3 - carton.n.02 + chair.n.01_1 chair.n.01_2 - chair.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/painting_house_exterior/problem0.bddl b/bddl/activity_definitions/painting_house_exterior/problem0.bddl index f0afc63a..01698427 100644 --- a/bddl/activity_definitions/painting_house_exterior/problem0.bddl +++ b/bddl/activity_definitions/painting_house_exterior/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 - spray_paint.n.01_1 - spray_paint.n.01 + floor.n.01_1 - floor.n.01 + spray_paint.n.01_1 - spray_paint.n.01 spray_paint__can.n.01_1 - spray_paint__can.n.01 - wall.n.01_1 - wall.n.01 - agent.n.01_1 - agent.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/painting_porch/problem0.bddl b/bddl/activity_definitions/painting_porch/problem0.bddl index f516fcf7..5d0703d9 100644 --- a/bddl/activity_definitions/painting_porch/problem0.bddl +++ b/bddl/activity_definitions/painting_porch/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 spray_paint.n.01_1 - spray_paint.n.01 spray_paint__can.n.01_1 - spray_paint__can.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/passing_out_drinks/problem0.bddl b/bddl/activity_definitions/passing_out_drinks/problem0.bddl index 0cb060b0..d6913936 100644 --- a/bddl/activity_definitions/passing_out_drinks/problem0.bddl +++ b/bddl/activity_definitions/passing_out_drinks/problem0.bddl @@ -10,7 +10,7 @@ pitcher.n.02_1 - pitcher.n.02 wineglass.n.01_1 wineglass.n.01_1 - wineglass.n.01 beer_glass.n.01_1 - beer_glass.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/paying_for_purchases/problem0.bddl b/bddl/activity_definitions/paying_for_purchases/problem0.bddl index 35f9b016..a1865301 100644 --- a/bddl/activity_definitions/paying_for_purchases/problem0.bddl +++ b/bddl/activity_definitions/paying_for_purchases/problem0.bddl @@ -3,7 +3,7 @@ (:objects shopping_basket.n.01_1 - shopping_basket.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 money.n.01_1 - money.n.01 apple.n.01_1 apple.n.01_2 - apple.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/picking_up_clothes/problem0.bddl b/bddl/activity_definitions/picking_up_clothes/problem0.bddl index 896bb759..18556f12 100644 --- a/bddl/activity_definitions/picking_up_clothes/problem0.bddl +++ b/bddl/activity_definitions/picking_up_clothes/problem0.bddl @@ -3,7 +3,7 @@ (:objects floor.n.01_1 - floor.n.01 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 dress.n.01_1 dress.n.01_2 dress.n.01_3 dress.n.01_4 dress.n.01_5 - dress.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/picking_up_litter/problem0.bddl b/bddl/activity_definitions/picking_up_litter/problem0.bddl index 4aba05a2..a65e83e4 100644 --- a/bddl/activity_definitions/picking_up_litter/problem0.bddl +++ b/bddl/activity_definitions/picking_up_litter/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 plastic_bag.n.01_1 - plastic_bag.n.01 water_bottle.n.01_1 water_bottle.n.01_2 - water_bottle.n.01 tissue.n.02_1 tissue.n.02_2 tissue.n.02_3 - tissue.n.02 diff --git a/bddl/activity_definitions/picking_up_take_out_food/problem0.bddl b/bddl/activity_definitions/picking_up_take_out_food/problem0.bddl index 9e3208c1..a6b8a875 100644 --- a/bddl/activity_definitions/picking_up_take_out_food/problem0.bddl +++ b/bddl/activity_definitions/picking_up_take_out_food/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 - carton.n.02_1 - carton.n.02 - table.n.02_1 - table.n.02 + floor.n.01_1 - floor.n.01 + carton.n.02_1 - carton.n.02 + table.n.02_1 table.n.02_* - table.n.02 sushi.n.01_1 - sushi.n.01 hamburger.n.01_1 - hamburger.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/picking_up_toys/problem0.bddl b/bddl/activity_definitions/picking_up_toys/problem0.bddl index b61006a9..5ca93110 100644 --- a/bddl/activity_definitions/picking_up_toys/problem0.bddl +++ b/bddl/activity_definitions/picking_up_toys/problem0.bddl @@ -7,7 +7,7 @@ board_game.n.01_1 board_game.n.01_2 board_game.n.01_3 - board_game.n.01 jigsaw_puzzle.n.01_1 jigsaw_puzzle.n.01_2 - jigsaw_puzzle.n.01 tennis_ball.n.01_1 - tennis_ball.n.01 - shelf.n.01_1 - shelf.n.01 + shelf.n.01_1 shelf.n.01_* - shelf.n.01 window.n.01_1 - window.n.01 toy_box.n.01_1 toy_box.n.01_2 - toy_box.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/place_houseplants_around_your_home/problem0.bddl b/bddl/activity_definitions/place_houseplants_around_your_home/problem0.bddl index 6a8b4ae0..9a5c9e7e 100644 --- a/bddl/activity_definitions/place_houseplants_around_your_home/problem0.bddl +++ b/bddl/activity_definitions/place_houseplants_around_your_home/problem0.bddl @@ -4,9 +4,9 @@ (:objects cactus.n.01_1 cactus.n.01_2 - cactus.n.01 wicker_basket.n.01_1 wicker_basket.n.01_2 - wicker_basket.n.01 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 pot_plant.n.01_1 pot_plant.n.01_2 - pot_plant.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/planting_trees/problem0.bddl b/bddl/activity_definitions/planting_trees/problem0.bddl index 4b297e4c..2e78450f 100644 --- a/bddl/activity_definitions/planting_trees/problem0.bddl +++ b/bddl/activity_definitions/planting_trees/problem0.bddl @@ -8,7 +8,7 @@ shovel.n.01_1 - shovel.n.01 soil.n.02_1 - soil.n.02 soil__bag.n.01_1 - soil__bag.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/polish_wood_floors/problem0.bddl b/bddl/activity_definitions/polish_wood_floors/problem0.bddl index b62db1fc..016716ae 100644 --- a/bddl/activity_definitions/polish_wood_floors/problem0.bddl +++ b/bddl/activity_definitions/polish_wood_floors/problem0.bddl @@ -6,7 +6,7 @@ bookcase.n.01_1 - bookcase.n.01 polish.n.03_1 - polish.n.03 bucket.n.01_1 - bucket.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 polish__bottle.n.01_1 - polish__bottle.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/polishing_furniture/problem0.bddl b/bddl/activity_definitions/polishing_furniture/problem0.bddl index eeab9262..e5752601 100644 --- a/bddl/activity_definitions/polishing_furniture/problem0.bddl +++ b/bddl/activity_definitions/polishing_furniture/problem0.bddl @@ -3,11 +3,11 @@ (:objects dust.n.01_1 - dust.n.01 - bookcase.n.01_1 - bookcase.n.01 - table.n.02_1 - table.n.02 - rag.n.01_1 - rag.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 + table.n.02_1 table.n.02_* - table.n.02 + rag.n.01_1 - rag.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/polishing_shoes/problem0.bddl b/bddl/activity_definitions/polishing_shoes/problem0.bddl index 918cd52a..0cbda76b 100644 --- a/bddl/activity_definitions/polishing_shoes/problem0.bddl +++ b/bddl/activity_definitions/polishing_shoes/problem0.bddl @@ -3,11 +3,11 @@ (:objects stain.n.01_1 - stain.n.01 - shoe.n.01_1 shoe.n.01_2 - shoe.n.01 - rag.n.01_1 - rag.n.01 - floor.n.01_1 - floor.n.01 - sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + shoe.n.01_1 shoe.n.01_2 - shoe.n.01 + rag.n.01_1 - rag.n.01 + floor.n.01_1 - floor.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/polishing_silver/problem0.bddl b/bddl/activity_definitions/polishing_silver/problem0.bddl index cfe40a82..669be8cb 100644 --- a/bddl/activity_definitions/polishing_silver/problem0.bddl +++ b/bddl/activity_definitions/polishing_silver/problem0.bddl @@ -3,11 +3,11 @@ (:objects dust.n.01_1 - dust.n.01 - tablespoon.n.02_1 tablespoon.n.02_2 tablespoon.n.02_3 tablespoon.n.02_4 - tablespoon.n.02 - rag.n.01_1 - rag.n.01 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + tablespoon.n.02_1 tablespoon.n.02_2 tablespoon.n.02_3 tablespoon.n.02_4 - tablespoon.n.02 + rag.n.01_1 - rag.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/pouring_water_in_a_glass/problem0.bddl b/bddl/activity_definitions/pouring_water_in_a_glass/problem0.bddl index 8ef5b32c..01d41ae4 100644 --- a/bddl/activity_definitions/pouring_water_in_a_glass/problem0.bddl +++ b/bddl/activity_definitions/pouring_water_in_a_glass/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - pitcher.n.02_1 - pitcher.n.02 - countertop.n.01_1 - countertop.n.01 - water.n.06_1 - water.n.06 - water_glass.n.02_1 - water_glass.n.02 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + pitcher.n.02_1 - pitcher.n.02 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + water.n.06_1 - water.n.06 + water_glass.n.02_1 - water_glass.n.02 + cabinet.n.01_1 - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/prepare_a_breakfast_bar/problem0.bddl b/bddl/activity_definitions/prepare_a_breakfast_bar/problem0.bddl index bcc994cb..a1ef0b73 100644 --- a/bddl/activity_definitions/prepare_a_breakfast_bar/problem0.bddl +++ b/bddl/activity_definitions/prepare_a_breakfast_bar/problem0.bddl @@ -3,7 +3,7 @@ (:objects tray.n.01_1 tray.n.01_2 tray.n.01_3 tray.n.01_4 - tray.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 carton__of__orange_juice.n.01_1 - carton__of__orange_juice.n.01 platter.n.01_1 platter.n.01_2 platter.n.01_3 - platter.n.01 buttermilk_pancake.n.01_1 buttermilk_pancake.n.01_2 - buttermilk_pancake.n.01 diff --git a/bddl/activity_definitions/prepare_a_slow_dinner_party/problem0.bddl b/bddl/activity_definitions/prepare_a_slow_dinner_party/problem0.bddl index 4ea10c22..adc9ac22 100644 --- a/bddl/activity_definitions/prepare_a_slow_dinner_party/problem0.bddl +++ b/bddl/activity_definitions/prepare_a_slow_dinner_party/problem0.bddl @@ -9,7 +9,7 @@ countertop.n.01_1 - countertop.n.01 plate.n.04_1 plate.n.04_2 plate.n.04_3 - plate.n.04 salad.n.01_1 - salad.n.01 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 wine_bottle.n.01_1 - wine_bottle.n.01 carving_knife.n.01_1 - carving_knife.n.01 microwave.n.02_1 - microwave.n.02 diff --git a/bddl/activity_definitions/prepare_wine_and_cheese/problem0.bddl b/bddl/activity_definitions/prepare_wine_and_cheese/problem0.bddl index 0ba773e6..3767214c 100644 --- a/bddl/activity_definitions/prepare_wine_and_cheese/problem0.bddl +++ b/bddl/activity_definitions/prepare_wine_and_cheese/problem0.bddl @@ -16,7 +16,7 @@ wineglass.n.01_1 wineglass.n.01_2 - wineglass.n.01 chopping_board.n.01_1 - chopping_board.n.01 carving_knife.n.01_1 - carving_knife.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 countertop.n.01_1 - countertop.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/prepare_your_garden_for_a_cat/problem0.bddl b/bddl/activity_definitions/prepare_your_garden_for_a_cat/problem0.bddl index 9325a109..3b69a9ae 100644 --- a/bddl/activity_definitions/prepare_your_garden_for_a_cat/problem0.bddl +++ b/bddl/activity_definitions/prepare_your_garden_for_a_cat/problem0.bddl @@ -4,7 +4,7 @@ (:objects disinfectant.n.01_1 - disinfectant.n.01 disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 mat.n.01_1 - mat.n.01 litter_box.n.01_1 - litter_box.n.01 water_bottle.n.01_1 - water_bottle.n.01 diff --git a/bddl/activity_definitions/prepare_your_garden_for_winter/problem0.bddl b/bddl/activity_definitions/prepare_your_garden_for_winter/problem0.bddl index a135b759..4869c2e7 100644 --- a/bddl/activity_definitions/prepare_your_garden_for_winter/problem0.bddl +++ b/bddl/activity_definitions/prepare_your_garden_for_winter/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - lawn.n.01_1 - lawn.n.01 - tarpaulin.n.01_1 tarpaulin.n.01_2 - tarpaulin.n.01 + lawn.n.01_1 - lawn.n.01 + tarpaulin.n.01_1 tarpaulin.n.01_2 - tarpaulin.n.01 scrub.n.01_1 scrub.n.01_2 - scrub.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init 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 3ceb56b6..ed183bf4 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 @@ -7,9 +7,9 @@ boot.n.01_1 boot.n.01_2 - boot.n.01 trouser.n.01_1 - trouser.n.01 cedar_chest.n.01_1 - cedar_chest.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 wallet.n.01_1 - wallet.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) 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 041ffa80..bf41df1c 100644 --- a/bddl/activity_definitions/put_together_a_goodie_bag/problem0.bddl +++ b/bddl/activity_definitions/put_together_a_goodie_bag/problem0.bddl @@ -5,7 +5,7 @@ sack.n.01_1 sack.n.01_2 - sack.n.01 cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 box__of__cookies.n.01_1 box__of__cookies.n.01_2 - box__of__cookies.n.01 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 postcard.n.01_1 postcard.n.01_2 - postcard.n.01 chocolate_kiss.n.01_1 - chocolate_kiss.n.01 mason_jar.n.01_1 - mason_jar.n.01 diff --git a/bddl/activity_definitions/put_togethera_basic_pruning_kit/problem0.bddl b/bddl/activity_definitions/put_togethera_basic_pruning_kit/problem0.bddl index e09714ef..a4e7691b 100644 --- a/bddl/activity_definitions/put_togethera_basic_pruning_kit/problem0.bddl +++ b/bddl/activity_definitions/put_togethera_basic_pruning_kit/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - pruner.n.02_1 - pruner.n.02 - floor.n.01_1 - floor.n.01 - shears.n.01_1 - shears.n.01 - toolbox.n.01_1 - toolbox.n.01 - agent.n.01_1 - agent.n.01 + pruner.n.02_1 - pruner.n.02 + floor.n.01_1 floor.n.01_* - floor.n.01 + shears.n.01_1 - shears.n.01 + toolbox.n.01_1 - toolbox.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_away_Christmas_decorations/problem0.bddl b/bddl/activity_definitions/putting_away_Christmas_decorations/problem0.bddl index e2fd153b..39c601d9 100644 --- a/bddl/activity_definitions/putting_away_Christmas_decorations/problem0.bddl +++ b/bddl/activity_definitions/putting_away_Christmas_decorations/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - wreath.n.01_1 wreath.n.01_2 - wreath.n.01 - floor.n.01_1 - floor.n.01 - bow.n.08_1 bow.n.08_2 bow.n.08_3 - bow.n.08 - ribbon.n.01_1 ribbon.n.01_2 ribbon.n.01_3 - ribbon.n.01 - cabinet.n.01_1 - cabinet.n.01 - agent.n.01_1 - agent.n.01 + wreath.n.01_1 wreath.n.01_2 - wreath.n.01 + floor.n.01_1 - floor.n.01 + bow.n.08_1 bow.n.08_2 bow.n.08_3 - bow.n.08 + ribbon.n.01_1 ribbon.n.01_2 ribbon.n.01_3 - ribbon.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_away_Halloween_decorations/problem0.bddl b/bddl/activity_definitions/putting_away_Halloween_decorations/problem0.bddl index 5d2d3ba2..c0fe347e 100644 --- a/bddl/activity_definitions/putting_away_Halloween_decorations/problem0.bddl +++ b/bddl/activity_definitions/putting_away_Halloween_decorations/problem0.bddl @@ -5,9 +5,9 @@ pumpkin.n.02_1 pumpkin.n.02_2 - pumpkin.n.02 floor.n.01_1 - floor.n.01 caldron.n.01_1 - caldron.n.01 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 candle.n.01_1 candle.n.01_2 candle.n.01_3 - candle.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 sofa.n.01_1 - sofa.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_away_bicycles/problem0.bddl b/bddl/activity_definitions/putting_away_bicycles/problem0.bddl index a289c659..5976feb7 100644 --- a/bddl/activity_definitions/putting_away_bicycles/problem0.bddl +++ b/bddl/activity_definitions/putting_away_bicycles/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - bicycle.n.01_1 bicycle.n.01_2 - bicycle.n.01 - floor.n.01_1 - floor.n.01 - tarpaulin.n.01_1 tarpaulin.n.01_2 - tarpaulin.n.01 + bicycle.n.01_1 bicycle.n.01_2 - bicycle.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + tarpaulin.n.01_1 tarpaulin.n.01_2 - tarpaulin.n.01 driveway.n.01_1 - driveway.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl b/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl index dfecfe49..9f4b51f3 100644 --- a/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl +++ b/bddl/activity_definitions/putting_away_cleaning_supplies/problem0.bddl @@ -8,7 +8,7 @@ bottle__of__liquid_soap.n.01_1 - bottle__of__liquid_soap.n.01 glove.n.02_1 glove.n.02_2 - glove.n.02 bottle__of__bleach_agent.n.01_1 - bottle__of__bleach_agent.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl b/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl index 04ae4651..b737a77c 100644 --- a/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl +++ b/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl @@ -8,7 +8,7 @@ bed.n.01_1 - bed.n.01 sweater.n.01_1 - sweater.n.01 hanger.n.02_1 hanger.n.02_2 hanger.n.02_3 - hanger.n.02 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_bike_in_garage/problem0.bddl b/bddl/activity_definitions/putting_bike_in_garage/problem0.bddl index 3271ae23..aa4a4052 100644 --- a/bddl/activity_definitions/putting_bike_in_garage/problem0.bddl +++ b/bddl/activity_definitions/putting_bike_in_garage/problem0.bddl @@ -3,7 +3,7 @@ (:objects bicycle.n.01_1 - bicycle.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 car.n.01_1 - car.n.01 helmet.n.01_1 - helmet.n.01 door.n.01_1 - door.n.01 diff --git a/bddl/activity_definitions/putting_clean_laundry_away/problem0.bddl b/bddl/activity_definitions/putting_clean_laundry_away/problem0.bddl index 82bc994a..8cbc15f0 100644 --- a/bddl/activity_definitions/putting_clean_laundry_away/problem0.bddl +++ b/bddl/activity_definitions/putting_clean_laundry_away/problem0.bddl @@ -5,8 +5,8 @@ hand_towel.n.01_1 hand_towel.n.01_2 - hand_towel.n.01 wicker_basket.n.01_1 - wicker_basket.n.01 bath_towel.n.01_1 bath_towel.n.01_2 - bath_towel.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - towel_rack.n.01_1 - towel_rack.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + towel_rack.n.01_1 towel_rack.n.01_* - towel_rack.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_dirty_dishes_in_sink/problem0.bddl b/bddl/activity_definitions/putting_dirty_dishes_in_sink/problem0.bddl index bbb9752d..a57912c4 100644 --- a/bddl/activity_definitions/putting_dirty_dishes_in_sink/problem0.bddl +++ b/bddl/activity_definitions/putting_dirty_dishes_in_sink/problem0.bddl @@ -7,7 +7,7 @@ bowl.n.01_1 bowl.n.01_2 bowl.n.01_3 - bowl.n.01 plate.n.04_1 plate.n.04_2 - plate.n.04 countertop.n.01_1 - countertop.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_dishes_away_after_cleaning/problem0.bddl b/bddl/activity_definitions/putting_dishes_away_after_cleaning/problem0.bddl index 2a78ac6e..4a018a77 100644 --- a/bddl/activity_definitions/putting_dishes_away_after_cleaning/problem0.bddl +++ b/bddl/activity_definitions/putting_dishes_away_after_cleaning/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - plate.n.04_1 plate.n.04_2 plate.n.04_3 plate.n.04_4 plate.n.04_5 plate.n.04_6 plate.n.04_7 plate.n.04_8 - plate.n.04 - countertop.n.01_1 countertop.n.01_2 - countertop.n.01 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + plate.n.04_1 plate.n.04_2 plate.n.04_3 plate.n.04_4 plate.n.04_5 plate.n.04_6 plate.n.04_7 plate.n.04_8 - plate.n.04 + countertop.n.01_1 countertop.n.01_2 - countertop.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_food_in_fridge/problem0.bddl b/bddl/activity_definitions/putting_food_in_fridge/problem0.bddl index 26132fed..b8ca18af 100644 --- a/bddl/activity_definitions/putting_food_in_fridge/problem0.bddl +++ b/bddl/activity_definitions/putting_food_in_fridge/problem0.bddl @@ -6,7 +6,7 @@ carton__of__milk.n.01_1 - carton__of__milk.n.01 plate.n.04_1 - plate.n.04 tupperware.n.01_1 - tupperware.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 carton__of__orange_juice.n.01_1 - carton__of__orange_juice.n.01 beefsteak_tomato.n.01_1 beefsteak_tomato.n.01_2 - beefsteak_tomato.n.01 diff --git a/bddl/activity_definitions/putting_in_a_hot_tub/problem0.bddl b/bddl/activity_definitions/putting_in_a_hot_tub/problem0.bddl index 80f5bbf3..92123eb9 100644 --- a/bddl/activity_definitions/putting_in_a_hot_tub/problem0.bddl +++ b/bddl/activity_definitions/putting_in_a_hot_tub/problem0.bddl @@ -4,7 +4,7 @@ (:objects floor.n.01_1 - floor.n.01 hot_tub.n.02_1 - hot_tub.n.02 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 driveway.n.01_1 - driveway.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_leftovers_away/problem0.bddl b/bddl/activity_definitions/putting_leftovers_away/problem0.bddl index fb6e8f8b..6dcf9eba 100644 --- a/bddl/activity_definitions/putting_leftovers_away/problem0.bddl +++ b/bddl/activity_definitions/putting_leftovers_away/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - box__of__lasagna.n.01_1 box__of__lasagna.n.01_2 box__of__lasagna.n.01_3 box__of__lasagna.n.01_4 - box__of__lasagna.n.01 - floor.n.01_1 - floor.n.01 - jar__of__spaghetti_sauce.n.01_1 jar__of__spaghetti_sauce.n.01_2 jar__of__spaghetti_sauce.n.01_3 jar__of__spaghetti_sauce.n.01_4 - jar__of__spaghetti_sauce.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - countertop.n.01_1 - countertop.n.01 - agent.n.01_1 - agent.n.01 + box__of__lasagna.n.01_1 box__of__lasagna.n.01_2 box__of__lasagna.n.01_3 box__of__lasagna.n.01_4 - box__of__lasagna.n.01 + floor.n.01_1 - floor.n.01 + jar__of__spaghetti_sauce.n.01_1 jar__of__spaghetti_sauce.n.01_2 jar__of__spaghetti_sauce.n.01_3 jar__of__spaghetti_sauce.n.01_4 - jar__of__spaghetti_sauce.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + countertop.n.01_1 - countertop.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_meal_in_fridge_at_work/problem0.bddl b/bddl/activity_definitions/putting_meal_in_fridge_at_work/problem0.bddl index f9759dd1..368e62d5 100644 --- a/bddl/activity_definitions/putting_meal_in_fridge_at_work/problem0.bddl +++ b/bddl/activity_definitions/putting_meal_in_fridge_at_work/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 club_sandwich.n.01_1 club_sandwich.n.01_2 - club_sandwich.n.01 plate.n.04_1 - plate.n.04 table.n.02_1 - table.n.02 diff --git a/bddl/activity_definitions/putting_meal_on_plate/problem0.bddl b/bddl/activity_definitions/putting_meal_on_plate/problem0.bddl index 834c96bf..a7c2a6df 100644 --- a/bddl/activity_definitions/putting_meal_on_plate/problem0.bddl +++ b/bddl/activity_definitions/putting_meal_on_plate/problem0.bddl @@ -2,17 +2,17 @@ (:domain omnigibson) (:objects - porkchop.n.01_1 porkchop.n.01_2 - porkchop.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - oven.n.01_1 - oven.n.01 - plate.n.04_1 plate.n.04_2 - plate.n.04 - countertop.n.01_1 - countertop.n.01 - water_glass.n.02_1 - water_glass.n.02 - apple.n.01_1 apple.n.01_2 - apple.n.01 - floor.n.01_1 - floor.n.01 - cabinet.n.01_1 - cabinet.n.01 - window.n.01_1 - window.n.01 - agent.n.01_1 - agent.n.01 + porkchop.n.01_1 porkchop.n.01_2 - porkchop.n.01 + electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + oven.n.01_1 oven.n.01_* - oven.n.01 + plate.n.04_1 plate.n.04_2 - plate.n.04 + countertop.n.01_1 - countertop.n.01 + water_glass.n.02_1 - water_glass.n.02 + apple.n.01_1 apple.n.01_2 - apple.n.01 + floor.n.01_1 - floor.n.01 + cabinet.n.01_1 - cabinet.n.01 + window.n.01_1 - window.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_out_cat_food/problem0.bddl b/bddl/activity_definitions/putting_out_cat_food/problem0.bddl index 6dbc9404..6f338ad8 100644 --- a/bddl/activity_definitions/putting_out_cat_food/problem0.bddl +++ b/bddl/activity_definitions/putting_out_cat_food/problem0.bddl @@ -6,7 +6,7 @@ table.n.02_1 - table.n.02 cat_food.n.01_1 - cat_food.n.01 cat_food__tin.n.01_1 - cat_food__tin.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_out_condiments/problem0.bddl b/bddl/activity_definitions/putting_out_condiments/problem0.bddl index 655dcd94..c2c064b0 100644 --- a/bddl/activity_definitions/putting_out_condiments/problem0.bddl +++ b/bddl/activity_definitions/putting_out_condiments/problem0.bddl @@ -13,7 +13,7 @@ table_knife.n.01_1 table_knife.n.01_2 table_knife.n.01_3 table_knife.n.01_4 table_knife.n.01_5 table_knife.n.01_6 table_knife.n.01_7 - table_knife.n.01 cabinet.n.01_1 - cabinet.n.01 electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_out_dog_food/problem0.bddl b/bddl/activity_definitions/putting_out_dog_food/problem0.bddl index 353d3e08..db38761b 100644 --- a/bddl/activity_definitions/putting_out_dog_food/problem0.bddl +++ b/bddl/activity_definitions/putting_out_dog_food/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 dog_food.n.01_1 - dog_food.n.01 dog_food__can.n.01_1 - dog_food__can.n.01 bowl.n.01_1 - bowl.n.01 diff --git a/bddl/activity_definitions/putting_pesticides_on_lawn/problem0.bddl b/bddl/activity_definitions/putting_pesticides_on_lawn/problem0.bddl index 3c9d68d2..53cb4108 100644 --- a/bddl/activity_definitions/putting_pesticides_on_lawn/problem0.bddl +++ b/bddl/activity_definitions/putting_pesticides_on_lawn/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 pesticide.n.01_1 - pesticide.n.01 pesticide__atomizer.n.01_1 - pesticide__atomizer.n.01 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/putting_roast_in_oven/problem0.bddl b/bddl/activity_definitions/putting_roast_in_oven/problem0.bddl index eac590b0..366f06f7 100644 --- a/bddl/activity_definitions/putting_roast_in_oven/problem0.bddl +++ b/bddl/activity_definitions/putting_roast_in_oven/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - oven.n.01_1 - oven.n.01 + oven.n.01_1 oven.n.01_* - oven.n.01 chicken.n.01_1 - chicken.n.01 gravy.n.01_1 - gravy.n.01 soy_sauce.n.01_1 - soy_sauce.n.01 diff --git a/bddl/activity_definitions/putting_shoes_on_rack/problem0.bddl b/bddl/activity_definitions/putting_shoes_on_rack/problem0.bddl index 11e3509c..b03e6c4c 100644 --- a/bddl/activity_definitions/putting_shoes_on_rack/problem0.bddl +++ b/bddl/activity_definitions/putting_shoes_on_rack/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - gym_shoe.n.01_1 gym_shoe.n.01_2 - gym_shoe.n.01 - floor.n.01_1 - floor.n.01 - sandal.n.01_1 sandal.n.01_2 - sandal.n.01 - shoe_rack.n.01_1 - shoe_rack.n.01 - agent.n.01_1 - agent.n.01 + gym_shoe.n.01_1 gym_shoe.n.01_2 - gym_shoe.n.01 + floor.n.01_1 - floor.n.01 + sandal.n.01_1 sandal.n.01_2 - sandal.n.01 + shoe_rack.n.01_1 shoe_rack.n.01_* - shoe_rack.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/putting_shopping_away/problem0.bddl b/bddl/activity_definitions/putting_shopping_away/problem0.bddl index 66ba1039..7e2a14da 100644 --- a/bddl/activity_definitions/putting_shopping_away/problem0.bddl +++ b/bddl/activity_definitions/putting_shopping_away/problem0.bddl @@ -9,8 +9,8 @@ cup__of__yogurt.n.01_1 - cup__of__yogurt.n.01 box__of__cereal.n.01_1 - box__of__cereal.n.01 canned_food.n.01_1 - canned_food.n.01 - cabinet.n.01_1 - cabinet.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_tablecloth_on_table/problem0.bddl b/bddl/activity_definitions/putting_tablecloth_on_table/problem0.bddl index 06666c73..eef451e6 100644 --- a/bddl/activity_definitions/putting_tablecloth_on_table/problem0.bddl +++ b/bddl/activity_definitions/putting_tablecloth_on_table/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 tablecloth.n.01_1 - tablecloth.n.01 floor.n.01_1 - floor.n.01 pot_plant.n.01_1 - pot_plant.n.01 diff --git a/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl b/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl index 423d2282..33e0fa2d 100644 --- a/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl +++ b/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl @@ -6,7 +6,7 @@ hand_towel.n.01_1 - hand_towel.n.01 bed.n.01_1 - bed.n.01 floor.n.01_1 - floor.n.01 - towel_rack.n.01_1 - towel_rack.n.01 + towel_rack.n.01_1 towel_rack.n.01_* - towel_rack.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_up_Christmas_decorations_inside/problem0.bddl b/bddl/activity_definitions/putting_up_Christmas_decorations_inside/problem0.bddl index 8d462649..3ffa7f77 100644 --- a/bddl/activity_definitions/putting_up_Christmas_decorations_inside/problem0.bddl +++ b/bddl/activity_definitions/putting_up_Christmas_decorations_inside/problem0.bddl @@ -9,8 +9,8 @@ gift_box.n.01_1 gift_box.n.01_2 gift_box.n.01_3 - gift_box.n.01 carton.n.02_1 - carton.n.02 floor.n.01_1 - floor.n.01 - table.n.02_1 - table.n.02 - sofa.n.01_1 - sofa.n.01 + table.n.02_1 table.n.02_* - table.n.02 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_up_Christmas_decorations_outside/problem0.bddl b/bddl/activity_definitions/putting_up_Christmas_decorations_outside/problem0.bddl index 59c22f4b..0a70510a 100644 --- a/bddl/activity_definitions/putting_up_Christmas_decorations_outside/problem0.bddl +++ b/bddl/activity_definitions/putting_up_Christmas_decorations_outside/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 wall_nail.n.01_1 - wall_nail.n.01 icicle_lights.n.01_1 - icicle_lights.n.01 wreath.n.01_1 - wreath.n.01 diff --git a/bddl/activity_definitions/putting_up_Christmas_lights_inside/problem0.bddl b/bddl/activity_definitions/putting_up_Christmas_lights_inside/problem0.bddl index 0299e79d..eb4aca4a 100644 --- a/bddl/activity_definitions/putting_up_Christmas_lights_inside/problem0.bddl +++ b/bddl/activity_definitions/putting_up_Christmas_lights_inside/problem0.bddl @@ -4,7 +4,7 @@ (:objects icicle_lights.n.01_1 - icicle_lights.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_up_Christmas_lights_outside/problem0.bddl b/bddl/activity_definitions/putting_up_Christmas_lights_outside/problem0.bddl index 00d3edbe..4727410a 100644 --- a/bddl/activity_definitions/putting_up_Christmas_lights_outside/problem0.bddl +++ b/bddl/activity_definitions/putting_up_Christmas_lights_outside/problem0.bddl @@ -4,7 +4,7 @@ (:objects rail_fence.n.01_1 - rail_fence.n.01 floor.n.01_1 - floor.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 icicle_lights.n.01_1 icicle_lights.n.01_2 icicle_lights.n.01_3 icicle_lights.n.01_4 - icicle_lights.n.01 scrub.n.01_1 scrub.n.01_2 - scrub.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/putting_up_outdoor_holiday_decorations/problem0.bddl b/bddl/activity_definitions/putting_up_outdoor_holiday_decorations/problem0.bddl index 155a7a47..8a93b2d4 100644 --- a/bddl/activity_definitions/putting_up_outdoor_holiday_decorations/problem0.bddl +++ b/bddl/activity_definitions/putting_up_outdoor_holiday_decorations/problem0.bddl @@ -8,8 +8,8 @@ carton.n.02_1 - carton.n.02 wreath.n.01_1 - wreath.n.01 icicle_lights.n.01_1 - icicle_lights.n.01 - lawn.n.01_1 - lawn.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 rose.n.01_1 - rose.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_up_posters/problem0.bddl b/bddl/activity_definitions/putting_up_posters/problem0.bddl index d3381d1a..fc88dc24 100644 --- a/bddl/activity_definitions/putting_up_posters/problem0.bddl +++ b/bddl/activity_definitions/putting_up_posters/problem0.bddl @@ -4,7 +4,7 @@ (:objects floor.n.01_1 - floor.n.01 poster.n.01_1 - poster.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 bed.n.01_1 - bed.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/putting_wood_in_fireplace/problem0.bddl b/bddl/activity_definitions/putting_wood_in_fireplace/problem0.bddl index 76c42a22..a5b9968b 100644 --- a/bddl/activity_definitions/putting_wood_in_fireplace/problem0.bddl +++ b/bddl/activity_definitions/putting_wood_in_fireplace/problem0.bddl @@ -4,7 +4,7 @@ (:objects log.n.01_1 log.n.01_2 - log.n.01 floor.n.01_1 - floor.n.01 - wood_fireplace.n.01_1 - wood_fireplace.n.01 + wood_fireplace.n.01_1 wood_fireplace.n.01_* - wood_fireplace.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/re_shelving_library_books/problem0.bddl b/bddl/activity_definitions/re_shelving_library_books/problem0.bddl index 19274b4e..827dfd08 100644 --- a/bddl/activity_definitions/re_shelving_library_books/problem0.bddl +++ b/bddl/activity_definitions/re_shelving_library_books/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - book.n.02_1 book.n.02_2 book.n.02_3 book.n.02_4 book.n.02_5 book.n.02_6 book.n.02_7 book.n.02_8 - book.n.02 - table.n.02_1 - table.n.02 - bookcase.n.01_1 - bookcase.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + book.n.02_1 book.n.02_2 book.n.02_3 book.n.02_4 book.n.02_5 book.n.02_6 book.n.02_7 book.n.02_8 - book.n.02 + table.n.02_1 table.n.02_* - table.n.02 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/rearrange_your_room/problem0.bddl b/bddl/activity_definitions/rearrange_your_room/problem0.bddl index 338bcc73..443efd26 100644 --- a/bddl/activity_definitions/rearrange_your_room/problem0.bddl +++ b/bddl/activity_definitions/rearrange_your_room/problem0.bddl @@ -5,7 +5,7 @@ mattress.n.01_1 - mattress.n.01 floor.n.01_1 - floor.n.01 pillow.n.01_1 pillow.n.01_2 - pillow.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/rearranging_furniture/problem0.bddl b/bddl/activity_definitions/rearranging_furniture/problem0.bddl index 003bb935..1d419fba 100644 --- a/bddl/activity_definitions/rearranging_furniture/problem0.bddl +++ b/bddl/activity_definitions/rearranging_furniture/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - lamp.n.02_1 lamp.n.02_2 - lamp.n.02 - floor.n.01_1 - floor.n.01 - chair.n.01_1 chair.n.01_2 - chair.n.01 - bed.n.01_1 - bed.n.01 - window.n.01_1 - window.n.01 - door.n.01_1 - door.n.01 - agent.n.01_1 - agent.n.01 + lamp.n.02_1 lamp.n.02_2 - lamp.n.02 + floor.n.01_1 - floor.n.01 + chair.n.01_1 chair.n.01_2 - chair.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 + window.n.01_1 window.n.01_* - window.n.01 + door.n.01_1 door.n.01_* - door.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/rearranging_kitchen_furniture/problem0.bddl b/bddl/activity_definitions/rearranging_kitchen_furniture/problem0.bddl index 5b183c38..f629fe45 100644 --- a/bddl/activity_definitions/rearranging_kitchen_furniture/problem0.bddl +++ b/bddl/activity_definitions/rearranging_kitchen_furniture/problem0.bddl @@ -3,10 +3,10 @@ (:objects toaster_oven.n.01_1 - toaster_oven.n.01 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 wooden_spoon.n.02_1 - wooden_spoon.n.02 - table.n.02_1 - table.n.02 - cabinet.n.01_1 - cabinet.n.01 + table.n.02_1 table.n.02_* - table.n.02 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl b/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl index 2bc3ecfe..ff320365 100644 --- a/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl +++ b/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl @@ -3,7 +3,7 @@ (:objects mirror.n.01_1 - mirror.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/remove_hard_water_spots/problem0.bddl b/bddl/activity_definitions/remove_hard_water_spots/problem0.bddl index 6cfef131..37b2973d 100644 --- a/bddl/activity_definitions/remove_hard_water_spots/problem0.bddl +++ b/bddl/activity_definitions/remove_hard_water_spots/problem0.bddl @@ -9,7 +9,7 @@ liquid_soap.n.01_1 - liquid_soap.n.01 liquid_soap__bottle.n.01_1 - liquid_soap__bottle.n.01 rag.n.01_1 - rag.n.01 - sink.n.01_1 - sink.n.01 + sink.n.01_1 sink.n.01_* - sink.n.01 countertop.n.01_1 - countertop.n.01 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 diff --git a/bddl/activity_definitions/remove_sod/problem0.bddl b/bddl/activity_definitions/remove_sod/problem0.bddl index 137f15d8..bb85ccce 100644 --- a/bddl/activity_definitions/remove_sod/problem0.bddl +++ b/bddl/activity_definitions/remove_sod/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 floor.n.01_1 - floor.n.01 turf.n.01_1 turf.n.01_2 turf.n.01_3 turf.n.01_4 - turf.n.01 barrow.n.03_1 - barrow.n.03 diff --git a/bddl/activity_definitions/removing_ice_from_walkways/problem0.bddl b/bddl/activity_definitions/removing_ice_from_walkways/problem0.bddl index 51547ad1..4d4f4f51 100644 --- a/bddl/activity_definitions/removing_ice_from_walkways/problem0.bddl +++ b/bddl/activity_definitions/removing_ice_from_walkways/problem0.bddl @@ -3,7 +3,7 @@ (:objects ice.n.01_1 ice.n.01_2 ice.n.01_3 ice.n.01_4 ice.n.01_5 ice.n.01_6 ice.n.01_7 ice.n.01_8 ice.n.01_9 - ice.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 shovel.n.01_1 - shovel.n.01 water.n.06_1 - water.n.06 bucket.n.01_1 - bucket.n.01 diff --git a/bddl/activity_definitions/returning_consumer_goods/problem0.bddl b/bddl/activity_definitions/returning_consumer_goods/problem0.bddl index 3b074a14..954847fc 100644 --- a/bddl/activity_definitions/returning_consumer_goods/problem0.bddl +++ b/bddl/activity_definitions/returning_consumer_goods/problem0.bddl @@ -3,7 +3,7 @@ (:objects money.n.01_1 - money.n.01 - checkout.n.03_1 - checkout.n.03 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 bottle__of__soda.n.01_1 bottle__of__soda.n.01_2 - bottle__of__soda.n.01 carryall.n.01_1 - carryall.n.01 sack.n.01_1 - sack.n.01 diff --git a/bddl/activity_definitions/returning_videotapes_to_store/problem0.bddl b/bddl/activity_definitions/returning_videotapes_to_store/problem0.bddl index 8cad265b..ef1569af 100644 --- a/bddl/activity_definitions/returning_videotapes_to_store/problem0.bddl +++ b/bddl/activity_definitions/returning_videotapes_to_store/problem0.bddl @@ -6,7 +6,7 @@ checkout.n.03_1 - checkout.n.03 videodisk.n.01_1 videodisk.n.01_2 videodisk.n.01_3 - videodisk.n.01 floor.n.01_1 - floor.n.01 - grocery_shelf.n.01_1 - grocery_shelf.n.01 + grocery_shelf.n.01_1 grocery_shelf.n.01_* - grocery_shelf.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/rinsing_dishes/problem0.bddl b/bddl/activity_definitions/rinsing_dishes/problem0.bddl index 2df97916..43c029b6 100644 --- a/bddl/activity_definitions/rinsing_dishes/problem0.bddl +++ b/bddl/activity_definitions/rinsing_dishes/problem0.bddl @@ -4,7 +4,7 @@ (:objects plate.n.04_1 - plate.n.04 breadcrumb.n.01_1 - breadcrumb.n.01 - dishwasher.n.01_1 - dishwasher.n.01 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 bowl.n.01_1 - bowl.n.01 tablefork.n.01_1 - tablefork.n.01 countertop.n.01_1 - countertop.n.01 diff --git a/bddl/activity_definitions/sanding_wood_furniture/problem0.bddl b/bddl/activity_definitions/sanding_wood_furniture/problem0.bddl index ef42933e..3ff91be6 100644 --- a/bddl/activity_definitions/sanding_wood_furniture/problem0.bddl +++ b/bddl/activity_definitions/sanding_wood_furniture/problem0.bddl @@ -3,7 +3,7 @@ (:objects incision.n.01_1 - incision.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 emery_paper.n.01_1 - emery_paper.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/scrubbing_bathroom_floor/problem0.bddl b/bddl/activity_definitions/scrubbing_bathroom_floor/problem0.bddl index 0ff3d6fe..ec1e47e6 100644 --- a/bddl/activity_definitions/scrubbing_bathroom_floor/problem0.bddl +++ b/bddl/activity_definitions/scrubbing_bathroom_floor/problem0.bddl @@ -3,7 +3,7 @@ (:objects dirt.n.02_1 - dirt.n.02 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 water.n.06_1 - water.n.06 bucket.n.01_1 - bucket.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 diff --git a/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl b/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl index 8e3a6aa0..2119c4d2 100644 --- a/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl +++ b/bddl/activity_definitions/serving_food_on_the_table/problem0.bddl @@ -7,7 +7,7 @@ cooked__diced__chicken.n.01_1 - cooked__diced__chicken.n.01 cooked__penne.n.01_1 - cooked__penne.n.01 cooked__chickpea.n.01_1 - cooked__chickpea.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 plate.n.04_1 - plate.n.04 tablefork.n.01_1 tablefork.n.01_2 - tablefork.n.01 napkin.n.01_1 - napkin.n.01 diff --git a/bddl/activity_definitions/serving_hors_d_oeuvres/problem0.bddl b/bddl/activity_definitions/serving_hors_d_oeuvres/problem0.bddl index 28a4a8b6..a48a8349 100644 --- a/bddl/activity_definitions/serving_hors_d_oeuvres/problem0.bddl +++ b/bddl/activity_definitions/serving_hors_d_oeuvres/problem0.bddl @@ -3,15 +3,15 @@ (:objects cabinet.n.01_1 - cabinet.n.01 - salad.n.01_1 salad.n.01_2 salad.n.01_3 salad.n.01_4 - salad.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - tray.n.01_1 - tray.n.01 - parsley.n.02_1 parsley.n.02_2 parsley.n.02_3 parsley.n.02_4 - parsley.n.02 - pretzel.n.01_1 pretzel.n.01_2 pretzel.n.01_3 pretzel.n.01_4 - pretzel.n.01 - table.n.02_1 - table.n.02 - cheddar.n.02_1 cheddar.n.02_2 cheddar.n.02_3 cheddar.n.02_4 - cheddar.n.02 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + salad.n.01_1 salad.n.01_2 salad.n.01_3 salad.n.01_4 - salad.n.01 + electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + tray.n.01_1 - tray.n.01 + parsley.n.02_1 parsley.n.02_2 parsley.n.02_3 parsley.n.02_4 - parsley.n.02 + pretzel.n.01_1 pretzel.n.01_2 pretzel.n.01_3 pretzel.n.01_4 - pretzel.n.01 + table.n.02_1 table.n.02_* - table.n.02 + cheddar.n.02_1 cheddar.n.02_2 cheddar.n.02_3 cheddar.n.02_4 - cheddar.n.02 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/set_a_dinner_table/problem0.bddl b/bddl/activity_definitions/set_a_dinner_table/problem0.bddl index 52c2ba47..b93f1ecb 100644 --- a/bddl/activity_definitions/set_a_dinner_table/problem0.bddl +++ b/bddl/activity_definitions/set_a_dinner_table/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 table_knife.n.01_1 - table_knife.n.01 console_table.n.01_1 console_table.n.01_2 console_table.n.01_3 - console_table.n.01 tablefork.n.01_1 - tablefork.n.01 diff --git a/bddl/activity_definitions/set_a_fancy_table/problem0.bddl b/bddl/activity_definitions/set_a_fancy_table/problem0.bddl index 954e54c4..d235ee13 100644 --- a/bddl/activity_definitions/set_a_fancy_table/problem0.bddl +++ b/bddl/activity_definitions/set_a_fancy_table/problem0.bddl @@ -3,7 +3,7 @@ (:objects napkin.n.01_1 - napkin.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 place_mat.n.01_1 - place_mat.n.01 wineglass.n.01_1 - wineglass.n.01 tablespoon.n.02_1 - tablespoon.n.02 @@ -53,6 +53,8 @@ (:goal (and (ontop ?place_mat.n.01_1 ?breakfast_table.n.01_1) + (ontop ?wine_bottle.n.01_1 ?breakfast_table.n.01_1) + (ontop ?vase.n.01_1 ?breakfast_table.n.01_1) (ontop ?plate.n.04_1 ?place_mat.n.01_1) (ontop ?napkin.n.01_1 ?plate.n.04_1) (folded ?napkin.n.01_1) @@ -67,10 +69,8 @@ ) (ontop ?saucer.n.02_1 ?place_mat.n.01_1) (ontop ?table_knife.n.01_1 ?saucer.n.02_1) - (ontop ?wine_bottle.n.01_1 ?breakfast_table.n.01_1) (nextto ?wineglass.n.01_1 ?plate.n.04_1) (nextto ?water_glass.n.02_1 ?wineglass.n.01_1) - (ontop ?vase.n.01_1 ?breakfast_table.n.01_1) (nextto ?candlestick.n.01_1 ?vase.n.01_1) (forall (?dip.n.07 - dip.n.07) diff --git a/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl b/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl index 159ac355..2627dce5 100644 --- a/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl +++ b/bddl/activity_definitions/set_a_table_for_a_tea_party/problem0.bddl @@ -7,7 +7,7 @@ danish.n.02_1 - danish.n.02 diced__virginia_ham.n.01_1 - diced__virginia_ham.n.01 place_mat.n.01_1 - place_mat.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 tray.n.01_1 - tray.n.01 teacup.n.02_1 - teacup.n.02 teapot.n.01_1 - teapot.n.01 diff --git a/bddl/activity_definitions/set_up_a_buffet/problem0.bddl b/bddl/activity_definitions/set_up_a_buffet/problem0.bddl index b0cd3651..72fdb1b5 100644 --- a/bddl/activity_definitions/set_up_a_buffet/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_buffet/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 plate.n.04_1 plate.n.04_2 plate.n.04_3 plate.n.04_4 - plate.n.04 tupperware.n.01_1 tupperware.n.01_2 - tupperware.n.01 cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 diff --git a/bddl/activity_definitions/set_up_a_coffee_station_in_your_kitchen/problem0.bddl b/bddl/activity_definitions/set_up_a_coffee_station_in_your_kitchen/problem0.bddl index abf137f2..597d9fe0 100644 --- a/bddl/activity_definitions/set_up_a_coffee_station_in_your_kitchen/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_coffee_station_in_your_kitchen/problem0.bddl @@ -2,17 +2,17 @@ (:domain omnigibson) (:objects - coffee_maker.n.01_1 - coffee_maker.n.01 - countertop.n.01_1 - countertop.n.01 - bottle__of__coffee.n.01_1 - bottle__of__coffee.n.01 - cabinet.n.01_1 - cabinet.n.01 - paper_coffee_filter.n.01_1 - paper_coffee_filter.n.01 - teacup.n.02_1 - teacup.n.02 - dishwasher.n.01_1 - dishwasher.n.01 - saucer.n.02_1 - saucer.n.02 - water_bottle.n.01_1 - water_bottle.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + coffee_maker.n.01_1 - coffee_maker.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 + bottle__of__coffee.n.01_1 - bottle__of__coffee.n.01 + cabinet.n.01_1 - cabinet.n.01 + paper_coffee_filter.n.01_1 - paper_coffee_filter.n.01 + teacup.n.02_1 - teacup.n.02 + dishwasher.n.01_1 - dishwasher.n.01 + saucer.n.02_1 - saucer.n.02 + water_bottle.n.01_1 - water_bottle.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init 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 19307cd7..88527782 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 @@ -9,7 +9,7 @@ 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 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 hay.n.01_1 - hay.n.01 agent.n.01_1 - agent.n.01 ) 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 f7012a51..d02ce632 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 @@ -3,7 +3,7 @@ (:objects table_lamp.n.01_1 - table_lamp.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 computer.n.01_1 - computer.n.01 router.n.02_1 - router.n.02 carton.n.02_1 - carton.n.02 diff --git a/bddl/activity_definitions/set_up_a_hot_dog_bar/problem0.bddl b/bddl/activity_definitions/set_up_a_hot_dog_bar/problem0.bddl index 6434e8bc..38ca29d3 100644 --- a/bddl/activity_definitions/set_up_a_hot_dog_bar/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_hot_dog_bar/problem0.bddl @@ -3,7 +3,7 @@ (:objects tongs.n.01_1 tongs.n.01_2 - tongs.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 frankfurter_bun.n.01_1 frankfurter_bun.n.01_2 - frankfurter_bun.n.01 hotdog.n.02_1 hotdog.n.02_2 - hotdog.n.02 bottle__of__catsup.n.01_1 - bottle__of__catsup.n.01 diff --git a/bddl/activity_definitions/set_up_a_mouse_cage/problem0.bddl b/bddl/activity_definitions/set_up_a_mouse_cage/problem0.bddl index 452b79a2..a5147131 100644 --- a/bddl/activity_definitions/set_up_a_mouse_cage/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_mouse_cage/problem0.bddl @@ -10,7 +10,7 @@ water_bottle.n.01_1 - water_bottle.n.01 hutch.n.01_1 - hutch.n.01 bowl.n.01_1 - bowl.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 agent.n.01_1 - agent.n.01 ) 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 bd4eef33..5ce49349 100644 --- a/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl @@ -3,7 +3,7 @@ (:objects blackboard_eraser.n.01_1 - blackboard_eraser.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 teddy.n.01_1 teddy.n.01_2 teddy.n.01_3 teddy.n.01_4 - teddy.n.01 notebook.n.01_1 notebook.n.01_2 - notebook.n.01 pencil.n.01_1 pencil.n.01_2 - pencil.n.01 @@ -13,8 +13,8 @@ backpack.n.01_1 backpack.n.01_2 backpack.n.01_3 backpack.n.01_4 - backpack.n.01 carton.n.02_1 carton.n.02_2 - carton.n.02 mat.n.03_1 - mat.n.03 - blackboard.n.01_1 - blackboard.n.01 - table.n.02_1 table.n.02_10 table.n.02_2 table.n.02_3 table.n.02_4 table.n.02_5 table.n.02_6 table.n.02_7 table.n.02_8 table.n.02_9 - table.n.02 + blackboard.n.01_1 blackboard.n.01_* - blackboard.n.01 + table.n.02_1 table.n.02_10 table.n.02_2 table.n.02_3 table.n.02_4 table.n.02_5 table.n.02_6 table.n.02_7 table.n.02_8 table.n.02_9 table.n.02_* - table.n.02 wall_clock.n.01_1 - wall_clock.n.01 chair.n.01_1 chair.n.01_10 chair.n.01_2 chair.n.01_3 chair.n.01_4 chair.n.01_5 chair.n.01_6 chair.n.01_7 chair.n.01_8 chair.n.01_9 - chair.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/setting_mousetraps/problem0.bddl b/bddl/activity_definitions/setting_mousetraps/problem0.bddl index 9fa0c5a3..6ced3781 100644 --- a/bddl/activity_definitions/setting_mousetraps/problem0.bddl +++ b/bddl/activity_definitions/setting_mousetraps/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - mousetrap.n.01_1 mousetrap.n.01_2 mousetrap.n.01_3 mousetrap.n.01_4 - mousetrap.n.01 - sink.n.01_1 - sink.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 - toilet.n.02_1 - toilet.n.02 + mousetrap.n.01_1 mousetrap.n.01_2 mousetrap.n.01_3 mousetrap.n.01_4 - mousetrap.n.01 + sink.n.01_1 - sink.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 + toilet.n.02_1 toilet.n.02_* - toilet.n.02 bed.n.01_1 - bed.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/setting_table_for_coffee/problem0.bddl b/bddl/activity_definitions/setting_table_for_coffee/problem0.bddl index faa905fc..649e10d4 100644 --- a/bddl/activity_definitions/setting_table_for_coffee/problem0.bddl +++ b/bddl/activity_definitions/setting_table_for_coffee/problem0.bddl @@ -4,11 +4,11 @@ (:objects espresso.n.01_1 - espresso.n.01 pitcher.n.02_1 - pitcher.n.02 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 box__of__cream.n.01_1 - box__of__cream.n.01 cabinet.n.01_1 - cabinet.n.01 napkin.n.01_1 napkin.n.01_2 - napkin.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 granulated_sugar.n.01_1 - granulated_sugar.n.01 bowl.n.01_1 - bowl.n.01 teaspoon.n.02_1 teaspoon.n.02_2 - teaspoon.n.02 diff --git a/bddl/activity_definitions/setting_the_fire/problem0.bddl b/bddl/activity_definitions/setting_the_fire/problem0.bddl index 2a8e3013..d5cff68b 100644 --- a/bddl/activity_definitions/setting_the_fire/problem0.bddl +++ b/bddl/activity_definitions/setting_the_fire/problem0.bddl @@ -6,7 +6,7 @@ floor.n.01_1 - floor.n.01 newspaper.n.03_1 - newspaper.n.03 cigar_lighter.n.01_1 - cigar_lighter.n.01 - wood_fireplace.n.01_1 - wood_fireplace.n.01 + wood_fireplace.n.01_1 wood_fireplace.n.01_* - wood_fireplace.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/setting_the_table/problem0.bddl b/bddl/activity_definitions/setting_the_table/problem0.bddl index 83806f7a..b19a8a26 100644 --- a/bddl/activity_definitions/setting_the_table/problem0.bddl +++ b/bddl/activity_definitions/setting_the_table/problem0.bddl @@ -3,7 +3,7 @@ (:objects hamburger.n.01_1 hamburger.n.01_2 - hamburger.n.01 - breakfast_table.n.01_1 - breakfast_table.n.01 + breakfast_table.n.01_1 breakfast_table.n.01_* - breakfast_table.n.01 tablefork.n.01_1 tablefork.n.01_2 - tablefork.n.01 place_mat.n.01_1 place_mat.n.01_2 - place_mat.n.01 plate.n.04_1 plate.n.04_2 - plate.n.04 diff --git a/bddl/activity_definitions/setting_up_bedroom_for_guest/problem0.bddl b/bddl/activity_definitions/setting_up_bedroom_for_guest/problem0.bddl index 91d99e7d..e1cc6ae8 100644 --- a/bddl/activity_definitions/setting_up_bedroom_for_guest/problem0.bddl +++ b/bddl/activity_definitions/setting_up_bedroom_for_guest/problem0.bddl @@ -5,7 +5,7 @@ pillow.n.01_1 - pillow.n.01 floor.n.01_1 - floor.n.01 blanket.n.01_1 - blanket.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 agent.n.01_1 - agent.n.01 ) 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 25463e1c..7d21735a 100644 --- a/bddl/activity_definitions/setting_up_for_an_event/problem0.bddl +++ b/bddl/activity_definitions/setting_up_for_an_event/problem0.bddl @@ -7,7 +7,7 @@ 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_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 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 agent.n.01_1 - agent.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 f0d3d93c..c13a9398 100644 --- a/bddl/activity_definitions/setting_up_garden_furniture/problem0.bddl +++ b/bddl/activity_definitions/setting_up_garden_furniture/problem0.bddl @@ -3,13 +3,13 @@ (:objects pitcher.n.02_1 - pitcher.n.02 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 lawn_chair.n.01_1 lawn_chair.n.01_2 lawn_chair.n.01_3 - lawn_chair.n.01 teacup.n.02_1 teacup.n.02_2 - teacup.n.02 lawn.n.01_1 - lawn.n.01 driveway.n.01_1 - driveway.n.01 tree.n.01_1 - tree.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/setting_up_living_room_for_guest/problem0.bddl b/bddl/activity_definitions/setting_up_living_room_for_guest/problem0.bddl index 89975070..2da4f398 100644 --- a/bddl/activity_definitions/setting_up_living_room_for_guest/problem0.bddl +++ b/bddl/activity_definitions/setting_up_living_room_for_guest/problem0.bddl @@ -2,16 +2,16 @@ (:domain omnigibson) (:objects - chip.n.04_1 chip.n.04_2 chip.n.04_3 - chip.n.04 - bowl.n.01_1 - bowl.n.01 - bookcase.n.01_1 - bookcase.n.01 - hardback.n.01_1 hardback.n.01_2 hardback.n.01_3 - hardback.n.01 - table.n.02_1 - table.n.02 - floor.n.01_1 - floor.n.01 + chip.n.04_1 chip.n.04_2 chip.n.04_3 - chip.n.04 + bowl.n.01_1 - bowl.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 + hardback.n.01_1 hardback.n.01_2 hardback.n.01_3 - hardback.n.01 + table.n.02_1 table.n.02_* - table.n.02 + floor.n.01_1 - floor.n.01 dust.n.01_1 - dust.n.01 - rag.n.01_1 - rag.n.01 - teddy.n.01_1 - teddy.n.01 - agent.n.01_1 - agent.n.01 + rag.n.01_1 - rag.n.01 + teddy.n.01_1 - teddy.n.01 + agent.n.01_1 - agent.n.01 ) (:init 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 50aaa457..430b5cb5 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 @@ -8,10 +8,10 @@ can__of__soda.n.01_1 can__of__soda.n.01_2 can__of__soda.n.01_3 - can__of__soda.n.01 cabinet.n.01_1 - cabinet.n.01 sheet.n.03_1 - sheet.n.03 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 floor.n.01_1 - floor.n.01 television_receiver.n.01_1 - television_receiver.n.01 - sofa.n.01_1 - sofa.n.01 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/setting_up_room_for_games/problem0.bddl b/bddl/activity_definitions/setting_up_room_for_games/problem0.bddl index 8b809bcc..7814224e 100644 --- a/bddl/activity_definitions/setting_up_room_for_games/problem0.bddl +++ b/bddl/activity_definitions/setting_up_room_for_games/problem0.bddl @@ -2,13 +2,13 @@ (:domain omnigibson) (:objects - die.n.01_1 - die.n.01 - cabinet.n.01_1 - cabinet.n.01 - board_game.n.01_1 - board_game.n.01 - jigsaw_puzzle.n.01_1 - jigsaw_puzzle.n.01 - floor.n.01_1 - floor.n.01 - table.n.02_1 - table.n.02 - agent.n.01_1 - agent.n.01 + die.n.01_1 - die.n.01 + cabinet.n.01_1 - cabinet.n.01 + board_game.n.01_1 - board_game.n.01 + jigsaw_puzzle.n.01_1 - jigsaw_puzzle.n.01 + floor.n.01_1 - floor.n.01 + table.n.02_1 table.n.02_* - table.n.02 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl b/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl index ad083c92..75133280 100644 --- a/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl +++ b/bddl/activity_definitions/setting_up_silent_auction/problem0.bddl @@ -3,7 +3,7 @@ (:objects bust.n.03_1 - bust.n.03 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 painting.n.01_1 - painting.n.01 portrait.n.02_1 - portrait.n.02 carton.n.02_1 - carton.n.02 diff --git a/bddl/activity_definitions/setting_up_toy_train_track/problem0.bddl b/bddl/activity_definitions/setting_up_toy_train_track/problem0.bddl index 2363a7f6..e904a5ec 100644 --- a/bddl/activity_definitions/setting_up_toy_train_track/problem0.bddl +++ b/bddl/activity_definitions/setting_up_toy_train_track/problem0.bddl @@ -5,7 +5,7 @@ train_set.n.01_1 - train_set.n.01 carton.n.02_1 - carton.n.02 bookcase.n.01_1 - bookcase.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/setup_a_bar_for_a_cocktail_party/problem0.bddl b/bddl/activity_definitions/setup_a_bar_for_a_cocktail_party/problem0.bddl index 24546485..d03779c9 100644 --- a/bddl/activity_definitions/setup_a_bar_for_a_cocktail_party/problem0.bddl +++ b/bddl/activity_definitions/setup_a_bar_for_a_cocktail_party/problem0.bddl @@ -10,7 +10,7 @@ wine_bottle.n.01_1 wine_bottle.n.01_2 - wine_bottle.n.01 red_wine.n.01_1 - red_wine.n.01 white_wine.n.01_1 - white_wine.n.01 - countertop.n.01_1 - countertop.n.01 + countertop.n.01_1 countertop.n.01_* - countertop.n.01 beer_bottle.n.01_1 beer_bottle.n.01_2 beer_bottle.n.01_3 - beer_bottle.n.01 ice_cube.n.01_1 ice_cube.n.01_2 ice_cube.n.01_3 ice_cube.n.01_4 ice_cube.n.01_5 ice_cube.n.01_6 - ice_cube.n.01 shot_glass.n.01_1 shot_glass.n.01_2 - shot_glass.n.01 diff --git a/bddl/activity_definitions/setup_a_garden_party/problem0.bddl b/bddl/activity_definitions/setup_a_garden_party/problem0.bddl index 5526f8b0..79d0e64c 100644 --- a/bddl/activity_definitions/setup_a_garden_party/problem0.bddl +++ b/bddl/activity_definitions/setup_a_garden_party/problem0.bddl @@ -10,7 +10,7 @@ tupperware.n.01_1 - tupperware.n.01 carving_knife.n.01_1 - carving_knife.n.01 platter.n.01_1 - platter.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/shopping_at_warehouse_stores/problem0.bddl b/bddl/activity_definitions/shopping_at_warehouse_stores/problem0.bddl index f563b357..7bed33eb 100644 --- a/bddl/activity_definitions/shopping_at_warehouse_stores/problem0.bddl +++ b/bddl/activity_definitions/shopping_at_warehouse_stores/problem0.bddl @@ -2,16 +2,16 @@ (:domain omnigibson) (:objects - box__of__corn_flakes.n.01_1 - box__of__corn_flakes.n.01 - shopping_cart.n.01_1 - shopping_cart.n.01 - baguet.n.01_1 - baguet.n.01 - bag__of__cream_cheese.n.01_1 - bag__of__cream_cheese.n.01 - pomegranate.n.02_1 - pomegranate.n.02 - watermelon.n.02_1 - watermelon.n.02 - chicken.n.01_1 - chicken.n.01 - checkout.n.03_1 - checkout.n.03 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + box__of__corn_flakes.n.01_1 - box__of__corn_flakes.n.01 + shopping_cart.n.01_1 - shopping_cart.n.01 + baguet.n.01_1 - baguet.n.01 + bag__of__cream_cheese.n.01_1 - bag__of__cream_cheese.n.01 + pomegranate.n.02_1 - pomegranate.n.02 + watermelon.n.02_1 - watermelon.n.02 + chicken.n.01_1 - chicken.n.01 + checkout.n.03_1 checkout.n.03_* - checkout.n.03 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/shoveling_coal/problem0.bddl b/bddl/activity_definitions/shoveling_coal/problem0.bddl index 654a0188..02fc6213 100644 --- a/bddl/activity_definitions/shoveling_coal/problem0.bddl +++ b/bddl/activity_definitions/shoveling_coal/problem0.bddl @@ -4,9 +4,9 @@ (:objects coal.n.01_1 - coal.n.01 bucket.n.01_1 - bucket.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 shovel.n.01_1 - shovel.n.01 - grill.n.02_1 - grill.n.02 + grill.n.02_1 grill.n.02_* - grill.n.02 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/shoveling_snow/problem0.bddl b/bddl/activity_definitions/shoveling_snow/problem0.bddl index a230d426..d64c45b8 100644 --- a/bddl/activity_definitions/shoveling_snow/problem0.bddl +++ b/bddl/activity_definitions/shoveling_snow/problem0.bddl @@ -3,8 +3,8 @@ (:objects snow.n.01_1 - snow.n.01 - lawn.n.01_1 - lawn.n.01 - floor.n.01_1 - floor.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 shovel.n.01_1 - shovel.n.01 granulated_salt.n.01_1 - granulated_salt.n.01 bucket.n.01_1 - bucket.n.01 diff --git a/bddl/activity_definitions/sorting_art_supplies/problem0.bddl b/bddl/activity_definitions/sorting_art_supplies/problem0.bddl index 33a9313d..7b6f4655 100644 --- a/bddl/activity_definitions/sorting_art_supplies/problem0.bddl +++ b/bddl/activity_definitions/sorting_art_supplies/problem0.bddl @@ -9,7 +9,7 @@ pencil_box.n.01_1 pencil_box.n.01_2 - pencil_box.n.01 coffee_table.n.01_1 - coffee_table.n.01 marker.n.03_1 marker.n.03_2 - marker.n.03 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/sorting_books_on_shelf/problem0.bddl b/bddl/activity_definitions/sorting_books_on_shelf/problem0.bddl index 7fcc2036..156a6d77 100644 --- a/bddl/activity_definitions/sorting_books_on_shelf/problem0.bddl +++ b/bddl/activity_definitions/sorting_books_on_shelf/problem0.bddl @@ -6,7 +6,7 @@ comic_book.n.01_1 comic_book.n.01_2 comic_book.n.01_3 - comic_book.n.01 notebook.n.01_1 notebook.n.01_2 - notebook.n.01 coffee_table.n.01_1 - coffee_table.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/sorting_clothes/problem0.bddl b/bddl/activity_definitions/sorting_clothes/problem0.bddl index 11005e29..c5adfc97 100644 --- a/bddl/activity_definitions/sorting_clothes/problem0.bddl +++ b/bddl/activity_definitions/sorting_clothes/problem0.bddl @@ -5,7 +5,7 @@ trouser.n.01_1 trouser.n.01_2 - trouser.n.01 bed.n.01_1 - bed.n.01 blouse.n.01_1 blouse.n.01_2 - blouse.n.01 - wardrobe.n.01_1 wardrobe.n.01_2 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_2 wardrobe.n.01_* - wardrobe.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/sorting_household_items/problem0.bddl b/bddl/activity_definitions/sorting_household_items/problem0.bddl index a57aa02a..b8dadfb7 100644 --- a/bddl/activity_definitions/sorting_household_items/problem0.bddl +++ b/bddl/activity_definitions/sorting_household_items/problem0.bddl @@ -10,7 +10,7 @@ deodorant__atomizer.n.01_1 - deodorant__atomizer.n.01 lipstick.n.01_1 - lipstick.n.01 toothbrush.n.01_1 - toothbrush.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/sorting_newspapers_for_recycling/problem0.bddl b/bddl/activity_definitions/sorting_newspapers_for_recycling/problem0.bddl index 58d413fb..b42f33be 100644 --- a/bddl/activity_definitions/sorting_newspapers_for_recycling/problem0.bddl +++ b/bddl/activity_definitions/sorting_newspapers_for_recycling/problem0.bddl @@ -3,7 +3,7 @@ (:objects newspaper.n.03_1 newspaper.n.03_2 newspaper.n.03_3 newspaper.n.03_4 newspaper.n.03_5 - newspaper.n.03 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 recycling_bin.n.01_1 - recycling_bin.n.01 floor.n.01_1 - floor.n.01 magazine.n.02_1 magazine.n.02_2 - magazine.n.02 diff --git a/bddl/activity_definitions/spray_stucco/problem0.bddl b/bddl/activity_definitions/spray_stucco/problem0.bddl index aaf46196..5691f881 100644 --- a/bddl/activity_definitions/spray_stucco/problem0.bddl +++ b/bddl/activity_definitions/spray_stucco/problem0.bddl @@ -6,7 +6,7 @@ sealant.n.01_1 - sealant.n.01 sealant__atomizer.n.01_1 - sealant__atomizer.n.01 floor.n.01_1 - floor.n.01 - wall.n.01_1 - wall.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/spraying_for_bugs/problem0.bddl b/bddl/activity_definitions/spraying_for_bugs/problem0.bddl index 0f6e0af1..d7431db5 100644 --- a/bddl/activity_definitions/spraying_for_bugs/problem0.bddl +++ b/bddl/activity_definitions/spraying_for_bugs/problem0.bddl @@ -5,7 +5,7 @@ insectifuge__atomizer.n.01_1 - insectifuge__atomizer.n.01 floor.n.01_1 - floor.n.01 insectifuge.n.01_1 - insectifuge.n.01 - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/spraying_fruit_trees/problem0.bddl b/bddl/activity_definitions/spraying_fruit_trees/problem0.bddl index 27fa8de2..3df973a1 100644 --- a/bddl/activity_definitions/spraying_fruit_trees/problem0.bddl +++ b/bddl/activity_definitions/spraying_fruit_trees/problem0.bddl @@ -4,7 +4,7 @@ (:objects pesticide.n.01_1 - pesticide.n.01 pesticide__atomizer.n.01_1 - pesticide__atomizer.n.01 - tree.n.01_1 tree.n.01_2 - tree.n.01 + tree.n.01_1 tree.n.01_2 tree.n.01_* - tree.n.01 gate.n.01_1 - gate.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/stacking_wood/problem0.bddl b/bddl/activity_definitions/stacking_wood/problem0.bddl index abbdd428..31eb061a 100644 --- a/bddl/activity_definitions/stacking_wood/problem0.bddl +++ b/bddl/activity_definitions/stacking_wood/problem0.bddl @@ -3,7 +3,7 @@ (:objects log.n.01_1 log.n.01_2 log.n.01_3 log.n.01_4 log.n.01_5 log.n.01_6 - log.n.01 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/staining_wood_furniture/problem0.bddl b/bddl/activity_definitions/staining_wood_furniture/problem0.bddl index 7f92b626..8caa4e10 100644 --- a/bddl/activity_definitions/staining_wood_furniture/problem0.bddl +++ b/bddl/activity_definitions/staining_wood_furniture/problem0.bddl @@ -6,7 +6,7 @@ paintbrush.n.01_1 - paintbrush.n.01 ink__bottle.n.01_1 - ink__bottle.n.01 floor.n.01_1 - floor.n.01 - coffee_table.n.01_1 - coffee_table.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/stash_snacks_in_your_room/problem0.bddl b/bddl/activity_definitions/stash_snacks_in_your_room/problem0.bddl index 50d18db5..dae623a2 100644 --- a/bddl/activity_definitions/stash_snacks_in_your_room/problem0.bddl +++ b/bddl/activity_definitions/stash_snacks_in_your_room/problem0.bddl @@ -2,18 +2,18 @@ (:domain omnigibson) (:objects - chip.n.04_1 chip.n.04_2 - chip.n.04 - bed.n.01_1 - bed.n.01 - pack__of__chocolate_bar.n.01_1 pack__of__chocolate_bar.n.01_2 - pack__of__chocolate_bar.n.01 - bag__of__jerky.n.01_1 bag__of__jerky.n.01_2 - bag__of__jerky.n.01 - chocolate_bar.n.01_1 - chocolate_bar.n.01 - granola_bar.n.01_1 granola_bar.n.01_2 - granola_bar.n.01 + chip.n.04_1 chip.n.04_2 - chip.n.04 + bed.n.01_1 bed.n.01_* - bed.n.01 + pack__of__chocolate_bar.n.01_1 pack__of__chocolate_bar.n.01_2 - pack__of__chocolate_bar.n.01 + bag__of__jerky.n.01_1 bag__of__jerky.n.01_2 - bag__of__jerky.n.01 + chocolate_bar.n.01_1 - chocolate_bar.n.01 + granola_bar.n.01_1 granola_bar.n.01_2 - granola_bar.n.01 sack.n.01_1 - sack.n.01 - chocolate_biscuit.n.01_1 chocolate_biscuit.n.01_2 - chocolate_biscuit.n.01 - table.n.02_1 - table.n.02 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + chocolate_biscuit.n.01_1 chocolate_biscuit.n.01_2 - chocolate_biscuit.n.01 + table.n.02_1 table.n.02_* - table.n.02 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/stock_a_bar/problem0.bddl b/bddl/activity_definitions/stock_a_bar/problem0.bddl index e95dddff..1d4b93af 100644 --- a/bddl/activity_definitions/stock_a_bar/problem0.bddl +++ b/bddl/activity_definitions/stock_a_bar/problem0.bddl @@ -6,7 +6,7 @@ carton.n.02_1 - carton.n.02 bottle__of__rum.n.01_1 bottle__of__rum.n.01_2 - bottle__of__rum.n.01 bottle__of__gin.n.01_1 - bottle__of__gin.n.01 - shelf.n.01_1 - shelf.n.01 + shelf.n.01_1 shelf.n.01_* - shelf.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/stock_grocery_shelves/problem0.bddl b/bddl/activity_definitions/stock_grocery_shelves/problem0.bddl index 2b5bfad4..dbde26db 100644 --- a/bddl/activity_definitions/stock_grocery_shelves/problem0.bddl +++ b/bddl/activity_definitions/stock_grocery_shelves/problem0.bddl @@ -2,18 +2,18 @@ (:domain omnigibson) (:objects - pack__of__bread.n.01_1 pack__of__bread.n.01_2 - pack__of__bread.n.01 - toilet_tissue.n.01_1 toilet_tissue.n.01_2 - toilet_tissue.n.01 - can__of__cat_food.n.01_1 can__of__cat_food.n.01_2 - can__of__cat_food.n.01 - floor.n.01_1 - floor.n.01 - water_bottle.n.01_1 water_bottle.n.01_2 - water_bottle.n.01 - pack__of__chocolate_bar.n.01_1 pack__of__chocolate_bar.n.01_2 - pack__of__chocolate_bar.n.01 - bottle__of__soda.n.01_1 bottle__of__soda.n.01_2 - bottle__of__soda.n.01 - bottle__of__cooking_oil.n.01_1 bottle__of__cooking_oil.n.01_2 - bottle__of__cooking_oil.n.01 - cigarette.n.01_1 cigarette.n.01_2 - cigarette.n.01 + pack__of__bread.n.01_1 pack__of__bread.n.01_2 - pack__of__bread.n.01 + toilet_tissue.n.01_1 toilet_tissue.n.01_2 - toilet_tissue.n.01 + can__of__cat_food.n.01_1 can__of__cat_food.n.01_2 - can__of__cat_food.n.01 + floor.n.01_1 - floor.n.01 + water_bottle.n.01_1 water_bottle.n.01_2 - water_bottle.n.01 + pack__of__chocolate_bar.n.01_1 pack__of__chocolate_bar.n.01_2 - pack__of__chocolate_bar.n.01 + bottle__of__soda.n.01_1 bottle__of__soda.n.01_2 - bottle__of__soda.n.01 + bottle__of__cooking_oil.n.01_1 bottle__of__cooking_oil.n.01_2 - bottle__of__cooking_oil.n.01 + cigarette.n.01_1 cigarette.n.01_2 - cigarette.n.01 carton.n.02_1 carton.n.02_2 carton.n.02_3 carton.n.02_4 - carton.n.02 - grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 - agent.n.01_1 - agent.n.01 + grocery_shelf.n.01_1 grocery_shelf.n.01_2 grocery_shelf.n.01_3 - grocery_shelf.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_a_fur_coat/problem0.bddl b/bddl/activity_definitions/store_a_fur_coat/problem0.bddl index 341cea38..e454c98e 100644 --- a/bddl/activity_definitions/store_a_fur_coat/problem0.bddl +++ b/bddl/activity_definitions/store_a_fur_coat/problem0.bddl @@ -5,7 +5,7 @@ bed.n.01_1 - bed.n.01 floor.n.01_1 - floor.n.01 hanger.n.02_1 - hanger.n.02 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 fur_coat.n.01_1 - fur_coat.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_a_kayak/problem0.bddl b/bddl/activity_definitions/store_a_kayak/problem0.bddl index 8bd3a8e4..01f04dfc 100644 --- a/bddl/activity_definitions/store_a_kayak/problem0.bddl +++ b/bddl/activity_definitions/store_a_kayak/problem0.bddl @@ -7,7 +7,7 @@ floor.n.01_1 - floor.n.01 water.n.06_1 - water.n.06 bath_towel.n.01_1 - bath_towel.n.01 - wall_nail.n.01_1 - wall_nail.n.01 + wall_nail.n.01_1 wall_nail.n.01_* - wall_nail.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_a_quilt/problem0.bddl b/bddl/activity_definitions/store_a_quilt/problem0.bddl index 407c4138..ff9eede8 100644 --- a/bddl/activity_definitions/store_a_quilt/problem0.bddl +++ b/bddl/activity_definitions/store_a_quilt/problem0.bddl @@ -5,7 +5,7 @@ wicker_basket.n.01_1 - wicker_basket.n.01 floor.n.01_1 - floor.n.01 quilt.n.01_1 - quilt.n.01 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_an_uncooked_turkey/problem0.bddl b/bddl/activity_definitions/store_an_uncooked_turkey/problem0.bddl index b3950846..4c64dbeb 100644 --- a/bddl/activity_definitions/store_an_uncooked_turkey/problem0.bddl +++ b/bddl/activity_definitions/store_an_uncooked_turkey/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - turkey.n.04_1 - turkey.n.04 - countertop.n.01_1 - countertop.n.01 - cookie_sheet.n.01_1 - cookie_sheet.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + turkey.n.04_1 - turkey.n.04 + countertop.n.01_1 - countertop.n.01 + cookie_sheet.n.01_1 - cookie_sheet.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_baby_clothes/problem0.bddl b/bddl/activity_definitions/store_baby_clothes/problem0.bddl index 5691fda5..b1252ae8 100644 --- a/bddl/activity_definitions/store_baby_clothes/problem0.bddl +++ b/bddl/activity_definitions/store_baby_clothes/problem0.bddl @@ -7,7 +7,7 @@ diaper.n.01_1 diaper.n.01_2 - diaper.n.01 baby_shoe.n.01_1 baby_shoe.n.01_2 - baby_shoe.n.01 sock.n.01_1 sock.n.01_2 - sock.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_baking_soda/problem0.bddl b/bddl/activity_definitions/store_baking_soda/problem0.bddl index 1b2f63e6..d3dd7ddd 100644 --- a/bddl/activity_definitions/store_baking_soda/problem0.bddl +++ b/bddl/activity_definitions/store_baking_soda/problem0.bddl @@ -4,7 +4,7 @@ (:objects box__of__baking_soda.n.01_1 box__of__baking_soda.n.01_2 - box__of__baking_soda.n.01 countertop.n.01_1 - countertop.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_batteries/problem0.bddl b/bddl/activity_definitions/store_batteries/problem0.bddl index ca7f39ae..5a2261ea 100644 --- a/bddl/activity_definitions/store_batteries/problem0.bddl +++ b/bddl/activity_definitions/store_batteries/problem0.bddl @@ -4,7 +4,7 @@ (:objects battery.n.02_1 battery.n.02_2 - battery.n.02 shelf.n.01_1 - shelf.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_beer/problem0.bddl b/bddl/activity_definitions/store_beer/problem0.bddl index 4d1befaa..028de304 100644 --- a/bddl/activity_definitions/store_beer/problem0.bddl +++ b/bddl/activity_definitions/store_beer/problem0.bddl @@ -4,7 +4,7 @@ (:objects beer_bottle.n.01_1 beer_bottle.n.01_2 beer_bottle.n.01_3 beer_bottle.n.01_4 - beer_bottle.n.01 countertop.n.01_1 - countertop.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_bobby_pins/problem0.bddl b/bddl/activity_definitions/store_bobby_pins/problem0.bddl index 1b051992..e212d2e6 100644 --- a/bddl/activity_definitions/store_bobby_pins/problem0.bddl +++ b/bddl/activity_definitions/store_bobby_pins/problem0.bddl @@ -4,7 +4,7 @@ (:objects bobby_pin.n.01_1 bobby_pin.n.01_2 bobby_pin.n.01_3 - bobby_pin.n.01 pencil_box.n.01_1 - pencil_box.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_brownies/problem0.bddl b/bddl/activity_definitions/store_brownies/problem0.bddl index 8813019d..b4292981 100644 --- a/bddl/activity_definitions/store_brownies/problem0.bddl +++ b/bddl/activity_definitions/store_brownies/problem0.bddl @@ -3,7 +3,7 @@ (:objects brownie.n.03_1 brownie.n.03_2 brownie.n.03_3 brownie.n.03_4 brownie.n.03_5 - brownie.n.03 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 tray.n.01_1 - tray.n.01 tupperware.n.01_1 - tupperware.n.01 countertop.n.01_1 - countertop.n.01 diff --git a/bddl/activity_definitions/store_coffee_beans_or_ground_coffee/problem0.bddl b/bddl/activity_definitions/store_coffee_beans_or_ground_coffee/problem0.bddl index cb8aab33..a1b3799b 100644 --- a/bddl/activity_definitions/store_coffee_beans_or_ground_coffee/problem0.bddl +++ b/bddl/activity_definitions/store_coffee_beans_or_ground_coffee/problem0.bddl @@ -6,7 +6,7 @@ sack.n.01_1 - sack.n.01 mason_jar.n.01_1 mason_jar.n.01_2 - mason_jar.n.01 countertop.n.01_1 - countertop.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl b/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl index d886e400..53c2a5db 100644 --- a/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl +++ b/bddl/activity_definitions/store_daffodil_bulbs/problem0.bddl @@ -4,7 +4,7 @@ (:objects 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 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 mixing_bowl.n.01_1 - mixing_bowl.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/store_feta_cheese/problem0.bddl b/bddl/activity_definitions/store_feta_cheese/problem0.bddl index 2ee219b1..7fb7a821 100644 --- a/bddl/activity_definitions/store_feta_cheese/problem0.bddl +++ b/bddl/activity_definitions/store_feta_cheese/problem0.bddl @@ -6,7 +6,7 @@ tupperware.n.01_1 - tupperware.n.01 plastic_wrap.n.01_1 - plastic_wrap.n.01 countertop.n.01_1 - countertop.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_firewood/problem0.bddl b/bddl/activity_definitions/store_firewood/problem0.bddl index 0c3e8d2b..aba491ba 100644 --- a/bddl/activity_definitions/store_firewood/problem0.bddl +++ b/bddl/activity_definitions/store_firewood/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - firewood.n.01_1 firewood.n.01_2 firewood.n.01_3 - firewood.n.01 - floor.n.01_1 - floor.n.01 - table.n.02_1 - table.n.02 - agent.n.01_1 - agent.n.01 + firewood.n.01_1 firewood.n.01_2 firewood.n.01_3 - firewood.n.01 + floor.n.01_1 - floor.n.01 + table.n.02_1 table.n.02_* - table.n.02 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_firewood_outdoors/problem0.bddl b/bddl/activity_definitions/store_firewood_outdoors/problem0.bddl index 7edacab9..b37c4df8 100644 --- a/bddl/activity_definitions/store_firewood_outdoors/problem0.bddl +++ b/bddl/activity_definitions/store_firewood_outdoors/problem0.bddl @@ -4,7 +4,7 @@ (:objects firewood.n.01_1 firewood.n.01_2 firewood.n.01_3 firewood.n.01_4 firewood.n.01_5 firewood.n.01_6 - firewood.n.01 floor.n.01_1 - floor.n.01 - table.n.02_1 - table.n.02 + table.n.02_1 table.n.02_* - table.n.02 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_honey/problem0.bddl b/bddl/activity_definitions/store_honey/problem0.bddl index c7f78f6d..0124292c 100644 --- a/bddl/activity_definitions/store_honey/problem0.bddl +++ b/bddl/activity_definitions/store_honey/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - jar__of__honey.n.01_1 - jar__of__honey.n.01 - countertop.n.01_1 - countertop.n.01 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + jar__of__honey.n.01_1 - jar__of__honey.n.01 + countertop.n.01_1 - countertop.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_loose_leaf_tea/problem0.bddl b/bddl/activity_definitions/store_loose_leaf_tea/problem0.bddl index 910c5a90..cc57673d 100644 --- a/bddl/activity_definitions/store_loose_leaf_tea/problem0.bddl +++ b/bddl/activity_definitions/store_loose_leaf_tea/problem0.bddl @@ -6,7 +6,7 @@ sack.n.01_1 - sack.n.01 mason_jar.n.01_1 - mason_jar.n.01 countertop.n.01_1 - countertop.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_nuts/problem0.bddl b/bddl/activity_definitions/store_nuts/problem0.bddl index fc0ffde0..d8743a15 100644 --- a/bddl/activity_definitions/store_nuts/problem0.bddl +++ b/bddl/activity_definitions/store_nuts/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - walnut.n.01_1 walnut.n.01_2 walnut.n.01_3 - walnut.n.01 - mason_jar.n.01_1 - mason_jar.n.01 - countertop.n.01_1 - countertop.n.01 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + walnut.n.01_1 walnut.n.01_2 walnut.n.01_3 - walnut.n.01 + mason_jar.n.01_1 - mason_jar.n.01 + countertop.n.01_1 - countertop.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_produce/problem0.bddl b/bddl/activity_definitions/store_produce/problem0.bddl index c745fc88..541911cc 100644 --- a/bddl/activity_definitions/store_produce/problem0.bddl +++ b/bddl/activity_definitions/store_produce/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - mango.n.02_1 mango.n.02_2 - mango.n.02 + mango.n.02_1 mango.n.02_2 - mango.n.02 pomegranate.n.02_1 pomegranate.n.02_2 - pomegranate.n.02 sack.n.01_1 - sack.n.01 floor.n.01_1 - floor.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_rugs/problem0.bddl b/bddl/activity_definitions/store_rugs/problem0.bddl index c0b7978c..ca67cdc7 100644 --- a/bddl/activity_definitions/store_rugs/problem0.bddl +++ b/bddl/activity_definitions/store_rugs/problem0.bddl @@ -5,7 +5,7 @@ rug.n.01_1 - rug.n.01 floor.n.01_1 - floor.n.01 dust.n.01_1 - dust.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 vacuum.n.04_1 - vacuum.n.04 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_silver_coins/problem0.bddl b/bddl/activity_definitions/store_silver_coins/problem0.bddl index 41e8545f..4f31c376 100644 --- a/bddl/activity_definitions/store_silver_coins/problem0.bddl +++ b/bddl/activity_definitions/store_silver_coins/problem0.bddl @@ -6,7 +6,7 @@ hand_towel.n.01_1 - hand_towel.n.01 breakfast_table.n.01_1 - breakfast_table.n.01 cup.n.01_1 - cup.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_tulip_bulbs/problem0.bddl b/bddl/activity_definitions/store_tulip_bulbs/problem0.bddl index a788c7b3..4934ed54 100644 --- a/bddl/activity_definitions/store_tulip_bulbs/problem0.bddl +++ b/bddl/activity_definitions/store_tulip_bulbs/problem0.bddl @@ -5,7 +5,7 @@ packing_box.n.02_1 - packing_box.n.02 countertop.n.01_1 - countertop.n.01 tulip.n.01_1 tulip.n.01_2 - tulip.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/store_vintage_linens/problem0.bddl b/bddl/activity_definitions/store_vintage_linens/problem0.bddl index f3977bc6..4de3f102 100644 --- a/bddl/activity_definitions/store_vintage_linens/problem0.bddl +++ b/bddl/activity_definitions/store_vintage_linens/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - doily.n.01_1 doily.n.01_2 - doily.n.01 - wardrobe.n.01_1 - wardrobe.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + doily.n.01_1 doily.n.01_2 - doily.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_vodka/problem0.bddl b/bddl/activity_definitions/store_vodka/problem0.bddl index a7e3ff24..b71d8ed5 100644 --- a/bddl/activity_definitions/store_vodka/problem0.bddl +++ b/bddl/activity_definitions/store_vodka/problem0.bddl @@ -2,10 +2,10 @@ (:domain omnigibson) (:objects - bottle__of__vodka.n.01_1 bottle__of__vodka.n.01_2 - bottle__of__vodka.n.01 - floor.n.01_1 - floor.n.01 - cabinet.n.01_1 - cabinet.n.01 - agent.n.01_1 - agent.n.01 + bottle__of__vodka.n.01_1 bottle__of__vodka.n.01_2 - bottle__of__vodka.n.01 + floor.n.01_1 - floor.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_whole_grains/problem0.bddl b/bddl/activity_definitions/store_whole_grains/problem0.bddl index d8c0713e..aaf45770 100644 --- a/bddl/activity_definitions/store_whole_grains/problem0.bddl +++ b/bddl/activity_definitions/store_whole_grains/problem0.bddl @@ -2,12 +2,12 @@ (:domain omnigibson) (:objects - white_rice.n.01_1 - white_rice.n.01 - sack.n.01_1 - sack.n.01 - floor.n.01_1 - floor.n.01 - mason_jar.n.01_1 - mason_jar.n.01 - cabinet.n.01_1 - cabinet.n.01 - agent.n.01_1 - agent.n.01 + white_rice.n.01_1 - white_rice.n.01 + sack.n.01_1 - sack.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + mason_jar.n.01_1 - mason_jar.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/store_winter_coats/problem0.bddl b/bddl/activity_definitions/store_winter_coats/problem0.bddl index b40b69db..114e21d2 100644 --- a/bddl/activity_definitions/store_winter_coats/problem0.bddl +++ b/bddl/activity_definitions/store_winter_coats/problem0.bddl @@ -5,7 +5,7 @@ coat.n.01_1 coat.n.01_2 - coat.n.01 floor.n.01_1 - floor.n.01 hanger.n.02_1 hanger.n.02_2 - hanger.n.02 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/storing_food/problem0.bddl b/bddl/activity_definitions/storing_food/problem0.bddl index 29415aa2..a61ba695 100644 --- a/bddl/activity_definitions/storing_food/problem0.bddl +++ b/bddl/activity_definitions/storing_food/problem0.bddl @@ -2,14 +2,14 @@ (:domain omnigibson) (:objects - 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 - jar__of__sugar.n.01_1 jar__of__sugar.n.01_2 - jar__of__sugar.n.01 - cabinet.n.01_1 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.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 + jar__of__sugar.n.01_1 jar__of__sugar.n.01_2 - jar__of__sugar.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/sweeping_floors/problem0.bddl b/bddl/activity_definitions/sweeping_floors/problem0.bddl index 08b9a3f8..24abe4a5 100644 --- a/bddl/activity_definitions/sweeping_floors/problem0.bddl +++ b/bddl/activity_definitions/sweeping_floors/problem0.bddl @@ -3,7 +3,7 @@ (:objects dust.n.01_1 - dust.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 rug.n.01_1 - rug.n.01 broom.n.01_1 - broom.n.01 dustpan.n.02_1 - dustpan.n.02 diff --git a/bddl/activity_definitions/sweeping_garage/problem0.bddl b/bddl/activity_definitions/sweeping_garage/problem0.bddl index f5e8c827..0c97d47f 100644 --- a/bddl/activity_definitions/sweeping_garage/problem0.bddl +++ b/bddl/activity_definitions/sweeping_garage/problem0.bddl @@ -4,7 +4,7 @@ (:objects broom.n.01_1 - broom.n.01 pallet.n.02_1 - pallet.n.02 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 sand.n.04_1 - sand.n.04 dust.n.01_1 - dust.n.01 bucket.n.01_1 - bucket.n.01 diff --git a/bddl/activity_definitions/sweeping_outside_entrance/problem0.bddl b/bddl/activity_definitions/sweeping_outside_entrance/problem0.bddl index 0778bec9..ee6c9ff4 100644 --- a/bddl/activity_definitions/sweeping_outside_entrance/problem0.bddl +++ b/bddl/activity_definitions/sweeping_outside_entrance/problem0.bddl @@ -4,7 +4,7 @@ (:objects dust.n.01_1 - dust.n.01 floor.n.01_1 - floor.n.01 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 ashcan.n.01_1 - ashcan.n.01 entire_leaf.n.01_1 entire_leaf.n.01_2 entire_leaf.n.01_3 - entire_leaf.n.01 wreath.n.01_1 - wreath.n.01 diff --git a/bddl/activity_definitions/sweeping_patio/problem0.bddl b/bddl/activity_definitions/sweeping_patio/problem0.bddl index 9d7e6054..8fcd29b2 100644 --- a/bddl/activity_definitions/sweeping_patio/problem0.bddl +++ b/bddl/activity_definitions/sweeping_patio/problem0.bddl @@ -4,7 +4,7 @@ (:objects broom.n.01_1 - broom.n.01 sand.n.04_1 - sand.n.04 - driveway.n.01_1 - driveway.n.01 + driveway.n.01_1 driveway.n.01_* - driveway.n.01 entire_leaf.n.01_1 entire_leaf.n.01_2 entire_leaf.n.01_3 entire_leaf.n.01_4 entire_leaf.n.01_5 - entire_leaf.n.01 sack.n.01_1 - sack.n.01 lawn.n.01_1 - lawn.n.01 diff --git a/bddl/activity_definitions/sweeping_porch/problem0.bddl b/bddl/activity_definitions/sweeping_porch/problem0.bddl index a8cfa7b3..4a2152bb 100644 --- a/bddl/activity_definitions/sweeping_porch/problem0.bddl +++ b/bddl/activity_definitions/sweeping_porch/problem0.bddl @@ -3,7 +3,7 @@ (:objects ashcan.n.01_1 ashcan.n.01_2 - ashcan.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 bunchgrass.n.01_1 - bunchgrass.n.01 broom.n.01_1 - broom.n.01 driveway.n.01_1 - driveway.n.01 diff --git a/bddl/activity_definitions/taking_clothes_out_of_washer/problem0.bddl b/bddl/activity_definitions/taking_clothes_out_of_washer/problem0.bddl index df2ade5c..75cbf0fc 100644 --- a/bddl/activity_definitions/taking_clothes_out_of_washer/problem0.bddl +++ b/bddl/activity_definitions/taking_clothes_out_of_washer/problem0.bddl @@ -7,7 +7,7 @@ undergarment.n.01_1 undergarment.n.01_2 - undergarment.n.01 sock.n.01_1 sock.n.01_2 - sock.n.01 water.n.06_1 - water.n.06 - clothes_dryer.n.01_1 - clothes_dryer.n.01 + clothes_dryer.n.01_1 clothes_dryer.n.01_* - clothes_dryer.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/taking_fish_out_of_freezer/problem0.bddl b/bddl/activity_definitions/taking_fish_out_of_freezer/problem0.bddl index bd6963be..188744ee 100644 --- a/bddl/activity_definitions/taking_fish_out_of_freezer/problem0.bddl +++ b/bddl/activity_definitions/taking_fish_out_of_freezer/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - salmon.n.03_1 salmon.n.03_2 salmon.n.03_3 - salmon.n.03 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - shopping_cart.n.01_1 - shopping_cart.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + salmon.n.03_1 salmon.n.03_2 salmon.n.03_3 - salmon.n.03 + electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + shopping_cart.n.01_1 shopping_cart.n.01_* - shopping_cart.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/taking_trash_outside/problem0.bddl b/bddl/activity_definitions/taking_trash_outside/problem0.bddl index 25e1b164..9009a93a 100644 --- a/bddl/activity_definitions/taking_trash_outside/problem0.bddl +++ b/bddl/activity_definitions/taking_trash_outside/problem0.bddl @@ -3,7 +3,7 @@ (:objects bag__of__rubbish.n.01_1 bag__of__rubbish.n.01_2 - bag__of__rubbish.n.01 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/throwing_out_used_napkins/problem0.bddl b/bddl/activity_definitions/throwing_out_used_napkins/problem0.bddl index e8cdc43e..323ceb3f 100644 --- a/bddl/activity_definitions/throwing_out_used_napkins/problem0.bddl +++ b/bddl/activity_definitions/throwing_out_used_napkins/problem0.bddl @@ -3,7 +3,7 @@ (:objects napkin.n.01_1 napkin.n.01_2 - napkin.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 ashcan.n.01_1 - ashcan.n.01 stain.n.01_1 - stain.n.01 countertop.n.01_1 - countertop.n.01 diff --git a/bddl/activity_definitions/tidy_your_garden/problem0.bddl b/bddl/activity_definitions/tidy_your_garden/problem0.bddl index c7b828bd..9a9ebfe6 100644 --- a/bddl/activity_definitions/tidy_your_garden/problem0.bddl +++ b/bddl/activity_definitions/tidy_your_garden/problem0.bddl @@ -3,7 +3,7 @@ (:objects bunchgrass.n.01_1 - bunchgrass.n.01 - rail_fence.n.01_1 - rail_fence.n.01 + rail_fence.n.01_1 rail_fence.n.01_* - rail_fence.n.01 dixie_cup.n.01_1 dixie_cup.n.01_2 dixie_cup.n.01_3 - dixie_cup.n.01 tree.n.01_1 - tree.n.01 bench.n.01_1 - bench.n.01 diff --git a/bddl/activity_definitions/tidying_bathroom/problem0.bddl b/bddl/activity_definitions/tidying_bathroom/problem0.bddl index f6a6c43d..5767ee7f 100644 --- a/bddl/activity_definitions/tidying_bathroom/problem0.bddl +++ b/bddl/activity_definitions/tidying_bathroom/problem0.bddl @@ -6,8 +6,8 @@ wicker_basket.n.01_1 - wicker_basket.n.01 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.02_1 - toilet.n.02 + floor.n.01_1 floor.n.01_* - floor.n.01 + toilet.n.02_1 toilet.n.02_* - toilet.n.02 deodorant__atomizer.n.01_1 - deodorant__atomizer.n.01 toothbrush.n.01_1 - toothbrush.n.01 bottle__of__shampoo.n.01_1 - bottle__of__shampoo.n.01 diff --git a/bddl/activity_definitions/tidying_bedroom/problem0.bddl b/bddl/activity_definitions/tidying_bedroom/problem0.bddl index de2cf207..d7fe47e7 100644 --- a/bddl/activity_definitions/tidying_bedroom/problem0.bddl +++ b/bddl/activity_definitions/tidying_bedroom/problem0.bddl @@ -3,10 +3,10 @@ (:objects sandal.n.01_1 sandal.n.01_2 - sandal.n.01 - desk.n.01_1 - desk.n.01 + desk.n.01_1 desk.n.01_* - desk.n.01 book.n.02_1 - book.n.02 floor.n.01_1 - floor.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/tidying_living_room/problem0.bddl b/bddl/activity_definitions/tidying_living_room/problem0.bddl index 109e1aaf..cc534160 100644 --- a/bddl/activity_definitions/tidying_living_room/problem0.bddl +++ b/bddl/activity_definitions/tidying_living_room/problem0.bddl @@ -7,8 +7,8 @@ newspaper.n.03_1 - newspaper.n.03 letter.n.01_1 - letter.n.01 book.n.02_1 - book.n.02 - coffee_table.n.01_1 - coffee_table.n.01 - bookcase.n.01_1 - bookcase.n.01 + coffee_table.n.01_1 coffee_table.n.01_* - coffee_table.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl b/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl index e6782573..4106bc6c 100644 --- a/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl +++ b/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl @@ -3,7 +3,7 @@ (:objects hanger.n.02_1 hanger.n.02_2 hanger.n.02_3 - hanger.n.02 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 jersey.n.03_1 - jersey.n.03 bed.n.01_1 - bed.n.01 belt.n.02_1 - belt.n.02 diff --git a/bddl/activity_definitions/treating_clothes/problem0.bddl b/bddl/activity_definitions/treating_clothes/problem0.bddl index 2cce3217..67bb4aea 100644 --- a/bddl/activity_definitions/treating_clothes/problem0.bddl +++ b/bddl/activity_definitions/treating_clothes/problem0.bddl @@ -10,7 +10,7 @@ long_trousers.n.01_1 - long_trousers.n.01 floor.n.01_1 - floor.n.01 sink.n.01_1 - sink.n.01 - bed.n.01_1 - bed.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/turning_off_the_hot_tub/problem0.bddl b/bddl/activity_definitions/turning_off_the_hot_tub/problem0.bddl index 8524da9a..a47e76af 100644 --- a/bddl/activity_definitions/turning_off_the_hot_tub/problem0.bddl +++ b/bddl/activity_definitions/turning_off_the_hot_tub/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - hot_tub.n.02_1 - hot_tub.n.02 + hot_tub.n.02_1 hot_tub.n.02_* - hot_tub.n.02 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 diff --git a/bddl/activity_definitions/turning_on_the_hot_tub/problem0.bddl b/bddl/activity_definitions/turning_on_the_hot_tub/problem0.bddl index ad80a86e..cf61b239 100644 --- a/bddl/activity_definitions/turning_on_the_hot_tub/problem0.bddl +++ b/bddl/activity_definitions/turning_on_the_hot_tub/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - hot_tub.n.02_1 - hot_tub.n.02 + hot_tub.n.02_1 hot_tub.n.02_* - hot_tub.n.02 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/turning_out_all_lights_before_sleep/problem0.bddl b/bddl/activity_definitions/turning_out_all_lights_before_sleep/problem0.bddl index bf40efe4..c34e8c7c 100644 --- a/bddl/activity_definitions/turning_out_all_lights_before_sleep/problem0.bddl +++ b/bddl/activity_definitions/turning_out_all_lights_before_sleep/problem0.bddl @@ -3,8 +3,8 @@ (:objects switch.n.01_1 switch.n.01_2 switch.n.01_3 switch.n.01_4 switch.n.01_5 switch.n.01_6 switch.n.01_7 - switch.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/unhook_a_fish/problem0.bddl b/bddl/activity_definitions/unhook_a_fish/problem0.bddl index ce3cfa9a..01de2f41 100644 --- a/bddl/activity_definitions/unhook_a_fish/problem0.bddl +++ b/bddl/activity_definitions/unhook_a_fish/problem0.bddl @@ -5,7 +5,7 @@ trout.n.01_1 - trout.n.01 sink.n.01_1 - sink.n.01 fishing_rod.n.01_1 - fishing_rod.n.01 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unloading_groceries/problem0.bddl b/bddl/activity_definitions/unloading_groceries/problem0.bddl index 487fa265..40eb5738 100644 --- a/bddl/activity_definitions/unloading_groceries/problem0.bddl +++ b/bddl/activity_definitions/unloading_groceries/problem0.bddl @@ -7,8 +7,8 @@ box__of__corn_flakes.n.01_1 - box__of__corn_flakes.n.01 cup__of__yogurt.n.01_1 - cup__of__yogurt.n.01 egg.n.02_1 - egg.n.02 - electric_refrigerator.n.01_1 - electric_refrigerator.n.01 - cabinet.n.01_1 - cabinet.n.01 + electric_refrigerator.n.01_1 electric_refrigerator.n.01_* - electric_refrigerator.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl b/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl index e8fe3252..d874e5d9 100644 --- a/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl +++ b/bddl/activity_definitions/unloading_shopping_from_car/problem0.bddl @@ -4,9 +4,9 @@ (:objects car.n.01_1 - car.n.01 driveway.n.01_1 - driveway.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 grocery.n.02_1 grocery.n.02_2 grocery.n.02_3 - grocery.n.02 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unloading_shopping_items/problem0.bddl b/bddl/activity_definitions/unloading_shopping_items/problem0.bddl index 898467c4..13539a63 100644 --- a/bddl/activity_definitions/unloading_shopping_items/problem0.bddl +++ b/bddl/activity_definitions/unloading_shopping_items/problem0.bddl @@ -2,19 +2,19 @@ (:domain omnigibson) (:objects - 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 - 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 - plastic_art.n.01_1 - plastic_art.n.01 - lampshade.n.01_1 lampshade.n.01_2 - lampshade.n.01 - globe.n.03_1 - globe.n.03 - console_table.n.01_1 - console_table.n.01 - agent.n.01_1 - agent.n.01 + 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_* - cabinet.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 + plastic_art.n.01_1 - plastic_art.n.01 + lampshade.n.01_1 lampshade.n.01_2 - lampshade.n.01 + globe.n.03_1 - globe.n.03 + console_table.n.01_1 console_table.n.01_* - console_table.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/unpacking_car_for_trip/problem0.bddl b/bddl/activity_definitions/unpacking_car_for_trip/problem0.bddl index 904bae18..f57ae37d 100644 --- a/bddl/activity_definitions/unpacking_car_for_trip/problem0.bddl +++ b/bddl/activity_definitions/unpacking_car_for_trip/problem0.bddl @@ -8,7 +8,7 @@ bag.n.06_1 - bag.n.06 golf_club.n.02_1 - golf_club.n.02 baseball_glove.n.01_1 - baseball_glove.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unpacking_childs_bag/problem0.bddl b/bddl/activity_definitions/unpacking_childs_bag/problem0.bddl index 1f4f7a56..b0c84198 100644 --- a/bddl/activity_definitions/unpacking_childs_bag/problem0.bddl +++ b/bddl/activity_definitions/unpacking_childs_bag/problem0.bddl @@ -6,7 +6,7 @@ pen.n.01_1 - pen.n.01 pencil.n.01_1 - pencil.n.01 crayon.n.01_1 - crayon.n.01 - desk.n.01_1 - desk.n.01 + desk.n.01_1 desk.n.01_* - desk.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 bed.n.01_1 - bed.n.01 diff --git a/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl b/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl index 647493f1..9efa55e2 100644 --- a/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl +++ b/bddl/activity_definitions/unpacking_hobby_equipment/problem0.bddl @@ -10,7 +10,7 @@ videodisk.n.01_1 videodisk.n.01_2 - videodisk.n.01 battery.n.02_1 - battery.n.02 book.n.02_1 - book.n.02 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unpacking_moving_van/problem0.bddl b/bddl/activity_definitions/unpacking_moving_van/problem0.bddl index e9f8cdbb..97d646e9 100644 --- a/bddl/activity_definitions/unpacking_moving_van/problem0.bddl +++ b/bddl/activity_definitions/unpacking_moving_van/problem0.bddl @@ -6,10 +6,10 @@ pickup.n.01_1 - pickup.n.01 saucepot.n.01_1 - saucepot.n.01 carton.n.02_1 - carton.n.02 - floor.n.01_1 floor.n.01_2 - floor.n.01 + floor.n.01_1 floor.n.01_2 floor.n.01_* - floor.n.01 blanket.n.01_1 - blanket.n.01 - cabinet.n.01_1 - cabinet.n.01 - bed.n.01_1 - bed.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 + bed.n.01_1 bed.n.01_* - bed.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unpacking_recreational_vehicle_for_trip/problem0.bddl b/bddl/activity_definitions/unpacking_recreational_vehicle_for_trip/problem0.bddl index ce87b8c9..caba9fa3 100644 --- a/bddl/activity_definitions/unpacking_recreational_vehicle_for_trip/problem0.bddl +++ b/bddl/activity_definitions/unpacking_recreational_vehicle_for_trip/problem0.bddl @@ -6,7 +6,7 @@ floor.n.01_1 - floor.n.01 bicycle.n.01_1 - bicycle.n.01 bicycle_rack.n.01_1 - bicycle_rack.n.01 - bookcase.n.01_1 - bookcase.n.01 + bookcase.n.01_1 bookcase.n.01_* - bookcase.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/unpacking_suitcase/problem0.bddl b/bddl/activity_definitions/unpacking_suitcase/problem0.bddl index 7e3755c9..9f76e4cd 100644 --- a/bddl/activity_definitions/unpacking_suitcase/problem0.bddl +++ b/bddl/activity_definitions/unpacking_suitcase/problem0.bddl @@ -2,14 +2,14 @@ (:domain omnigibson) (:objects - sock.n.01_1 sock.n.01_2 - sock.n.01 - floor.n.01_1 - floor.n.01 + sock.n.01_1 sock.n.01_2 - sock.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 carton.n.02_1 - carton.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 - agent.n.01_1 - agent.n.01 + sofa.n.01_1 sofa.n.01_* - sofa.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/vacuuming_floors/problem0.bddl b/bddl/activity_definitions/vacuuming_floors/problem0.bddl index 4d283a0a..f963b3b1 100644 --- a/bddl/activity_definitions/vacuuming_floors/problem0.bddl +++ b/bddl/activity_definitions/vacuuming_floors/problem0.bddl @@ -3,10 +3,10 @@ (:objects dust.n.01_1 - dust.n.01 - floor.n.01_1 - floor.n.01 - vacuum.n.04_1 - vacuum.n.04 + floor.n.01_1 floor.n.01_* - floor.n.01 + vacuum.n.04_1 - vacuum.n.04 ashcan.n.01_1 - ashcan.n.01 - agent.n.01_1 - agent.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/vacuuming_vehicles/problem0.bddl b/bddl/activity_definitions/vacuuming_vehicles/problem0.bddl index 23292e27..282d9a8c 100644 --- a/bddl/activity_definitions/vacuuming_vehicles/problem0.bddl +++ b/bddl/activity_definitions/vacuuming_vehicles/problem0.bddl @@ -2,11 +2,11 @@ (:domain omnigibson) (:objects - car.n.01_1 - car.n.01 - floor.n.01_1 - floor.n.01 - vacuum.n.04_1 - vacuum.n.04 - dust.n.01_1 - dust.n.01 - agent.n.01_1 - agent.n.01 + car.n.01_1 - car.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + vacuum.n.04_1 - vacuum.n.04 + dust.n.01_1 - dust.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/wash_a_leotard/problem0.bddl b/bddl/activity_definitions/wash_a_leotard/problem0.bddl index e6994743..84248122 100644 --- a/bddl/activity_definitions/wash_a_leotard/problem0.bddl +++ b/bddl/activity_definitions/wash_a_leotard/problem0.bddl @@ -10,7 +10,7 @@ bed.n.01_1 - bed.n.01 detergent.n.02_1 - detergent.n.02 detergent__bottle.n.01_1 - detergent__bottle.n.01 - wardrobe.n.01_1 - wardrobe.n.01 + wardrobe.n.01_1 wardrobe.n.01_* - wardrobe.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 water.n.06_1 - water.n.06 floor.n.01_1 floor.n.01_2 - floor.n.01 diff --git a/bddl/activity_definitions/wash_baby_bottles/problem0.bddl b/bddl/activity_definitions/wash_baby_bottles/problem0.bddl index 85d76811..c07a6a8f 100644 --- a/bddl/activity_definitions/wash_baby_bottles/problem0.bddl +++ b/bddl/activity_definitions/wash_baby_bottles/problem0.bddl @@ -5,7 +5,7 @@ bottle.n.03_1 bottle.n.03_2 bottle.n.03_3 bottle.n.03_4 bottle.n.03_5 - bottle.n.03 floor.n.01_1 - floor.n.01 disinfectant.n.01_1 - disinfectant.n.01 - dishwasher.n.01_1 - dishwasher.n.01 + dishwasher.n.01_1 dishwasher.n.01_* - dishwasher.n.01 disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 sink.n.01_1 - sink.n.01 countertop.n.01_1 - countertop.n.01 diff --git a/bddl/activity_definitions/wash_duvets/problem0.bddl b/bddl/activity_definitions/wash_duvets/problem0.bddl index e5fd6d0d..4d13f89f 100644 --- a/bddl/activity_definitions/wash_duvets/problem0.bddl +++ b/bddl/activity_definitions/wash_duvets/problem0.bddl @@ -10,7 +10,7 @@ detergent__bottle.n.01_1 - detergent__bottle.n.01 tennis_ball.n.01_1 tennis_ball.n.01_2 - tennis_ball.n.01 water.n.06_1 - water.n.06 - clothes_dryer.n.01_1 - clothes_dryer.n.01 + clothes_dryer.n.01_1 clothes_dryer.n.01_* - clothes_dryer.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/washing_floor/problem0.bddl b/bddl/activity_definitions/washing_floor/problem0.bddl index cee85cdf..e4068963 100644 --- a/bddl/activity_definitions/washing_floor/problem0.bddl +++ b/bddl/activity_definitions/washing_floor/problem0.bddl @@ -4,15 +4,15 @@ (:objects stain.n.01_1 - stain.n.01 dust.n.01_1 - dust.n.01 - bucket.n.01_1 - bucket.n.01 - floor.n.01_1 - floor.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - towel.n.01_1 - towel.n.01 - shower.n.01_1 - shower.n.01 - toilet.n.02_1 - toilet.n.02 - bed.n.01_1 - bed.n.01 - sink.n.01_1 - sink.n.01 - agent.n.01_1 - agent.n.01 + bucket.n.01_1 - bucket.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + towel.n.01_1 - towel.n.01 + shower.n.01_1 - shower.n.01 + toilet.n.02_1 - toilet.n.02 + bed.n.01_1 - bed.n.01 + sink.n.01_1 - sink.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/washing_outside_walls/problem0.bddl b/bddl/activity_definitions/washing_outside_walls/problem0.bddl index 3844aa6c..6a7642c8 100644 --- a/bddl/activity_definitions/washing_outside_walls/problem0.bddl +++ b/bddl/activity_definitions/washing_outside_walls/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - wall.n.01_1 - wall.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 floor.n.01_1 - floor.n.01 stain.n.01_1 - stain.n.01 liquid_soap.n.01_1 - liquid_soap.n.01 diff --git a/bddl/activity_definitions/washing_pots_and_pans/problem0.bddl b/bddl/activity_definitions/washing_pots_and_pans/problem0.bddl index 061495b4..e39406e1 100644 --- a/bddl/activity_definitions/washing_pots_and_pans/problem0.bddl +++ b/bddl/activity_definitions/washing_pots_and_pans/problem0.bddl @@ -3,16 +3,16 @@ (:objects stain.n.01_1 - stain.n.01 - teapot.n.01_1 - teapot.n.01 + teapot.n.01_1 - teapot.n.01 kettle.n.01_1 - kettle.n.01 - pan.n.01_1 pan.n.01_2 pan.n.01_3 - pan.n.01 - countertop.n.01_1 countertop.n.01_2 - countertop.n.01 - sink.n.01_1 - sink.n.01 - scrub_brush.n.01_1 - scrub_brush.n.01 - bar_soap.n.01_1 - bar_soap.n.01 - cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 - floor.n.01_1 - floor.n.01 - agent.n.01_1 - agent.n.01 + pan.n.01_1 pan.n.01_2 pan.n.01_3 - pan.n.01 + countertop.n.01_1 countertop.n.01_2 - countertop.n.01 + sink.n.01_1 - sink.n.01 + scrub_brush.n.01_1 - scrub_brush.n.01 + bar_soap.n.01_1 - bar_soap.n.01 + cabinet.n.01_1 cabinet.n.01_2 - cabinet.n.01 + floor.n.01_1 - floor.n.01 + agent.n.01_1 - agent.n.01 ) (:init diff --git a/bddl/activity_definitions/washing_walls/problem0.bddl b/bddl/activity_definitions/washing_walls/problem0.bddl index 665c4a5f..6e3f06e7 100644 --- a/bddl/activity_definitions/washing_walls/problem0.bddl +++ b/bddl/activity_definitions/washing_walls/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - wall.n.01_1 - wall.n.01 + wall.n.01_1 wall.n.01_* - wall.n.01 floor.n.01_1 - floor.n.01 scrub_brush.n.01_1 - scrub_brush.n.01 dirt.n.02_1 - dirt.n.02 diff --git a/bddl/activity_definitions/washing_windows/problem0.bddl b/bddl/activity_definitions/washing_windows/problem0.bddl index 5ab48ef8..b42f7cd1 100644 --- a/bddl/activity_definitions/washing_windows/problem0.bddl +++ b/bddl/activity_definitions/washing_windows/problem0.bddl @@ -9,7 +9,7 @@ disinfectant.n.01_1 - disinfectant.n.01 disinfectant__bottle.n.01_1 - disinfectant__bottle.n.01 adhesive_material.n.01_1 - adhesive_material.n.01 - window.n.01_1 - window.n.01 + window.n.01_1 window.n.01_* - window.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/water_your_lawn_efficiently/problem0.bddl b/bddl/activity_definitions/water_your_lawn_efficiently/problem0.bddl index b5544eb6..6bc19721 100644 --- a/bddl/activity_definitions/water_your_lawn_efficiently/problem0.bddl +++ b/bddl/activity_definitions/water_your_lawn_efficiently/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - lawn.n.01_1 - lawn.n.01 + lawn.n.01_1 lawn.n.01_* - lawn.n.01 floor.n.01_1 - floor.n.01 watering_can.n.01_1 - watering_can.n.01 water.n.06_1 - water.n.06 diff --git a/bddl/activity_definitions/watering_outdoor_flowers/problem0.bddl b/bddl/activity_definitions/watering_outdoor_flowers/problem0.bddl index d07a7fd1..bdeeb2f8 100644 --- a/bddl/activity_definitions/watering_outdoor_flowers/problem0.bddl +++ b/bddl/activity_definitions/watering_outdoor_flowers/problem0.bddl @@ -5,7 +5,7 @@ watering_can.n.01_1 - watering_can.n.01 water.n.06_1 - water.n.06 floor.n.01_1 - floor.n.01 - flower.n.02_1 - flower.n.02 + flower.n.02_1 flower.n.02_* - flower.n.02 scrub.n.01_1 scrub.n.01_2 - scrub.n.01 agent.n.01_1 - agent.n.01 ) diff --git a/bddl/activity_definitions/waxing_floors/problem0.bddl b/bddl/activity_definitions/waxing_floors/problem0.bddl index 08009e30..7792f88f 100644 --- a/bddl/activity_definitions/waxing_floors/problem0.bddl +++ b/bddl/activity_definitions/waxing_floors/problem0.bddl @@ -3,7 +3,7 @@ (:objects dust.n.01_1 - dust.n.01 - floor.n.01_1 - floor.n.01 + floor.n.01_1 floor.n.01_* - floor.n.01 floor_wax.n.01_1 - floor_wax.n.01 rag.n.01_1 - rag.n.01 floor_wax__bottle.n.01_1 - floor_wax__bottle.n.01 diff --git a/bddl/activity_definitions/wrap_silverware/problem0.bddl b/bddl/activity_definitions/wrap_silverware/problem0.bddl index 6a2a81f7..e46d6e12 100644 --- a/bddl/activity_definitions/wrap_silverware/problem0.bddl +++ b/bddl/activity_definitions/wrap_silverware/problem0.bddl @@ -3,7 +3,7 @@ (:objects table_knife.n.01_1 table_knife.n.01_2 table_knife.n.01_3 - table_knife.n.01 - cabinet.n.01_1 - cabinet.n.01 + cabinet.n.01_1 cabinet.n.01_* - cabinet.n.01 tablespoon.n.02_1 tablespoon.n.02_2 tablespoon.n.02_3 - tablespoon.n.02 napkin.n.01_1 napkin.n.01_2 napkin.n.01_3 - napkin.n.01 floor.n.01_1 - floor.n.01