Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix scene matching except missing walls #261

Merged
merged 1 commit into from
Feb 22, 2024
Merged

fix scene matching except missing walls #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions bddl/activity_definitions/assembling_furniture/problem0.bddl
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions bddl/activity_definitions/clean_walls/problem0.bddl
View file
Open in desktop
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
Open in desktop
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
12 changes: 4 additions & 8 deletions bddl/activity_definitions/cleaning_the_pool/problem0.bddl
View file
Open in desktop
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,19 +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
(ontop ?pool.n.01_1 ?floor.n.01_1)
(not
(and
(not
(covered ?pool.n.01_1 ?stain.n.01_1)
)
(ontop ?scrub_brush.n.01_1 ?shelf.n.01_1)
)
)
)
10 changes: 4 additions & 6 deletions bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions bddl/activity_definitions/distributing_event_T_shirts/problem0.bddl
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
46 changes: 23 additions & 23 deletions bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
tablespoon.n.02_1 tablespoon.n.02_2 tablespoon.n.02_3 tablespoon.n.02_4 - tablespoon.n.02
wineglass.n.01_1 wineglass.n.01_2 wineglass.n.01_3 wineglass.n.01_4 - wineglass.n.01
water_glass.n.02_1 water_glass.n.02_2 water_glass.n.02_3 water_glass.n.02_4 - water_glass.n.02
armchair.n.01_1 armchair.n.01_2 armchair.n.01_3 armchair.n.01_4 - armchair.n.01
breakfast_table.n.01_1 breakfast_table.n.01_2 - breakfast_table.n.01
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
floor.n.01_1 - floor.n.01
agent.n.01_1 - agent.n.01
)
Expand All @@ -21,14 +21,14 @@
(ontop plate.n.04_2 plate.n.04_1)
(ontop plate.n.04_3 plate.n.04_2)
(ontop plate.n.04_4 plate.n.04_3)
(ontop wineglass.n.01_1 breakfast_table.n.01_2)
(ontop wineglass.n.01_2 breakfast_table.n.01_2)
(ontop wineglass.n.01_3 breakfast_table.n.01_2)
(ontop wineglass.n.01_4 breakfast_table.n.01_2)
(ontop water_glass.n.02_1 breakfast_table.n.01_2)
(ontop water_glass.n.02_2 breakfast_table.n.01_2)
(ontop water_glass.n.02_3 breakfast_table.n.01_2)
(ontop water_glass.n.02_4 breakfast_table.n.01_2)
(ontop wineglass.n.01_1 table.n.02_2)
(ontop wineglass.n.01_2 table.n.02_2)
(ontop wineglass.n.01_3 table.n.02_2)
(ontop wineglass.n.01_4 table.n.02_2)
(ontop water_glass.n.02_1 table.n.02_2)
(ontop water_glass.n.02_2 table.n.02_2)
(ontop water_glass.n.02_3 table.n.02_2)
(ontop water_glass.n.02_4 table.n.02_2)
(inside tablefork.n.01_1 cabinet.n.01_1)
(inside tablefork.n.01_2 cabinet.n.01_1)
(inside tablefork.n.01_3 cabinet.n.01_1)
Expand All @@ -41,35 +41,35 @@
(inside tablespoon.n.02_2 cabinet.n.01_1)
(inside tablespoon.n.02_3 cabinet.n.01_1)
(inside tablespoon.n.02_4 cabinet.n.01_1)
(ontop dinner_napkin.n.01_1 breakfast_table.n.01_2)
(ontop dinner_napkin.n.01_2 breakfast_table.n.01_2)
(ontop dinner_napkin.n.01_3 breakfast_table.n.01_2)
(ontop dinner_napkin.n.01_4 breakfast_table.n.01_2)
(inroom breakfast_table.n.01_1 dining_room)
(ontop dinner_napkin.n.01_1 table.n.02_2)
(ontop dinner_napkin.n.01_2 table.n.02_2)
(ontop dinner_napkin.n.01_3 table.n.02_2)
(ontop dinner_napkin.n.01_4 table.n.02_2)
(inroom table.n.02_1 dining_room)
(inroom cabinet.n.01_1 kitchen)
(inroom floor.n.01_1 kitchen)
(inroom armchair.n.01_1 dining_room)
(inroom armchair.n.01_2 dining_room)
(inroom armchair.n.01_3 dining_room)
(inroom armchair.n.01_4 dining_room)
(inroom breakfast_table.n.01_2 kitchen)
(inroom chair.n.01_1 dining_room)
(inroom chair.n.01_2 dining_room)
(inroom chair.n.01_3 dining_room)
(inroom chair.n.01_4 dining_room)
(inroom table.n.02_2 kitchen)
(ontop agent.n.01_1 floor.n.01_1)
)

(:goal
(and
(forall
(?plate.n.04 - plate.n.04)
(ontop ?plate.n.04 ?breakfast_table.n.01_1)
(ontop ?plate.n.04 ?table.n.02_1)
)
(forall
(?dinner_napkin.n.01 - dinner_napkin.n.01)
(folded ?dinner_napkin.n.01)
)
(forpairs
(?plate.n.04 - plate.n.04)
(?armchair.n.01 - armchair.n.01)
(nextto ?plate.n.04 ?armchair.n.01)
(?chair.n.01 - chair.n.01)
(nextto ?plate.n.04 ?chair.n.01)
)
(forpairs
(?wineglass.n.01 - wineglass.n.01)
Expand Down
4 changes: 2 additions & 2 deletions bddl/activity_definitions/make_a_bake_sale_stand_stall/problem0.bddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
(inside tupperware.n.01_2 carton.n.02_2)
(ontop carton.n.02_1 floor.n.01_1)
(ontop carton.n.02_2 floor.n.01_1)
(inroom booth.n.01_1 corridor)
(inroom floor.n.01_1 corridor)
(ontop booth.n.01_1 floor.n.01_1)
(inroom floor.n.01_1 empty_room)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand Down
Loading
Loading