Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanjanasrivastava
sanjanasrivastava committed Feb 23, 2024
2 parents 33f04c7 + 249a682 commit 939a0c1
Show file tree
Hide file tree
Showing 59 changed files with 470 additions and 3,371 deletions.
18 changes: 9 additions & 9 deletions bddl/activity_definitions/assembling_furniture/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
floor.n.01_1 - floor.n.01
agent.n.01_1 - agent.n.01
)
(:init
(not

(:init
(not
(assembled desk.n.01_1)
)
(inroom floor.n.01_1 living_room)
(inroom desk.n.01_1 living_room)
)
(inroom floor.n.01_1 living_room)
(ontop desk.n.01_1 floor.n.01_1)
(ontop agent.n.01_1 floor.n.01_1)
)
(:goal
(and

(:goal
(and
(assembled ?desk.n.01_1)
)
)
Expand Down
4 changes: 2 additions & 2 deletions bddl/activity_definitions/changing_light_bulbs/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
(attached light_bulb.n.01_2 table_lamp.n.01_2)
)
(inroom floor.n.01_1 bedroom)
(inroom floor.n.01_2 dining_room)
(inroom table_lamp.n.01_1 bedroom)
(inroom floor.n.01_2 dining_room)
(ontop table_lamp.n.01_1 breakfast_table.n.01_1)
(inroom breakfast_table.n.01_1 dining_room)
(ontop agent.n.01_1 floor.n.01_2)
)
Expand Down
4 changes: 3 additions & 1 deletion bddl/activity_definitions/clean_a_computer_monitor/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
monitor.n.04_1 - monitor.n.04
dust.n.01_1 - dust.n.01
water.n.06_1 - water.n.06
table.n.02_1 - table.n.02
floor.n.01_1 - floor.n.01
agent.n.01_1 - agent.n.01
)
Expand All @@ -16,7 +17,8 @@
(insource sink.n.01_1 water.n.06_1)
(covered monitor.n.04_1 dust.n.01_1)
(inroom sink.n.01_1 bathroom)
(inroom monitor.n.04_1 computer_lab)
(inroom table.n.02_1 computer_lab)
(ontop monitor.n.04_1 table.n.02_1)
(inroom floor.n.01_1 computer_lab)
(ontop agent.n.01_1 floor.n.01_1)
)
Expand Down
6 changes: 4 additions & 2 deletions bddl/activity_definitions/clean_a_flat_panel_monitor/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
stain.n.01_1 - stain.n.01
water.n.06_1 - water.n.06
floor.n.01_1 - floor.n.01
table.n.02_1 - table.n.02
agent.n.01_1 - agent.n.01
)

Expand All @@ -21,8 +22,9 @@
(covered monitor.n.04_1 dust.n.01_1)
(covered monitor.n.04_1 stain.n.01_1)
(insource sink.n.01_1 water.n.06_1)
(inroom sink.n.01_1 bathroom)
(inroom monitor.n.04_1 shared_office)
(inroom sink.n.01_1 bathroom)
(ontop monitor.n.04_1 table.n.02_1)
(inroom table.n.02_1 shared_office)
(inroom floor.n.01_1 shared_office)
(ontop agent.n.01_1 floor.n.01_1)
)
Expand Down
3 changes: 1 addition & 2 deletions bddl/activity_definitions/clean_cement/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
(:init
(ontop cement.n.01_1 floor.n.01_1)
(covered cement.n.01_1 dirt.n.02_1)
(ontop rail_fence.n.01_1 floor.n.01_1)
(ontop watering_can.n.01_1 floor.n.01_1)
(ontop watering_can.n.01_1 floor.n.01_1)
(ontop scrub_brush.n.01_1 floor.n.01_1)
(insource watering_can.n.01_1 water.n.06_1)
(filled detergent__bottle.n.01_1 detergent.n.02_1)
Expand Down
6 changes: 3 additions & 3 deletions bddl/activity_definitions/clean_walls/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
(covered wall.n.01_1 stain.n.01_1)
(ontop swab.n.02_1 floor.n.01_1)
(insource sink.n.01_1 water.n.06_1)
(inroom wall.n.01_1 utility_room)
(inroom sink.n.01_1 utility_room)
(inroom floor.n.01_1 utility_room)
(inroom wall.n.01_1 kitchen)
(inroom sink.n.01_1 kitchen)
(inroom floor.n.01_1 kitchen)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
11 changes: 6 additions & 5 deletions bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@
stain.n.01_1 - stain.n.01
dust.n.01_1 - dust.n.01
grill.n.02_1 - grill.n.02
floor.n.01_1 - floor.n.01
floor.n.01_1 floor.n.01_2 - floor.n.01
rag.n.01_1 - rag.n.01
bucket.n.01_1 - bucket.n.01
countertop.n.01_1 - countertop.n.01
sink.n.01_1 - sink.n.01
agent.n.01_1 - agent.n.01
)

(:init
(inroom grill.n.02_1 garden)
(:init
(inroom floor.n.01_2 garden)
(ontop grill.n.02_1 floor.n.01_2)
(covered grill.n.02_1 stain.n.01_1)
(covered grill.n.02_1 dust.n.01_1)
(ontop bucket.n.01_1 countertop.n.01_1)
(ontop rag.n.01_1 countertop.n.01_1)
(inroom floor.n.01_1 garage)
(inroom countertop.n.01_1 utility_room)
(inroom sink.n.01_1 utility_room)
(inroom countertop.n.01_1 kitchen)
(inroom sink.n.01_1 kitchen)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
3 changes: 1 addition & 2 deletions bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
(ontop lawn_chair.n.01_2 floor.n.01_1)
(ontop lawn_chair.n.01_3 floor.n.01_1)
(ontop lawn_chair.n.01_4 floor.n.01_1)
(ontop coffee_table.n.01_1 floor.n.01_1)
(ontop bucket.n.01_1 coffee_table.n.01_1)
(ontop bucket.n.01_1 coffee_table.n.01_1)
(filled bucket.n.01_1 water.n.06_1)
(filled liquid_soap__bottle.n.01_1 liquid_soap.n.01_1)
(ontop liquid_soap__bottle.n.01_1 coffee_table.n.01_1)
Expand Down
11 changes: 4 additions & 7 deletions bddl/activity_definitions/cleaning_the_pool/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
pool.n.01_1 - pool.n.01
floor.n.01_1 - floor.n.01
scrub_brush.n.01_1 - scrub_brush.n.01
shelf.n.01_1 - shelf.n.01
detergent.n.02_1 - detergent.n.02
detergent__bottle.n.01_1 - detergent__bottle.n.01
sink.n.01_1 - sink.n.01
Expand All @@ -19,18 +18,16 @@
(ontop scrub_brush.n.01_1 floor.n.01_1)
(filled detergent__bottle.n.01_1 detergent.n.02_1)
(ontop detergent__bottle.n.01_1 floor.n.01_1)
(inroom shelf.n.01_1 garage)
(inroom floor.n.01_1 garage)
(inroom sink.n.01_1 utility_room)
(inroom floor.n.01_1 garage)
(inroom sink.n.01_1 bathroom)
(ontop agent.n.01_1 floor.n.01_1)
)

(:goal
(and
(not
(and
(not
(covered ?pool.n.01_1 ?stain.n.01_1)
)
(ontop ?scrub_brush.n.01_1 ?shelf.n.01_1)
)
)
)
1 change: 0 additions & 1 deletion bddl/activity_definitions/cleaning_the_yard/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
)

(:init
(ontop rail_fence.n.01_1 floor.n.01_1)
(ontop scrub.n.01_1 lawn.n.01_1)
(ontop entire_leaf.n.01_1 lawn.n.01_1)
(ontop ashcan.n.01_1 lawn.n.01_1)
Expand Down
10 changes: 4 additions & 6 deletions bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
sign.n.02_1 - sign.n.02
floor.n.01_1 - floor.n.01
candlestick.n.01_1 - candlestick.n.01
straight_chair.n.01_1 - straight_chair.n.01
wall.n.01_1 - wall.n.01
shelf.n.01_1 - shelf.n.01
agent.n.01_1 - agent.n.01
Expand All @@ -28,11 +27,10 @@
(not
(attached wreath.n.01_1 wall.n.01_1)
)
(inroom floor.n.01_1 playroom)
(inroom straight_chair.n.01_1 playroom)
(inroom wall.n.01_1 playroom)
(inroom cabinet.n.01_1 playroom)
(inroom shelf.n.01_1 playroom)
(inroom floor.n.01_1 living_room)
(inroom wall.n.01_1 living_room)
(inroom cabinet.n.01_1 living_room)
(inroom shelf.n.01_1 living_room)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
1 change: 0 additions & 1 deletion bddl/activity_definitions/decorating_outside_for_holidays/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
(ontop wreath.n.01_1 coffee_table.n.01_1)
(ontop holly.n.03_1 coffee_table.n.01_1)
(ontop bow.n.08_1 coffee_table.n.01_1)
(ontop wall.n.01_1 floor.n.01_1)
(not
(attached wreath.n.01_1 wall.n.01_1)
)
Expand Down
4 changes: 2 additions & 2 deletions bddl/activity_definitions/distributing_event_T_shirts/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
(inside jersey.n.03_6 carton.n.02_1)
(inside jersey.n.03_7 carton.n.02_1)
(inside jersey.n.03_8 carton.n.02_1)
(inroom floor.n.01_1 corridor)
(inroom booth.n.01_1 corridor)
(inroom floor.n.01_1 empty_room)
(ontop booth.n.01_1 floor.n.01_1)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
24 changes: 12 additions & 12 deletions bddl/activity_definitions/hang_a_dartboard/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
(:domain omnigibson)

(:objects
coffee_table.n.01_1 - coffee_table.n.01
table.n.02_1 - table.n.02
dartboard.n.01_1 - dartboard.n.01
wall.n.01_1 - wall.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
agent.n.01_1 - agent.n.01
)
(:init
(ontop dartboard.n.01_1 coffee_table.n.01_1)
(ontop dart.n.01_1 dartboard.n.01_1)
(ontop dart.n.01_3 dartboard.n.01_1)
(ontop dart.n.01_2 dartboard.n.01_1)
(not

(:init
(ontop dartboard.n.01_1 table.n.02_1)
(ontop dart.n.01_1 dartboard.n.01_1)
(ontop dart.n.01_3 dartboard.n.01_1)
(ontop dart.n.01_2 dartboard.n.01_1)
(not
(attached dartboard.n.01_1 wall.n.01_1)
)
(ontop packing_box.n.02_1 coffee_table.n.01_1)
(inroom floor.n.01_1 living_room)
(inroom wall.n.01_1 living_room)
(inroom coffee_table.n.01_1 living_room)
(ontop packing_box.n.02_1 table.n.02_1)
(inroom floor.n.01_1 living_room)
(inroom wall.n.01_1 living_room)
(inroom table.n.02_1 living_room)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
2 changes: 0 additions & 2 deletions bddl/activity_definitions/hang_a_rug_on_a_wall/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
rug.n.01_1 - rug.n.01
floor.n.01_1 - floor.n.01
wall.n.01_1 - wall.n.01
coffee_table.n.01_1 - coffee_table.n.01
agent.n.01_1 - agent.n.01
)

Expand All @@ -16,7 +15,6 @@
)
(inroom wall.n.01_1 living_room)
(inroom floor.n.01_1 living_room)
(inroom coffee_table.n.01_1 living_room)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
8 changes: 4 additions & 4 deletions bddl/activity_definitions/hang_paper_lanterns/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
(:domain omnigibson)

(:objects
pedestal_table.n.01_1 - pedestal_table.n.01
table.n.02_1 - table.n.02
lantern.n.01_1 lantern.n.01_2 - lantern.n.01
floor.n.01_1 - floor.n.01
wall.n.01_1 - wall.n.01
agent.n.01_1 - agent.n.01
)

(:init
(ontop lantern.n.01_1 pedestal_table.n.01_1)
(ontop lantern.n.01_2 pedestal_table.n.01_1)
(ontop lantern.n.01_1 table.n.02_1)
(ontop lantern.n.01_2 table.n.02_1)
(not
(attached lantern.n.01_1 wall.n.01_1)
)
Expand All @@ -20,7 +20,7 @@
)
(inroom floor.n.01_1 garden)
(inroom wall.n.01_1 garden)
(inroom pedestal_table.n.01_1 garden)
(inroom table.n.02_1 garden)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
14 changes: 7 additions & 7 deletions bddl/activity_definitions/hanging_address_numbers/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

(:objects
address.n.05_1 address.n.05_2 address.n.05_3 - address.n.05
pedestal_table.n.01_1 - pedestal_table.n.01
table.n.02_1 - table.n.02
floor.n.01_1 - floor.n.01
wall.n.01_1 - wall.n.01
agent.n.01_1 - agent.n.01
)

(:init
(ontop address.n.05_1 pedestal_table.n.01_1)
(ontop address.n.05_2 pedestal_table.n.01_1)
(ontop address.n.05_3 pedestal_table.n.01_1)
(ontop address.n.05_1 table.n.02_1)
(ontop address.n.05_2 table.n.02_1)
(ontop address.n.05_3 table.n.02_1)
(not
(attached address.n.05_1 wall.n.01_1)
)
Expand All @@ -22,9 +22,9 @@
(not
(attached address.n.05_3 wall.n.01_1)
)
(inroom floor.n.01_1 entryway)
(inroom wall.n.01_1 entryway)
(inroom pedestal_table.n.01_1 entryway)
(inroom floor.n.01_1 living_room)
(inroom wall.n.01_1 garden)
(inroom table.n.02_1 living_room)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
10 changes: 5 additions & 5 deletions bddl/activity_definitions/hanging_blinds/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@

(:objects
window_blind.n.01_1 - window_blind.n.01
coffee_table.n.01_1 - coffee_table.n.01
table.n.02_1 - table.n.02
curtain_rod.n.01_1 - curtain_rod.n.01
wall.n.01_1 - wall.n.01
floor.n.01_1 - floor.n.01
agent.n.01_1 - agent.n.01
)

(:init
(ontop window_blind.n.01_1 coffee_table.n.01_1)
(ontop window_blind.n.01_1 table.n.02_1)
(attached curtain_rod.n.01_1 wall.n.01_1)
(inroom wall.n.01_1 living_room)
(inroom floor.n.01_1 living_room)
(inroom coffee_table.n.01_1 living_room)
(inroom wall.n.01_1 living_room)
(inroom floor.n.01_1 living_room)
(inroom table.n.02_1 living_room)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
6 changes: 3 additions & 3 deletions bddl/activity_definitions/installing_smoke_detectors/problem0.bddl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
(not
(attached fire_alarm.n.02_2 wall.n.01_2)
)
(inroom wall.n.01_1 bathroom)
(inroom wall.n.01_2 living_room)
(inroom floor.n.01_1 living_room)
(inroom wall.n.01_1 kitchen)
(inroom wall.n.01_2 garage)
(inroom floor.n.01_1 kitchen)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
Loading

0 comments on commit 939a0c1

Please sign in to comment.