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

Melt cook mutually exclusive #260

Merged
merged 17 commits into from
Feb 23, 2024
Merged

Melt cook mutually exclusive #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e98041
cookable and meltable made mutually exclusive
sanjanasrivastava Feb 20, 2024
af3b1e6
removed newly non-cookable synsets from cookable param annot csv
sanjanasrivastava Feb 20, 2024
b8e93c1
minor
sanjanasrivastava Feb 20, 2024
38d83e1
added param annots for cookables that didnt have it before...
sanjanasrivastava Feb 20, 2024
fe7b8e4
minor
sanjanasrivastava Feb 20, 2024
cd33504
minior
sanjanasrivastava Feb 20, 2024
08bd9f7
invalid cookable derivative synsets removed
sanjanasrivastava Feb 21, 2024
f353d58
more cookable parameters removed
sanjanasrivastava Feb 21, 2024
603c8e4
cleaning up deleted synsets
sanjanasrivastava Feb 21, 2024
f8399f9
error fixes
sanjanasrivastava Feb 21, 2024
9b8139c
regenerating datafiles
sanjanasrivastava Feb 21, 2024
60bf352
edits based on property changes
sanjanasrivastava Feb 21, 2024
c2c13dd
removing accidental adding of files to get
sanjanasrivastava Feb 21, 2024
785c774
Merge remote-tracking branch 'origin/develop' into melt-cook-mutually…
sanjanasrivastava Feb 23, 2024
f18c058
editing sheets back to pre-change status
sanjanasrivastava Feb 23, 2024
4ef7f26
Merge remote-tracking branch 'origin/develop' into melt-cook-mutually…
sanjanasrivastava Feb 23, 2024
8ac4045
Merge remote-tracking branch 'origin/develop' into melt-cook-mutually…
sanjanasrivastava Feb 23, 2024
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
12 changes: 2 additions & 10 deletions bddl/activity_definitions/make_baked_pears/problem0.bddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
cooked__red_wine.n.01_1 - cooked__red_wine.n.01
granulated_sugar.n.01_1 - granulated_sugar.n.01
granulated_sugar__sack.n.01_1 - granulated_sugar__sack.n.01
cooked__granulated_sugar.n.01_1 - cooked__granulated_sugar.n.01
wooden_spoon.n.02_1 - wooden_spoon.n.02
wine_bottle.n.01_1 - wine_bottle.n.01
oven.n.01_1 - oven.n.01
Expand Down Expand Up @@ -48,7 +47,6 @@
(inroom cabinet.n.01_1 kitchen)
(inroom floor.n.01_1 kitchen)
(future cooked__red_wine.n.01_1)
(future cooked__granulated_sugar.n.01_1)
(ontop agent.n.01_1 floor.n.01_1)
)

Expand All @@ -58,18 +56,12 @@
(real ?cooked__red_wine.n.01_1)
(real ?red_wine.n.01_1)
)
(or
(real ?cooked__granulated_sugar.n.01_1)
(real ?granulated_sugar.n.01_1)
)
(real ?granulated_sugar.n.01_1)
(forall
(?pear.n.01 - pear.n.01)
(and
(cooked ?pear.n.01)
(or
(covered ?pear.n.01 ?cooked__granulated_sugar.n.01_1)
(covered ?pear.n.01 ?granulated_sugar.n.01_1)
)
(covered ?pear.n.01 ?granulated_sugar.n.01_1)
(or
(covered ?pear.n.01 ?cooked__red_wine.n.01_1)
(covered ?pear.n.01 ?red_wine.n.01_1)
Expand Down
12 changes: 2 additions & 10 deletions bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

(:objects
melted__butter.n.01_1 - melted__butter.n.01
cooked__melted__butter.n.01_1 - cooked__melted__butter.n.01
lemon-pepper_seasoning.n.01_1 - lemon-pepper_seasoning.n.01
cooked__lemon-pepper_seasoning.n.01_1 - cooked__lemon-pepper_seasoning.n.01
chicken_wing.n.01_1 chicken_wing.n.01_2 chicken_wing.n.01_3 chicken_wing.n.01_4 chicken_wing.n.01_5 chicken_wing.n.01_6 chicken_wing.n.01_7 chicken_wing.n.01_8 - chicken_wing.n.01
Expand Down Expand Up @@ -74,7 +73,6 @@
(ontop frying_pan.n.01_1 countertop.n.01_2)
(future cooked__lemon-pepper_seasoning.n.01_1)
(future cooked__olive_oil.n.01_1)
(future cooked__melted__butter.n.01_1)
(future cooked__salt.n.01_1)
(inroom floor.n.01_1 kitchen)
(inroom countertop.n.01_1 kitchen)
Expand All @@ -94,10 +92,7 @@
(real ?olive_oil.n.01_1)
(real ?cooked__olive_oil.n.01_1)
)
(or
(real ?melted__butter.n.01_1)
(real ?cooked__melted__butter.n.01_1)
)
(real ?melted__butter.n.01_1)
(or
(real ?salt.n.02_1)
(real ?cooked__salt.n.01_1)
Expand All @@ -114,10 +109,7 @@
(covered ?chicken_wing.n.01 ?olive_oil.n.01_1)
(covered ?chicken_wing.n.01 ?cooked__olive_oil.n.01_1)
)
(or
(covered ?chicken_wing.n.01 ?melted__butter.n.01_1)
(covered ?chicken_wing.n.01 ?cooked__melted__butter.n.01_1)
)
(covered ?chicken_wing.n.01 ?melted__butter.n.01_1)
(or
(covered ?chicken_wing.n.01 ?salt.n.02_1)
(covered ?chicken_wing.n.01 ?cooked__salt.n.01_1)
Expand Down
5 changes: 1 addition & 4 deletions bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@
(forpairs
(?half__feta.n.01 - half__feta.n.01)
(?bowl.n.01 - bowl.n.01)
(and
(cooked ?half__feta.n.01)
(inside ?half__feta.n.01 ?bowl.n.01)
)
(inside ?half__feta.n.01 ?bowl.n.01)
)
)
)
Expand Down
Loading