diff --git a/bddl/activity_definitions/assembling_furniture/problem0.bddl b/bddl/activity_definitions/assembling_furniture/problem0.bddl index a4c4958a..f6e6b692 100644 --- a/bddl/activity_definitions/assembling_furniture/problem0.bddl +++ b/bddl/activity_definitions/assembling_furniture/problem0.bddl @@ -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) ) ) diff --git a/bddl/activity_definitions/changing_light_bulbs/problem0.bddl b/bddl/activity_definitions/changing_light_bulbs/problem0.bddl index 04b45eb3..257cf84a 100644 --- a/bddl/activity_definitions/changing_light_bulbs/problem0.bddl +++ b/bddl/activity_definitions/changing_light_bulbs/problem0.bddl @@ -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) ) diff --git a/bddl/activity_definitions/clean_a_computer_monitor/problem0.bddl b/bddl/activity_definitions/clean_a_computer_monitor/problem0.bddl index db3bbff8..a694c553 100644 --- a/bddl/activity_definitions/clean_a_computer_monitor/problem0.bddl +++ b/bddl/activity_definitions/clean_a_computer_monitor/problem0.bddl @@ -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 ) @@ -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) ) diff --git a/bddl/activity_definitions/clean_a_flat_panel_monitor/problem0.bddl b/bddl/activity_definitions/clean_a_flat_panel_monitor/problem0.bddl index 5c819652..936bc54d 100644 --- a/bddl/activity_definitions/clean_a_flat_panel_monitor/problem0.bddl +++ b/bddl/activity_definitions/clean_a_flat_panel_monitor/problem0.bddl @@ -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 ) @@ -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) ) diff --git a/bddl/activity_definitions/clean_cement/problem0.bddl b/bddl/activity_definitions/clean_cement/problem0.bddl index 5469fe01..b9b29e53 100644 --- a/bddl/activity_definitions/clean_cement/problem0.bddl +++ b/bddl/activity_definitions/clean_cement/problem0.bddl @@ -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) diff --git a/bddl/activity_definitions/clean_walls/problem0.bddl b/bddl/activity_definitions/clean_walls/problem0.bddl index b819cdd4..b192ce6b 100644 --- a/bddl/activity_definitions/clean_walls/problem0.bddl +++ b/bddl/activity_definitions/clean_walls/problem0.bddl @@ -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) ) diff --git a/bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl b/bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl index 2f8bb0c7..7a072631 100644 --- a/bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl +++ b/bddl/activity_definitions/cleaning_barbecue_grill/problem0.bddl @@ -5,7 +5,7 @@ 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 @@ -13,15 +13,16 @@ 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) ) diff --git a/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl b/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl index 0fa55b15..41684fca 100644 --- a/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl +++ b/bddl/activity_definitions/cleaning_patio_furniture/problem0.bddl @@ -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) diff --git a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl index 74b02e80..162d1fbb 100644 --- a/bddl/activity_definitions/cleaning_the_pool/problem0.bddl +++ b/bddl/activity_definitions/cleaning_the_pool/problem0.bddl @@ -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 @@ -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) ) ) ) diff --git a/bddl/activity_definitions/cleaning_the_yard/problem0.bddl b/bddl/activity_definitions/cleaning_the_yard/problem0.bddl index 63f7b23b..6621bd15 100644 --- a/bddl/activity_definitions/cleaning_the_yard/problem0.bddl +++ b/bddl/activity_definitions/cleaning_the_yard/problem0.bddl @@ -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) diff --git a/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl b/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl index ab6b2a72..3542818e 100644 --- a/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl +++ b/bddl/activity_definitions/decorating_for_religious_ceremony/problem0.bddl @@ -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 @@ -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) ) diff --git a/bddl/activity_definitions/decorating_outside_for_holidays/problem0.bddl b/bddl/activity_definitions/decorating_outside_for_holidays/problem0.bddl index 69810fdd..eeddae94 100644 --- a/bddl/activity_definitions/decorating_outside_for_holidays/problem0.bddl +++ b/bddl/activity_definitions/decorating_outside_for_holidays/problem0.bddl @@ -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) ) diff --git a/bddl/activity_definitions/distributing_event_T_shirts/problem0.bddl b/bddl/activity_definitions/distributing_event_T_shirts/problem0.bddl index 20e21ba8..7b1df378 100644 --- a/bddl/activity_definitions/distributing_event_T_shirts/problem0.bddl +++ b/bddl/activity_definitions/distributing_event_T_shirts/problem0.bddl @@ -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) ) diff --git a/bddl/activity_definitions/hang_a_dartboard/problem0.bddl b/bddl/activity_definitions/hang_a_dartboard/problem0.bddl index bb1d43e5..5656a4a6 100644 --- a/bddl/activity_definitions/hang_a_dartboard/problem0.bddl +++ b/bddl/activity_definitions/hang_a_dartboard/problem0.bddl @@ -2,7 +2,7 @@ (: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 @@ -10,19 +10,19 @@ 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) ) diff --git a/bddl/activity_definitions/hang_a_rug_on_a_wall/problem0.bddl b/bddl/activity_definitions/hang_a_rug_on_a_wall/problem0.bddl index 1471708e..ee8ccbe8 100644 --- a/bddl/activity_definitions/hang_a_rug_on_a_wall/problem0.bddl +++ b/bddl/activity_definitions/hang_a_rug_on_a_wall/problem0.bddl @@ -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 ) @@ -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) ) diff --git a/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl b/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl index b3838672..a5cac7f4 100644 --- a/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl +++ b/bddl/activity_definitions/hang_paper_lanterns/problem0.bddl @@ -2,7 +2,7 @@ (: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 @@ -10,8 +10,8 @@ ) (: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) ) @@ -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) ) diff --git a/bddl/activity_definitions/hanging_address_numbers/problem0.bddl b/bddl/activity_definitions/hanging_address_numbers/problem0.bddl index 785e5f84..6114a3bc 100644 --- a/bddl/activity_definitions/hanging_address_numbers/problem0.bddl +++ b/bddl/activity_definitions/hanging_address_numbers/problem0.bddl @@ -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) ) @@ -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) ) diff --git a/bddl/activity_definitions/hanging_blinds/problem0.bddl b/bddl/activity_definitions/hanging_blinds/problem0.bddl index 02ab3875..24c91cdc 100644 --- a/bddl/activity_definitions/hanging_blinds/problem0.bddl +++ b/bddl/activity_definitions/hanging_blinds/problem0.bddl @@ -3,7 +3,7 @@ (: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 @@ -11,11 +11,11 @@ ) (: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) ) diff --git a/bddl/activity_definitions/installing_smoke_detectors/problem0.bddl b/bddl/activity_definitions/installing_smoke_detectors/problem0.bddl index a7feb945..5e85b54a 100644 --- a/bddl/activity_definitions/installing_smoke_detectors/problem0.bddl +++ b/bddl/activity_definitions/installing_smoke_detectors/problem0.bddl @@ -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) ) 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 3471ba61..71c5c639 100644 --- a/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl +++ b/bddl/activity_definitions/laying_restaurant_table_for_dinner/problem0.bddl @@ -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 ) @@ -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) @@ -41,18 +41,18 @@ (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) ) @@ -60,7 +60,7 @@ (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) @@ -68,8 +68,8 @@ ) (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) diff --git a/bddl/activity_definitions/make_a_bake_sale_stand_stall/problem0.bddl b/bddl/activity_definitions/make_a_bake_sale_stand_stall/problem0.bddl index d5c7ca9e..89818f71 100644 --- a/bddl/activity_definitions/make_a_bake_sale_stand_stall/problem0.bddl +++ b/bddl/activity_definitions/make_a_bake_sale_stand_stall/problem0.bddl @@ -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) ) diff --git a/bddl/activity_definitions/make_baked_pears/problem0.bddl b/bddl/activity_definitions/make_baked_pears/problem0.bddl index 4b82afd7..3e479716 100644 --- a/bddl/activity_definitions/make_baked_pears/problem0.bddl +++ b/bddl/activity_definitions/make_baked_pears/problem0.bddl @@ -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 @@ -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) ) @@ -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) diff --git a/bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl b/bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl index 6bf5d187..3deafa78 100644 --- a/bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl +++ b/bddl/activity_definitions/make_lemon_pepper_wings/problem0.bddl @@ -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 @@ -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) @@ -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) @@ -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) diff --git a/bddl/activity_definitions/picking_up_baggage/problem0.bddl b/bddl/activity_definitions/picking_up_baggage/problem0.bddl index 97a249cd..b15deddc 100644 --- a/bddl/activity_definitions/picking_up_baggage/problem0.bddl +++ b/bddl/activity_definitions/picking_up_baggage/problem0.bddl @@ -3,7 +3,7 @@ (:objects backpack.n.01_1 - backpack.n.01 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 bag.n.06_1 - bag.n.06 car.n.01_1 - car.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 @@ -12,10 +12,10 @@ (:init (ontop car.n.01_1 floor.n.01_2) - (ontop backpack.n.01_1 desk.n.01_1) + (ontop backpack.n.01_1 table.n.02_1) (ontop bag.n.06_1 floor.n.01_1) (inroom floor.n.01_1 bedroom) - (inroom desk.n.01_1 bedroom) + (inroom table.n.02_1 bedroom) (inroom floor.n.01_2 garage) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl b/bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl index 970e5fca..45f30f29 100644 --- a/bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl +++ b/bddl/activity_definitions/prepare_make_ahead_breakfast_bowls/problem0.bddl @@ -40,8 +40,7 @@ (inside egg.n.02_2 tupperware.n.01_1) (filled olive_oil__bottle.n.01_1 olive_oil.n.01_1) (ontop olive_oil__bottle.n.01_1 countertop.n.01_1) - (inside cabinet.n.01_1 countertop.n.01_1) - (inside bowl.n.01_1 cabinet.n.01_1) + (inside bowl.n.01_1 cabinet.n.01_1) (inside bowl.n.01_2 cabinet.n.01_1) (inside frying_pan.n.01_1 cabinet.n.01_1) (inside tupperware.n.01_1 electric_refrigerator.n.01_1) @@ -110,10 +109,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) ) ) ) diff --git a/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl b/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl index 9c13d377..ac7fa175 100644 --- a/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl +++ b/bddl/activity_definitions/putting_away_purchased_clothes/problem0.bddl @@ -5,7 +5,7 @@ jean.n.01_1 jean.n.01_2 - jean.n.01 floor.n.01_1 - floor.n.01 jersey.n.03_1 jersey.n.03_2 - jersey.n.03 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 sweater.n.01_1 sweater.n.01_2 - sweater.n.01 hanger.n.02_1 hanger.n.02_2 hanger.n.02_3 hanger.n.02_4 hanger.n.02_5 hanger.n.02_6 - hanger.n.02 wardrobe.n.01_1 - wardrobe.n.01 @@ -15,10 +15,10 @@ (:init (ontop jean.n.01_1 floor.n.01_1) (ontop jean.n.01_2 floor.n.01_1) - (ontop jersey.n.03_1 desk.n.01_1) - (ontop jersey.n.03_2 desk.n.01_1) - (ontop sweater.n.01_1 desk.n.01_1) - (ontop sweater.n.01_2 desk.n.01_1) + (ontop jersey.n.03_1 table.n.02_1) + (ontop jersey.n.03_2 table.n.02_1) + (ontop sweater.n.01_1 table.n.02_1) + (ontop sweater.n.01_2 table.n.02_1) (attached hanger.n.02_1 wardrobe.n.01_1) (attached hanger.n.02_2 wardrobe.n.01_1) (attached hanger.n.02_3 wardrobe.n.01_1) @@ -26,7 +26,7 @@ (attached hanger.n.02_5 wardrobe.n.01_1) (attached hanger.n.02_6 wardrobe.n.01_1) (inroom floor.n.01_1 closet) - (inroom desk.n.01_1 bedroom) + (inroom table.n.02_1 bedroom) (inroom wardrobe.n.01_1 closet) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/putting_backpack_in_car_for_school/problem0.bddl b/bddl/activity_definitions/putting_backpack_in_car_for_school/problem0.bddl index 187476be..0cb9bd31 100644 --- a/bddl/activity_definitions/putting_backpack_in_car_for_school/problem0.bddl +++ b/bddl/activity_definitions/putting_backpack_in_car_for_school/problem0.bddl @@ -5,7 +5,7 @@ car.n.01_1 - car.n.01 floor.n.01_1 floor.n.01_2 - floor.n.01 backpack.n.01_1 - backpack.n.01 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 book.n.02_1 - book.n.02 pencil_box.n.01_1 - pencil_box.n.01 agent.n.01_1 - agent.n.01 @@ -13,11 +13,11 @@ (:init (ontop car.n.01_1 floor.n.01_1) - (ontop backpack.n.01_1 desk.n.01_1) + (ontop backpack.n.01_1 table.n.02_1) (inside book.n.02_1 backpack.n.01_1) (inside pencil_box.n.01_1 backpack.n.01_1) (inroom floor.n.01_1 garden) - (inroom desk.n.01_1 bedroom) + (inroom table.n.02_1 bedroom) (inroom floor.n.01_2 bedroom) (ontop agent.n.01_1 floor.n.01_2) ) diff --git a/bddl/activity_definitions/putting_laundry_in_drawer/problem0.bddl b/bddl/activity_definitions/putting_laundry_in_drawer/problem0.bddl index f7f7bce2..4a99af0a 100644 --- a/bddl/activity_definitions/putting_laundry_in_drawer/problem0.bddl +++ b/bddl/activity_definitions/putting_laundry_in_drawer/problem0.bddl @@ -10,7 +10,7 @@ pajama.n.02_1 - pajama.n.02 tank_top.n.01_1 tank_top.n.01_2 - tank_top.n.01 sweatshirt.n.01_1 - sweatshirt.n.01 - chest_of_drawers.n.01_1 - chest_of_drawers.n.01 + cabinet.n.01_1 - cabinet.n.01 agent.n.01_1 - agent.n.01 ) @@ -25,38 +25,38 @@ (ontop tank_top.n.01_2 desk.n.01_1) (inroom desk.n.01_1 bedroom) (inroom floor.n.01_1 bedroom) - (inroom chest_of_drawers.n.01_1 bedroom) + (inroom cabinet.n.01_1 bedroom) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and (exists - (?chest_of_drawers.n.01 - chest_of_drawers.n.01) - (inside ?short_pants.n.01_1 ?chest_of_drawers.n.01) + (?cabinet.n.01 - cabinet.n.01) + (inside ?short_pants.n.01_1 ?cabinet.n.01) ) (folded ?short_pants.n.01_1) (exists - (?chest_of_drawers.n.01 - chest_of_drawers.n.01) - (inside ?jean.n.01_1 ?chest_of_drawers.n.01) + (?cabinet.n.01 - cabinet.n.01) + (inside ?jean.n.01_1 ?cabinet.n.01) ) (folded ?jean.n.01_1) (exists - (?chest_of_drawers.n.01 - chest_of_drawers.n.01) - (inside ?pajama.n.02_1 ?chest_of_drawers.n.01) + (?cabinet.n.01 - cabinet.n.01) + (inside ?pajama.n.02_1 ?cabinet.n.01) ) (folded ?pajama.n.02_1) (exists - (?chest_of_drawers.n.01 - chest_of_drawers.n.01) - (inside ?sweatshirt.n.01_1 ?chest_of_drawers.n.01) + (?cabinet.n.01 - cabinet.n.01) + (inside ?sweatshirt.n.01_1 ?cabinet.n.01) ) (folded ?sweatshirt.n.01_1) (forall (?polo_shirt.n.01 - polo_shirt.n.01) (and (exists - (?chest_of_drawers.n.01 - chest_of_drawers.n.01) - (inside ?polo_shirt.n.01 ?chest_of_drawers.n.01) + (?cabinet.n.01 - cabinet.n.01) + (inside ?polo_shirt.n.01 ?cabinet.n.01) ) (folded ?polo_shirt.n.01) ) @@ -65,8 +65,8 @@ (?tank_top.n.01 - tank_top.n.01) (and (exists - (?chest_of_drawers.n.01 - chest_of_drawers.n.01) - (inside ?tank_top.n.01 ?chest_of_drawers.n.01) + (?cabinet.n.01 - cabinet.n.01) + (inside ?tank_top.n.01 ?cabinet.n.01) ) (folded ?tank_top.n.01) ) 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 2aabef68..f9759dd1 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 @@ -5,7 +5,7 @@ electric_refrigerator.n.01_1 - 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 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) @@ -13,10 +13,10 @@ (:init (ontop club_sandwich.n.01_1 plate.n.04_1) (ontop club_sandwich.n.01_2 plate.n.04_1) - (ontop plate.n.04_1 desk.n.01_1) + (ontop plate.n.04_1 table.n.02_1) (inroom floor.n.01_1 private_office) - (inroom desk.n.01_1 private_office) - (inroom electric_refrigerator.n.01_1 private_office) + (inroom table.n.02_1 private_office) + (inroom electric_refrigerator.n.01_1 break_room) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/recycling_newspapers/problem0.bddl b/bddl/activity_definitions/recycling_newspapers/problem0.bddl index 9c1c39d3..c4c3b281 100644 --- a/bddl/activity_definitions/recycling_newspapers/problem0.bddl +++ b/bddl/activity_definitions/recycling_newspapers/problem0.bddl @@ -5,7 +5,7 @@ recycling_bin.n.01_1 - recycling_bin.n.01 floor.n.01_1 - floor.n.01 newspaper.n.03_1 newspaper.n.03_2 newspaper.n.03_3 - newspaper.n.03 - swivel_chair.n.01_1 - swivel_chair.n.01 + chair.n.01_1 - chair.n.01 agent.n.01_1 - agent.n.01 ) @@ -13,10 +13,9 @@ (ontop recycling_bin.n.01_1 floor.n.01_1) (inside newspaper.n.03_1 recycling_bin.n.01_1) (inside newspaper.n.03_2 recycling_bin.n.01_1) - (ontop newspaper.n.03_3 swivel_chair.n.01_1) + (ontop newspaper.n.03_3 chair.n.01_1) (inroom floor.n.01_1 private_office) - (inroom recycling_bin.n.01_1 private_office) - (inroom swivel_chair.n.01_1 private_office) + (inroom chair.n.01_1 private_office) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl b/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl index 972dea95..a0fda311 100644 --- a/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl +++ b/bddl/activity_definitions/remove_a_wall_mirror/problem0.bddl @@ -2,7 +2,6 @@ (:domain omnigibson) (:objects - cabinet.n.01_1 - cabinet.n.01 mirror.n.01_1 - mirror.n.01 wall.n.01_1 - wall.n.01 floor.n.01_1 - floor.n.01 @@ -11,12 +10,9 @@ (:init (attached mirror.n.01_1 wall.n.01_1) - (inroom floor.n.01_1 bedroom) - (inroom cabinet.n.01_1 bedroom) - (inroom wall.n.01_1 bedroom) - (inroom mirror.n.01_1 bedroom) + (inroom floor.n.01_1 bathroom) + (inroom wall.n.01_1 bathroom) (ontop agent.n.01_1 floor.n.01_1) - ) (:goal diff --git a/bddl/activity_definitions/repairs_to_furniture/problem0.bddl b/bddl/activity_definitions/repairs_to_furniture/problem0.bddl index 638d84fd..95d42709 100644 --- a/bddl/activity_definitions/repairs_to_furniture/problem0.bddl +++ b/bddl/activity_definitions/repairs_to_furniture/problem0.bddl @@ -2,7 +2,7 @@ (:domain omnigibson) (:objects - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 incision.n.01_1 - incision.n.01 emery_paper.n.01_1 - emery_paper.n.01 floor.n.01_1 - floor.n.01 @@ -10,17 +10,17 @@ ) (:init - (covered desk.n.01_1 incision.n.01_1) - (ontop emery_paper.n.01_1 desk.n.01_1) + (covered table.n.02_1 incision.n.01_1) + (ontop emery_paper.n.01_1 table.n.02_1) (inroom floor.n.01_1 garage) - (inroom desk.n.01_1 garage) + (ontop table.n.02_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and (not - (covered ?desk.n.01_1 ?incision.n.01_1) + (covered ?table.n.02_1 ?incision.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/selling_products_at_flea_market/problem0.bddl b/bddl/activity_definitions/selling_products_at_flea_market/problem0.bddl index bb293fa5..a5fa238d 100644 --- a/bddl/activity_definitions/selling_products_at_flea_market/problem0.bddl +++ b/bddl/activity_definitions/selling_products_at_flea_market/problem0.bddl @@ -31,7 +31,7 @@ (inside price_tag.n.01_3 carton.n.02_2) (inside price_tag.n.01_4 carton.n.02_2) (inroom floor.n.01_1 empty_room) - (inroom booth.n.01_1 empty_room) + (ontop booth.n.01_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) 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 f9558071..f7012a51 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 @@ -7,8 +7,7 @@ computer.n.01_1 - computer.n.01 router.n.02_1 - router.n.02 carton.n.02_1 - carton.n.02 - swivel_chair.n.01_1 - swivel_chair.n.01 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 agent.n.01_1 - agent.n.01 ) @@ -17,16 +16,15 @@ (inside computer.n.01_1 carton.n.02_1) (inside router.n.02_1 carton.n.02_1) (ontop carton.n.02_1 floor.n.01_1) - (inroom floor.n.01_1 corridor) - (inroom swivel_chair.n.01_1 garage) - (inroom desk.n.01_1 garage) + (inroom floor.n.01_1 garage) + (ontop table.n.02_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and - (ontop ?table_lamp.n.01_1 ?desk.n.01_1) - (ontop ?computer.n.01_1 ?desk.n.01_1) + (ontop ?table_lamp.n.01_1 ?table.n.02_1) + (ontop ?computer.n.01_1 ?table.n.02_1) (ontop ?router.n.02_1 ?floor.n.01_1) ) ) diff --git a/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl b/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl index 48070fcf..c34ce4f1 100644 --- a/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl +++ b/bddl/activity_definitions/set_up_a_preschool_classroom/problem0.bddl @@ -14,11 +14,9 @@ packing_box.n.02_1 packing_box.n.02_2 - packing_box.n.02 mat.n.03_1 - mat.n.03 blackboard.n.01_1 - blackboard.n.01 - desk.n.01_1 desk.n.01_10 desk.n.01_2 desk.n.01_3 desk.n.01_4 desk.n.01_5 desk.n.01_6 desk.n.01_7 desk.n.01_8 desk.n.01_9 - desk.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 wall_clock.n.01_1 - wall_clock.n.01 - wall.n.01_1 - wall.n.01 - map.n.01_1 - map.n.01 - straight_chair.n.01_1 straight_chair.n.01_10 straight_chair.n.01_2 straight_chair.n.01_3 straight_chair.n.01_4 straight_chair.n.01_5 straight_chair.n.01_6 straight_chair.n.01_7 straight_chair.n.01_8 straight_chair.n.01_9 - straight_chair.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 ) @@ -48,30 +46,28 @@ (ontop backpack.n.01_4 floor.n.01_1) (ontop mat.n.03_1 floor.n.01_1) (inroom blackboard.n.01_1 classroom) - (inroom desk.n.01_1 classroom) - (inroom desk.n.01_2 classroom) - (inroom desk.n.01_3 classroom) - (inroom desk.n.01_4 classroom) - (inroom desk.n.01_5 classroom) - (inroom desk.n.01_6 classroom) - (inroom desk.n.01_7 classroom) - (inroom desk.n.01_8 classroom) - (inroom desk.n.01_9 classroom) - (inroom desk.n.01_10 classroom) + (inroom table.n.02_1 classroom) + (inroom table.n.02_2 classroom) + (inroom table.n.02_3 classroom) + (inroom table.n.02_4 classroom) + (inroom table.n.02_5 classroom) + (inroom table.n.02_6 classroom) + (inroom table.n.02_7 classroom) + (inroom table.n.02_8 classroom) + (inroom table.n.02_9 classroom) + (inroom table.n.02_10 classroom) (inroom wall_clock.n.01_1 classroom) - (inroom map.n.01_1 classroom) - (inroom straight_chair.n.01_1 classroom) - (inroom straight_chair.n.01_2 classroom) - (inroom straight_chair.n.01_3 classroom) - (inroom straight_chair.n.01_4 classroom) - (inroom straight_chair.n.01_5 classroom) - (inroom straight_chair.n.01_6 classroom) - (inroom straight_chair.n.01_7 classroom) - (inroom straight_chair.n.01_8 classroom) - (inroom straight_chair.n.01_9 classroom) - (inroom straight_chair.n.01_10 classroom) + (inroom chair.n.01_1 classroom) + (inroom chair.n.01_2 classroom) + (inroom chair.n.01_3 classroom) + (inroom chair.n.01_4 classroom) + (inroom chair.n.01_5 classroom) + (inroom chair.n.01_6 classroom) + (inroom chair.n.01_7 classroom) + (inroom chair.n.01_8 classroom) + (inroom chair.n.01_9 classroom) + (inroom chair.n.01_10 classroom) (inroom floor.n.01_1 classroom) - (inroom wall.n.01_1 classroom) (ontop agent.n.01_1 floor.n.01_1) ) @@ -79,30 +75,29 @@ (and (forpairs (?notebook.n.01 - notebook.n.01) - (?desk.n.01 - desk.n.01) - (ontop ?notebook.n.01 ?desk.n.01) + (?table.n.02 - table.n.02) + (ontop ?notebook.n.01 ?table.n.02) ) (touching ?blackboard_eraser.n.01_1 ?blackboard.n.01_1) (forpairs (?pencil.n.01 - pencil.n.01) - (?desk.n.01 - desk.n.01) - (ontop ?pencil.n.01 ?desk.n.01) + (?table.n.02 - table.n.02) + (ontop ?pencil.n.01 ?table.n.02) ) (forpairs (?pen.n.01 - pen.n.01) - (?desk.n.01 - desk.n.01) - (ontop ?pen.n.01 ?desk.n.01_4) + (?table.n.02 - table.n.02) + (ontop ?pen.n.01 ?table.n.02_4) ) (exists - (?desk.n.01 - desk.n.01) - (ontop ?globe.n.03_1 ?desk.n.01) + (?table.n.02 - table.n.02) + (ontop ?globe.n.03_1 ?table.n.02) ) (forall (?backpack.n.01 - backpack.n.01) (and (ontop ?backpack.n.01 ?floor.n.01_1) - (touching ?wall.n.01_1 ?backpack.n.01) - (or + (or (nextto ?backpack.n.01 ?backpack.n.01_1) (nextto ?backpack.n.01 ?backpack.n.01_2) (nextto ?backpack.n.01 ?backpack.n.01_3) @@ -111,8 +106,8 @@ ) ) (exists - (?desk.n.01 - desk.n.01) - (ontop ?computer.n.01_1 ?desk.n.01) + (?table.n.02 - table.n.02) + (ontop ?computer.n.01_1 ?table.n.02) ) (forall (?teddy.n.01 - teddy.n.01) diff --git a/bddl/activity_definitions/setup_a_baby_crib/problem0.bddl b/bddl/activity_definitions/setup_a_baby_crib/problem0.bddl index f38eee2d..1154abb5 100644 --- a/bddl/activity_definitions/setup_a_baby_crib/problem0.bddl +++ b/bddl/activity_definitions/setup_a_baby_crib/problem0.bddl @@ -17,7 +17,7 @@ (inside blanket.n.01_1 shelf.n.01_1) (inroom floor.n.01_1 childs_room) (inroom shelf.n.01_1 childs_room) - (inroom crib.n.01_1 childs_room) + (ontop crib.n.01_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) 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 1c014039..50d18db5 100644 --- a/bddl/activity_definitions/stash_snacks_in_your_room/problem0.bddl +++ b/bddl/activity_definitions/stash_snacks_in_your_room/problem0.bddl @@ -10,9 +10,8 @@ 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 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 cabinet.n.01_1 - cabinet.n.01 - chest_of_drawers.n.01_1 - chest_of_drawers.n.01 floor.n.01_1 - floor.n.01 agent.n.01_1 - agent.n.01 ) @@ -29,11 +28,10 @@ (ontop granola_bar.n.01_2 sack.n.01_1) (ontop chocolate_biscuit.n.01_1 sack.n.01_1) (ontop chocolate_biscuit.n.01_2 sack.n.01_1) - (ontop sack.n.01_1 desk.n.01_1) + (ontop sack.n.01_1 table.n.02_1) (inroom bed.n.01_1 bedroom) (inroom cabinet.n.01_1 bedroom) - (inroom chest_of_drawers.n.01_1 bedroom) - (inroom desk.n.01_1 bedroom) + (inroom table.n.02_1 bedroom) (inroom floor.n.01_1 bedroom) (ontop agent.n.01_1 floor.n.01_1) ) @@ -54,11 +52,11 @@ ) (forall (?chocolate_bar.n.01 - chocolate_bar.n.01) - (ontop ?chocolate_bar.n.01 ?desk.n.01_1) + (ontop ?chocolate_bar.n.01 ?table.n.02_1) ) (forall (?granola_bar.n.01 - granola_bar.n.01) - (ontop ?granola_bar.n.01 ?chest_of_drawers.n.01_1) + (ontop ?granola_bar.n.01 ?cabinet.n.01_1) ) (forall (?chocolate_biscuit.n.01 - chocolate_biscuit.n.01) diff --git a/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl b/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl index 5da5b200..c6f15a03 100644 --- a/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl +++ b/bddl/activity_definitions/stock_a_bar_cart/problem0.bddl @@ -33,7 +33,6 @@ (ontop serving_cart.n.01_1 floor.n.01_1) (inroom shelf.n.01_1 kitchen) (inroom cabinet.n.01_1 kitchen) - (inroom serving_cart.n.01_1 kitchen) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/stripping_furniture/problem0.bddl b/bddl/activity_definitions/stripping_furniture/problem0.bddl index bbd6209c..a1b912c0 100644 --- a/bddl/activity_definitions/stripping_furniture/problem0.bddl +++ b/bddl/activity_definitions/stripping_furniture/problem0.bddl @@ -5,7 +5,7 @@ newspaper.n.03_1 - newspaper.n.03 floor.n.01_1 - floor.n.01 house_paint.n.01_1 - house_paint.n.01 - desk.n.01_1 - desk.n.01 + table.n.02_1 - table.n.02 solvent.n.01_1 - solvent.n.01 solvent__bottle.n.01_1 - solvent__bottle.n.01 scraper.n.01_1 - scraper.n.01 @@ -16,21 +16,21 @@ (:init (ontop newspaper.n.03_1 floor.n.01_1) - (covered desk.n.01_1 house_paint.n.01_1) + (covered table.n.02_1 house_paint.n.01_1) (filled solvent__bottle.n.01_1 solvent.n.01_1) - (ontop solvent__bottle.n.01_1 desk.n.01_1) - (ontop scraper.n.01_1 desk.n.01_1) - (ontop scrub_brush.n.01_1 desk.n.01_1) + (ontop solvent__bottle.n.01_1 table.n.02_1) + (ontop scraper.n.01_1 table.n.02_1) + (ontop scrub_brush.n.01_1 table.n.02_1) (ontop bucket.n.01_1 floor.n.01_1) (inroom floor.n.01_1 garage) - (inroom desk.n.01_1 garage) + (ontop table.n.02_1 floor.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) (:goal (and (not - (covered ?desk.n.01_1 ?house_paint.n.01_1) + (covered ?table.n.02_1 ?house_paint.n.01_1) ) ) ) diff --git a/bddl/activity_definitions/tidy_your_garden/problem0.bddl b/bddl/activity_definitions/tidy_your_garden/problem0.bddl index d2daebc6..c7b828bd 100644 --- a/bddl/activity_definitions/tidy_your_garden/problem0.bddl +++ b/bddl/activity_definitions/tidy_your_garden/problem0.bddl @@ -27,7 +27,7 @@ (inroom lawn.n.01_1 garden) (inroom floor.n.01_1 garden) (inroom rail_fence.n.01_1 garden) - (inroom bench.n.01_1 garden) + (ontop bench.n.01_1 lawn.n.01_1) (ontop agent.n.01_1 floor.n.01_1) ) diff --git a/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl b/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl index f6f64b8b..98f426c2 100644 --- a/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl +++ b/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl @@ -22,7 +22,7 @@ (inside belt.n.02_1 wicker_basket.n.01_1) (inside underwear.n.01_1 wicker_basket.n.01_1) (inside scarf.n.01_1 wicker_basket.n.01_1) - (inroom wicker_basket.n.01_1 closet) + (ontop wicker_basket.n.01_1 floor.n.01_1) (inroom wardrobe.n.01_1 closet) (inroom floor.n.01_1 closet) (ontop agent.n.01_1 floor.n.01_1) diff --git a/bddl/bddl_verification.py b/bddl/bddl_verification.py index 876af3fc..52c7470c 100644 --- a/bddl/bddl_verification.py +++ b/bddl/bddl_verification.py @@ -113,7 +113,8 @@ "staircase", "spa", "television_room", - "lobby" + "lobby", + "break_room", ]) PLACEMENTS = set([ "ontop", @@ -328,7 +329,8 @@ def check_synset_predicate_alignment(atom, syns_to_props): assert ("drapeable" in syns_to_props[objects[0]]) and ("rigidBody" in syns_to_props[objects[1]]), f"Inapplicable overlaid: {atom}" if pred == "insource": assert (("particleSource" in syns_to_props[objects[0]]) or ("particleApplier" in syns_to_props[objects[0]])) and ("substance" in syns_to_props[objects[1]]), f"Inapplicable insource: {atom}" - + if pred == "inroom": + assert "sceneObject" in syns_to_props[objects[0]], f"Inapplicable inroom: {atom}" def check_clashing_transition_rules(): # Check within each submap @@ -482,6 +484,7 @@ def all_objects_placed(init): in_room_check = True last_placed = None + in_room_placed = set() while True: newly_placed = set() for literal in init: @@ -498,10 +501,12 @@ def all_objects_placed(init): # For the first round, check for inroom if (formula[0] == "inroom") and (formula[2] in ROOMS): inst = formula[1] + in_room_placed.add(inst) else: # For the following rounds, check for placements w.r.t last placed objects if (formula[0] in PLACEMENTS) and (formula[2] in last_placed): inst = formula[1] + assert inst not in in_room_placed, f"Object {inst} is placed twice" # Or substasnce placements w.r.t last placed objects elif (formula[0] in SUBSTANCE_PLACEMENTS) and (formula[1] in last_placed): inst = formula[2] diff --git a/bddl/generated_data/output_hierarchy.json b/bddl/generated_data/output_hierarchy.json index 11836013..d6d0244d 100644 --- a/bddl/generated_data/output_hierarchy.json +++ b/bddl/generated_data/output_hierarchy.json @@ -18150,6 +18150,13 @@ "iced_cappuccino" ] }, + { + "name": "cooked__iced_chocolate.n.01", + "hasModel": true, + "substances": [ + "cooked__iced_chocolate" + ] + }, { "name": "iced_chocolate.n.01", "hasModel": true, @@ -18255,13 +18262,6 @@ "cooked__cocoa" ] }, - { - "name": "cooked__iced_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__iced_chocolate" - ] - }, { "name": "cooked__iced_cappuccino.n.01", "hasModel": true, @@ -18795,20 +18795,17 @@ ] }, { - "name": "nut_butter.n.01", + "name": "cooked__nut_butter.n.01", "hasModel": true, "substances": [ - "nut_butter" + "cooked__nut_butter" ] }, { - "name": "peanut_butter.n.01", + "name": "nut_butter.n.01", "hasModel": true, - "categories": [ - "peanut_butter" - ], "substances": [ - "peanut_butter" + "nut_butter" ] }, { @@ -18818,6 +18815,16 @@ "cooked__peanut_butter" ] }, + { + "name": "peanut_butter.n.01", + "hasModel": true, + "categories": [ + "peanut_butter" + ], + "substances": [ + "peanut_butter" + ] + }, { "name": "cooked__miso.n.01", "hasModel": true, @@ -18838,13 +18845,6 @@ "substances": [ "cooked__margarine" ] - }, - { - "name": "cooked__nut_butter.n.01", - "hasModel": true, - "substances": [ - "cooked__nut_butter" - ] } ] }, @@ -19377,16 +19377,6 @@ "cinnamon_sugar" ] }, - { - "name": "cooked__granulated_sugar.n.01", - "hasModel": true, - "categories": [ - "cooked__granulated_sugar" - ], - "substances": [ - "cooked__granulated_sugar" - ] - }, { "name": "granulated_sugar.n.01", "hasModel": true, @@ -19404,13 +19394,6 @@ "sugar_cube" ] }, - { - "name": "cooked__cane_sugar.n.01", - "hasModel": true, - "substances": [ - "cooked__cane_sugar" - ] - }, { "name": "cooked__brown_sugar.n.01", "hasModel": true, @@ -19432,26 +19415,12 @@ "melted__cane_sugar" ] }, - { - "name": "cooked__melted__cane_sugar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__cane_sugar" - ] - }, { "name": "melted__granulated_sugar.n.01", "hasModel": true, "substances": [ "melted__granulated_sugar" ] - }, - { - "name": "cooked__melted__granulated_sugar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__granulated_sugar" - ] } ] }, @@ -21686,55 +21655,6 @@ "diced__mozzarella" ] }, - { - "name": "cooked__diced__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__feta" - ] - }, - { - "name": "cooked__diced__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__mozzarella" - ] - }, - { - "name": "cooked__diced__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__bleu" - ] - }, - { - "name": "cooked__diced__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__swiss_cheese" - ] - }, - { - "name": "cooked__diced__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__cheddar" - ] - }, - { - "name": "cooked__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__grated_cheese" - ] - }, - { - "name": "cooked__melted__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__grated_cheese" - ] - }, { "name": "cooked__ricotta.n.01", "hasModel": true, @@ -21749,27 +21669,6 @@ "cooked__cream_cheese" ] }, - { - "name": "cooked__melted__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__cheddar" - ] - }, - { - "name": "cooked__melted__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__parmesan" - ] - }, - { - "name": "cooked__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__parmesan" - ] - }, { "name": "cooked__cottage_cheese.n.01", "hasModel": true, @@ -21784,13 +21683,6 @@ "melted__feta" ] }, - { - "name": "cooked__melted__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__feta" - ] - }, { "name": "melted__mozzarella.n.01", "hasModel": true, @@ -21798,13 +21690,6 @@ "melted__mozzarella" ] }, - { - "name": "cooked__melted__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__mozzarella" - ] - }, { "name": "melted__swiss_cheese.n.01", "hasModel": true, @@ -21812,26 +21697,12 @@ "melted__swiss_cheese" ] }, - { - "name": "cooked__melted__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__swiss_cheese" - ] - }, { "name": "melted__bleu.n.01", "hasModel": true, "substances": [ "melted__bleu" ] - }, - { - "name": "cooked__melted__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__bleu" - ] } ] }, @@ -21892,16 +21763,6 @@ } ] }, - { - "name": "cooked__melted__butter.n.01", - "hasModel": true, - "categories": [ - "cooked__melted__butter" - ], - "substances": [ - "cooked__melted__butter" - ] - }, { "name": "cream.n.02", "hasModel": true, @@ -21973,13 +21834,6 @@ "diced__butter" ] }, - { - "name": "cooked__diced__butter.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__butter" - ] - }, { "name": "cooked__yogurt.n.01", "hasModel": true, @@ -23255,13 +23109,6 @@ "substances": [ "chocolate_kiss" ] - }, - { - "name": "cooked__chocolate_kiss.n.01", - "hasModel": true, - "substances": [ - "cooked__chocolate_kiss" - ] } ] }, @@ -24033,6 +23880,13 @@ "iced_cappuccino" ] }, + { + "name": "cooked__iced_chocolate.n.01", + "hasModel": true, + "substances": [ + "cooked__iced_chocolate" + ] + }, { "name": "iced_chocolate.n.01", "hasModel": true, @@ -24138,13 +23992,6 @@ "cooked__cocoa" ] }, - { - "name": "cooked__iced_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__iced_chocolate" - ] - }, { "name": "cooked__iced_cappuccino.n.01", "hasModel": true, @@ -29687,55 +29534,6 @@ "diced__mozzarella" ] }, - { - "name": "cooked__diced__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__feta" - ] - }, - { - "name": "cooked__diced__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__mozzarella" - ] - }, - { - "name": "cooked__diced__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__bleu" - ] - }, - { - "name": "cooked__diced__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__swiss_cheese" - ] - }, - { - "name": "cooked__diced__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__cheddar" - ] - }, - { - "name": "cooked__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__grated_cheese" - ] - }, - { - "name": "cooked__melted__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__grated_cheese" - ] - }, { "name": "cooked__ricotta.n.01", "hasModel": true, @@ -29750,27 +29548,6 @@ "cooked__cream_cheese" ] }, - { - "name": "cooked__melted__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__cheddar" - ] - }, - { - "name": "cooked__melted__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__parmesan" - ] - }, - { - "name": "cooked__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__parmesan" - ] - }, { "name": "cooked__cottage_cheese.n.01", "hasModel": true, @@ -29785,13 +29562,6 @@ "melted__feta" ] }, - { - "name": "cooked__melted__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__feta" - ] - }, { "name": "melted__mozzarella.n.01", "hasModel": true, @@ -29799,13 +29569,6 @@ "melted__mozzarella" ] }, - { - "name": "cooked__melted__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__mozzarella" - ] - }, { "name": "melted__swiss_cheese.n.01", "hasModel": true, @@ -29813,26 +29576,12 @@ "melted__swiss_cheese" ] }, - { - "name": "cooked__melted__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__swiss_cheese" - ] - }, { "name": "melted__bleu.n.01", "hasModel": true, "substances": [ "melted__bleu" ] - }, - { - "name": "cooked__melted__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__bleu" - ] } ] }, @@ -29907,13 +29656,6 @@ "jimmies" ] }, - { - "name": "cooked__chocolate_kiss.n.01", - "hasModel": true, - "substances": [ - "cooked__chocolate_kiss" - ] - }, { "name": "cooked__jimmies.n.01", "hasModel": true, @@ -29927,13 +29669,6 @@ "substances": [ "melted__chocolate" ] - }, - { - "name": "cooked__melted__chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__chocolate" - ] } ] }, @@ -29970,13 +29705,6 @@ "substances": [ "cooked__cocoa_powder" ] - }, - { - "name": "cooked__melted__white_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__white_chocolate" - ] } ] }, @@ -30596,13 +30324,6 @@ "diced__butter" ] }, - { - "name": "cooked__diced__butter.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__butter" - ] - }, { "name": "cooked__yogurt.n.01", "hasModel": true, @@ -33926,6 +33647,13 @@ "iced_cappuccino" ] }, + { + "name": "cooked__iced_chocolate.n.01", + "hasModel": true, + "substances": [ + "cooked__iced_chocolate" + ] + }, { "name": "iced_chocolate.n.01", "hasModel": true, @@ -34031,13 +33759,6 @@ "cooked__cocoa" ] }, - { - "name": "cooked__iced_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__iced_chocolate" - ] - }, { "name": "cooked__iced_cappuccino.n.01", "hasModel": true, diff --git a/bddl/generated_data/output_hierarchy_properties.json b/bddl/generated_data/output_hierarchy_properties.json index e22b322b..4f50f7e4 100644 --- a/bddl/generated_data/output_hierarchy_properties.json +++ b/bddl/generated_data/output_hierarchy_properties.json @@ -2883,6 +2883,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -19664,6 +19665,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -28670,6 +28672,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -28696,6 +28699,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -28797,6 +28801,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -38531,6 +38536,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -112788,6 +112794,7 @@ "openable": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -156857,6 +156864,21 @@ "substance": {} } }, + { + "name": "cooked__iced_chocolate.n.01", + "hasModel": true, + "substances": [ + "cooked__iced_chocolate" + ], + "abilities": { + "boilable": {}, + "breakable": {}, + "freezable": {}, + "liquid": {}, + "physicalSubstance": {}, + "substance": {} + } + }, { "name": "iced_chocolate.n.01", "hasModel": true, @@ -157070,21 +157092,6 @@ "substance": {} } }, - { - "name": "cooked__iced_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__iced_chocolate" - ], - "abilities": { - "boilable": {}, - "breakable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__iced_cappuccino.n.01", "hasModel": true, @@ -158173,17 +158180,13 @@ } }, { - "name": "nut_butter.n.01", + "name": "cooked__nut_butter.n.01", "hasModel": true, "substances": [ - "nut_butter" + "cooked__nut_butter" ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 72.0, - "substance_cooking_derivative_synset": "cooked__nut_butter.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -158191,19 +158194,16 @@ } }, { - "name": "peanut_butter.n.01", + "name": "nut_butter.n.01", "hasModel": true, - "categories": [ - "peanut_butter" - ], "substances": [ - "peanut_butter" + "nut_butter" ], "abilities": { "boilable": {}, "cookable": { "cook_temperature": 72.0, - "substance_cooking_derivative_synset": "cooked__peanut_butter.n.01" + "substance_cooking_derivative_synset": "cooked__nut_butter.n.01" }, "freezable": {}, "liquid": {}, @@ -158226,13 +158226,20 @@ } }, { - "name": "cooked__miso.n.01", + "name": "peanut_butter.n.01", "hasModel": true, + "categories": [ + "peanut_butter" + ], "substances": [ - "cooked__miso" + "peanut_butter" ], "abilities": { "boilable": {}, + "cookable": { + "cook_temperature": 72.0, + "substance_cooking_derivative_synset": "cooked__peanut_butter.n.01" + }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -158240,10 +158247,10 @@ } }, { - "name": "cooked__hummus.n.01", + "name": "cooked__miso.n.01", "hasModel": true, "substances": [ - "cooked__hummus" + "cooked__miso" ], "abilities": { "boilable": {}, @@ -158254,10 +158261,10 @@ } }, { - "name": "cooked__margarine.n.01", + "name": "cooked__hummus.n.01", "hasModel": true, "substances": [ - "cooked__margarine" + "cooked__hummus" ], "abilities": { "boilable": {}, @@ -158268,10 +158275,10 @@ } }, { - "name": "cooked__nut_butter.n.01", + "name": "cooked__margarine.n.01", "hasModel": true, "substances": [ - "cooked__nut_butter" + "cooked__margarine" ], "abilities": { "boilable": {}, @@ -160090,10 +160097,6 @@ "cane_sugar" ], "abilities": { - "cookable": { - "cook_temperature": 130.0, - "substance_cooking_derivative_synset": "cooked__cane_sugar.n.01" - }, "freezable": {}, "meltable": { "meltable_derivative_synset": "melted__cane_sugar.n.01" @@ -160129,28 +160132,6 @@ "substance": {} } }, - { - "name": "cooked__granulated_sugar.n.01", - "hasModel": true, - "categories": [ - "cooked__granulated_sugar" - ], - "substances": [ - "cooked__granulated_sugar" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "granulated_sugar.n.01", "hasModel": true, @@ -160161,10 +160142,6 @@ "granulated_sugar" ], "abilities": { - "cookable": { - "cook_temperature": 180.0, - "substance_cooking_derivative_synset": "cooked__granulated_sugar.n.01" - }, "freezable": {}, "meltable": { "meltable_derivative_synset": "melted__granulated_sugar.n.01" @@ -160181,9 +160158,6 @@ "sugar_cube" ], "abilities": { - "cookable": { - "cook_temperature": 180.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -160206,22 +160180,6 @@ "wrinkleable": {} } }, - { - "name": "cooked__cane_sugar.n.01", - "hasModel": true, - "substances": [ - "cooked__cane_sugar" - ], - "abilities": { - "freezable": {}, - "meltable": { - "meltable_derivative_synset": "melted__cane_sugar.n.01" - }, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__brown_sugar.n.01", "hasModel": true, @@ -160260,24 +160218,6 @@ "substances": [ "melted__cane_sugar" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 130.0, - "substance_cooking_derivative_synset": "cooked__melted__cane_sugar.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__cane_sugar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__cane_sugar" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -160292,24 +160232,6 @@ "substances": [ "melted__granulated_sugar" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 130.0, - "substance_cooking_derivative_synset": "cooked__melted__granulated_sugar.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__granulated_sugar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__granulated_sugar" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -166332,9 +166254,6 @@ "bleu" ], "abilities": { - "cookable": { - "cook_temperature": 82.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -166368,9 +166287,6 @@ "cheddar" ], "abilities": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -166451,10 +166367,6 @@ "diced__cheddar" ], "abilities": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__diced__cheddar.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -166480,10 +166392,6 @@ "diced__feta" ], "abilities": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__diced__feta.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -166541,10 +166449,6 @@ "grated_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__grated_cheese.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -166567,13 +166471,9 @@ "half_feta" ], "abilities": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__feta.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__feta.n.01" + "uncooked_diceable_derivative_synset": "diced__feta.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -166605,10 +166505,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__cheddar.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -166626,10 +166522,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__grated_cheese.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -166644,10 +166536,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__parmesan.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -166661,9 +166549,6 @@ "mozzarella" ], "abilities": { - "cookable": { - "cook_temperature": 71.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -166700,11 +166585,10 @@ "parmesan" ], "abilities": { - "cookable": { - "cook_temperature": 71.0, - "substance_cooking_derivative_synset": "cooked__parmesan.n.01" - }, "freezable": {}, + "meltable": { + "meltable_derivative_synset": "melted__parmesan.n.01" + }, "microPhysicalSubstance": {}, "physicalSubstance": {}, "substance": {} @@ -166734,9 +166618,6 @@ "swiss_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 176.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -166769,13 +166650,9 @@ "half_cheddar" ], "abilities": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__cheddar.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__cheddar.n.01" + "uncooked_diceable_derivative_synset": "diced__cheddar.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -166812,12 +166689,8 @@ "half_swiss_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 176.0 - }, "diceable": { - "uncooked_diceable_derivative_synset": "diced__swiss_cheese.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__swiss_cheese.n.01" + "uncooked_diceable_derivative_synset": "diced__swiss_cheese.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -166848,13 +166721,9 @@ "half_bleu" ], "abilities": { - "cookable": { - "cook_temperature": 82.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__bleu.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__bleu.n.01" + "uncooked_diceable_derivative_synset": "diced__bleu.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -166885,13 +166754,9 @@ "half_mozzarella" ], "abilities": { - "cookable": { - "cook_temperature": 71.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__mozzarella.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__mozzarella.n.01" + "uncooked_diceable_derivative_synset": "diced__mozzarella.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -166922,10 +166787,6 @@ "diced__swiss_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 176.0, - "substance_cooking_derivative_synset": "cooked__diced__swiss_cheese.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -166942,10 +166803,6 @@ "diced__bleu" ], "abilities": { - "cookable": { - "cook_temperature": 82.0, - "substance_cooking_derivative_synset": "cooked__diced__bleu.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -166962,10 +166819,6 @@ "diced__mozzarella" ], "abilities": { - "cookable": { - "cook_temperature": 71.0, - "substance_cooking_derivative_synset": "cooked__diced__mozzarella.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -166975,134 +166828,6 @@ "substance": {} } }, - { - "name": "cooked__diced__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__feta" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__feta.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__mozzarella" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__mozzarella.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__bleu" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__bleu.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__swiss_cheese" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__swiss_cheese.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__cheddar" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__cheddar.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__grated_cheese" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "cooked__melted__grated_cheese.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__grated_cheese" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__ricotta.n.01", "hasModel": true, @@ -167130,47 +166855,6 @@ "substance": {} } }, - { - "name": "cooked__melted__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__cheddar" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__parmesan" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__parmesan" - ], - "abilities": { - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__cottage_cheese.n.01", "hasModel": true, @@ -167190,24 +166874,6 @@ "substances": [ "melted__feta" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__feta.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__feta" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -167222,24 +166888,6 @@ "substances": [ "melted__mozzarella" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__mozzarella.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__mozzarella" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -167254,24 +166902,6 @@ "substances": [ "melted__swiss_cheese" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__swiss_cheese.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__swiss_cheese" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -167286,24 +166916,6 @@ "substances": [ "melted__bleu" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__bleu.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__bleu" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -167324,9 +166936,6 @@ "butter" ], "abilities": { - "cookable": { - "cook_temperature": 38.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -167448,23 +167057,6 @@ "substance": {} } }, - { - "name": "cooked__melted__butter.n.01", - "hasModel": true, - "categories": [ - "cooked__melted__butter" - ], - "substances": [ - "cooked__melted__butter" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cream.n.02", "hasModel": true, @@ -167556,10 +167148,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 170.0, - "substance_cooking_derivative_synset": "cooked__melted__butter.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -167594,12 +167182,8 @@ "half_butter" ], "abilities": { - "cookable": { - "cook_temperature": 38.0 - }, "diceable": { - "uncooked_diceable_derivative_synset": "diced__butter.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__butter.n.01" + "uncooked_diceable_derivative_synset": "diced__butter.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -167630,10 +167214,6 @@ "diced__butter" ], "abilities": { - "cookable": { - "cook_temperature": 38.0, - "substance_cooking_derivative_synset": "cooked__diced__butter.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -167643,22 +167223,6 @@ "substance": {} } }, - { - "name": "cooked__diced__butter.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__butter" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "cooked__melted__butter.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__yogurt.n.01", "hasModel": true, @@ -171373,26 +170937,6 @@ "substances": [ "chocolate_kiss" ], - "abilities": { - "cookable": { - "cook_temperature": 46.0, - "substance_cooking_derivative_synset": "cooked__chocolate_kiss.n.01" - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__chocolate.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__chocolate_kiss.n.01", - "hasModel": true, - "substances": [ - "cooked__chocolate_kiss" - ], "abilities": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -173165,6 +172709,21 @@ "substance": {} } }, + { + "name": "cooked__iced_chocolate.n.01", + "hasModel": true, + "substances": [ + "cooked__iced_chocolate" + ], + "abilities": { + "boilable": {}, + "breakable": {}, + "freezable": {}, + "liquid": {}, + "physicalSubstance": {}, + "substance": {} + } + }, { "name": "iced_chocolate.n.01", "hasModel": true, @@ -173378,21 +172937,6 @@ "substance": {} } }, - { - "name": "cooked__iced_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__iced_chocolate" - ], - "abilities": { - "boilable": {}, - "breakable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__iced_cappuccino.n.01", "hasModel": true, @@ -177846,9 +177390,6 @@ "half_butter_cookie" ], "abilities": { - "cookable": { - "cook_temperature": 180.0 - }, "diceable": { "uncooked_diceable_derivative_synset": "diced__butter_cookie.n.01", "cooked_diceable_derivative_synset": "cooked__diced__butter_cookie.n.01" @@ -178497,9 +178038,7 @@ "half_buttermilk_pancake" ], "abilities": { - "cookable": { - "cook_temperature": 180.0 - }, + "cookable": {}, "diceable": { "uncooked_diceable_derivative_synset": "diced__buttermilk_pancake.n.01", "cooked_diceable_derivative_synset": "cooked__diced__buttermilk_pancake.n.01" @@ -190386,9 +189925,6 @@ "bleu" ], "abilities": { - "cookable": { - "cook_temperature": 82.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -190422,9 +189958,6 @@ "cheddar" ], "abilities": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -190505,10 +190038,6 @@ "diced__cheddar" ], "abilities": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__diced__cheddar.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -190534,10 +190063,6 @@ "diced__feta" ], "abilities": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__diced__feta.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -190595,10 +190120,6 @@ "grated_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__grated_cheese.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -190621,13 +190142,9 @@ "half_feta" ], "abilities": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__feta.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__feta.n.01" + "uncooked_diceable_derivative_synset": "diced__feta.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -190659,10 +190176,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__cheddar.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -190680,10 +190193,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__grated_cheese.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -190698,10 +190207,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__parmesan.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -190715,9 +190220,6 @@ "mozzarella" ], "abilities": { - "cookable": { - "cook_temperature": 71.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -190754,11 +190256,10 @@ "parmesan" ], "abilities": { - "cookable": { - "cook_temperature": 71.0, - "substance_cooking_derivative_synset": "cooked__parmesan.n.01" - }, "freezable": {}, + "meltable": { + "meltable_derivative_synset": "melted__parmesan.n.01" + }, "microPhysicalSubstance": {}, "physicalSubstance": {}, "substance": {} @@ -190788,9 +190289,6 @@ "swiss_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 176.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -190823,13 +190321,9 @@ "half_cheddar" ], "abilities": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__cheddar.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__cheddar.n.01" + "uncooked_diceable_derivative_synset": "diced__cheddar.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -190866,12 +190360,8 @@ "half_swiss_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 176.0 - }, "diceable": { - "uncooked_diceable_derivative_synset": "diced__swiss_cheese.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__swiss_cheese.n.01" + "uncooked_diceable_derivative_synset": "diced__swiss_cheese.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -190902,13 +190392,9 @@ "half_bleu" ], "abilities": { - "cookable": { - "cook_temperature": 82.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__bleu.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__bleu.n.01" + "uncooked_diceable_derivative_synset": "diced__bleu.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -190939,13 +190425,9 @@ "half_mozzarella" ], "abilities": { - "cookable": { - "cook_temperature": 71.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__mozzarella.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__mozzarella.n.01" + "uncooked_diceable_derivative_synset": "diced__mozzarella.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -190976,10 +190458,6 @@ "diced__swiss_cheese" ], "abilities": { - "cookable": { - "cook_temperature": 176.0, - "substance_cooking_derivative_synset": "cooked__diced__swiss_cheese.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -190996,10 +190474,6 @@ "diced__bleu" ], "abilities": { - "cookable": { - "cook_temperature": 82.0, - "substance_cooking_derivative_synset": "cooked__diced__bleu.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -191016,10 +190490,6 @@ "diced__mozzarella" ], "abilities": { - "cookable": { - "cook_temperature": 71.0, - "substance_cooking_derivative_synset": "cooked__diced__mozzarella.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -191029,134 +190499,6 @@ "substance": {} } }, - { - "name": "cooked__diced__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__feta" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__feta.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__mozzarella" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__mozzarella.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__bleu" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__bleu.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__swiss_cheese" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__swiss_cheese.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__diced__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__cheddar" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__cheddar.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__grated_cheese" - ], - "abilities": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "cooked__melted__grated_cheese.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__grated_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__grated_cheese" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__ricotta.n.01", "hasModel": true, @@ -191184,47 +190526,6 @@ "substance": {} } }, - { - "name": "cooked__melted__cheddar.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__cheddar" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__parmesan" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__parmesan.n.01", - "hasModel": true, - "substances": [ - "cooked__parmesan" - ], - "abilities": { - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__cottage_cheese.n.01", "hasModel": true, @@ -191244,24 +190545,6 @@ "substances": [ "melted__feta" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__feta.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__feta.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__feta" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -191276,24 +190559,6 @@ "substances": [ "melted__mozzarella" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__mozzarella.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__mozzarella.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__mozzarella" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -191308,24 +190573,6 @@ "substances": [ "melted__swiss_cheese" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__swiss_cheese.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__swiss_cheese.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__swiss_cheese" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -191340,24 +190587,6 @@ "substances": [ "melted__bleu" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__bleu.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__bleu.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__bleu" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -191378,9 +190607,6 @@ "butter" ], "abilities": { - "cookable": { - "cook_temperature": 38.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -191478,9 +190704,6 @@ "chocolate_bar" ], "abilities": { - "cookable": { - "cook_temperature": 30.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -191513,10 +190736,6 @@ "chocolate_kiss" ], "abilities": { - "cookable": { - "cook_temperature": 46.0, - "substance_cooking_derivative_synset": "cooked__chocolate_kiss.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -191546,22 +190765,6 @@ "substance": {} } }, - { - "name": "cooked__chocolate_kiss.n.01", - "hasModel": true, - "substances": [ - "cooked__chocolate_kiss" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__chocolate.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__jimmies.n.01", "hasModel": true, @@ -191581,24 +190784,6 @@ "substances": [ "melted__chocolate" ], - "abilities": { - "boilable": {}, - "cookable": { - "cook_temperature": 58.0, - "substance_cooking_derivative_synset": "cooked__melted__chocolate.n.01" - }, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, - { - "name": "cooked__melted__chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__chocolate" - ], "abilities": { "boilable": {}, "freezable": {}, @@ -191643,10 +190828,6 @@ ], "abilities": { "boilable": {}, - "cookable": { - "cook_temperature": 45.0, - "substance_cooking_derivative_synset": "cooked__melted__white_chocolate.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -191660,9 +190841,6 @@ "white_chocolate" ], "abilities": { - "cookable": { - "cook_temperature": 46.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -191697,20 +190875,6 @@ "physicalSubstance": {}, "substance": {} } - }, - { - "name": "cooked__melted__white_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__melted__white_chocolate" - ], - "abilities": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } } ], "abilities": { @@ -193582,12 +192746,8 @@ "half_butter" ], "abilities": { - "cookable": { - "cook_temperature": 38.0 - }, "diceable": { - "uncooked_diceable_derivative_synset": "diced__butter.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__butter.n.01" + "uncooked_diceable_derivative_synset": "diced__butter.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -193618,10 +192778,6 @@ "diced__butter" ], "abilities": { - "cookable": { - "cook_temperature": 38.0, - "substance_cooking_derivative_synset": "cooked__diced__butter.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -193631,22 +192787,6 @@ "substance": {} } }, - { - "name": "cooked__diced__butter.n.01", - "hasModel": true, - "substances": [ - "cooked__diced__butter" - ], - "abilities": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "cooked__melted__butter.n.01" - }, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__yogurt.n.01", "hasModel": true, @@ -204975,6 +204115,21 @@ "substance": {} } }, + { + "name": "cooked__iced_chocolate.n.01", + "hasModel": true, + "substances": [ + "cooked__iced_chocolate" + ], + "abilities": { + "boilable": {}, + "breakable": {}, + "freezable": {}, + "liquid": {}, + "physicalSubstance": {}, + "substance": {} + } + }, { "name": "iced_chocolate.n.01", "hasModel": true, @@ -205188,21 +204343,6 @@ "substance": {} } }, - { - "name": "cooked__iced_chocolate.n.01", - "hasModel": true, - "substances": [ - "cooked__iced_chocolate" - ], - "abilities": { - "boilable": {}, - "breakable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - } - }, { "name": "cooked__iced_cappuccino.n.01", "hasModel": true, diff --git a/bddl/generated_data/prop_param_annots/cookable.csv b/bddl/generated_data/prop_param_annots/cookable.csv index 5aabf3f4..8765e913 100644 --- a/bddl/generated_data/prop_param_annots/cookable.csv +++ b/bddl/generated_data/prop_param_annots/cookable.csv @@ -6,7 +6,6 @@ banana.n.02,58, beet.n.02,58, bell_pepper.n.02,58, broccoli.n.02,58, -butter.n.01,38, carrot.n.03,91, casserole.n.02,74, catsup.n.01,74,cooked__catsup.n.01 @@ -100,7 +99,6 @@ pizza.n.01,246, mint.n.04,50, ginger.n.03,58, mustard.n.02,58,cooked__mustard.n.01 -cane_sugar.n.02,130,cooked__cane_sugar.n.01 soy_sauce.n.01,37,cooked__soy_sauce.n.01 vanilla.n.02,37,cooked__vanilla.n.01 maple_syrup.n.01,37,cooked__maple_syrup.n.01 @@ -122,7 +120,6 @@ cranberry_juice.n.01,100,cooked__cranberry_juice.n.01 curry_powder.n.01,50,cooked__curry_powder.n.01 cold_cuts.n.01,82, cider.n.01,100,cooked__cider.n.01 -bleu.n.01,82, nut_butter.n.01,72,cooked__nut_butter.n.01 salsa.n.01,100,cooked__salsa.n.01 pita.n.01,176, @@ -171,7 +168,6 @@ snapper.n.02,63, soy.n.04,100,cooked__soy.n.01 hot_sauce.n.01,100,cooked__hot_sauce.n.01 almond_oil.n.01,190,cooked__almond_oil.n.01 -swiss_cheese.n.01,176, petite_marmite.n.01,40,cooked__petite_marmite.n.01 venison.n.01,63, yam.n.03,96, @@ -218,7 +214,6 @@ coconut_oil.n.01,190,cooked__coconut_oil.n.01 granola.n.01,148,cooked__granola.n.01 cocoa.n.01,100,cooked__cocoa.n.01 marinara.n.01,58,cooked__marinara.n.01 -mozzarella.n.01,71, orange_juice.n.01,100,cooked__orange_juice.n.01 sesame_oil.n.01,190,cooked__sesame_oil.n.01 jimmies.n.01,120,cooked__jimmies.n.01 @@ -239,7 +234,6 @@ coconut.n.02,58, cornmeal.n.01,148,cooked__cornmeal.n.01 espresso.n.01,100,cooked__espresso.n.01 mussel.n.01,63, -parmesan.n.01,71,cooked__parmesan.n.01 peanut.n.01,72, tomato_paste.n.01,58,cooked__tomato_paste.n.01 brownie.n.03,180, @@ -268,7 +262,6 @@ quail.n.01,74, quiche.n.02,180, schnitzel.n.01,74, chinese_anise.n.02,50, -white_chocolate.n.01,46, wine_sauce.n.01,100,cooked__wine_sauce.n.01 allspice.n.03,50,cooked__allspice.n.01 antipasto.n.01,58, @@ -297,7 +290,6 @@ diced__watermelon.n.01,58,cooked__diced__watermelon.n.01 chia_seed.n.01,50,cooked__chia_seed.n.01 wafer.n.02,180, bouillon_cube.n.01,100, -chocolate_kiss.n.01,46,cooked__chocolate_kiss.n.01 heavy_cream.n.01,100,cooked__heavy_cream.n.01 diced__orange.n.01,58,cooked__diced__orange.n.01 cinnamon_bark.n.01,72, @@ -346,7 +338,6 @@ kielbasa.n.01,74, half__pomegranate.n.01,58, lamb.n.05,74, sliced__chocolate_cake.n.01,180, -grated_cheese.n.01,90,cooked__grated_cheese.n.01 diced__pineapple.n.01,58,cooked__diced__pineapple.n.01 coffee_bean.n.01,100,cooked__coffee_bean.n.01 sliced__tomato.n.01,58, @@ -387,7 +378,6 @@ cheese_sauce.n.01,90,cooked__cheese_sauce.n.01 cornbread_batter.n.01,180,cooked__cornbread_batter.n.01 pancake_batter.n.01,180,cooked__pancake_batter.n.01 chicken.n.01,74, -melted__parmesan.n.01,90,cooked__melted__parmesan.n.01 sliced__onion.n.01,58, huitre.n.01,74, hard-boiled_egg.n.01,74, @@ -418,8 +408,6 @@ half__apple.n.01,58, diced__potato.n.01,58,cooked__diced__potato.n.01 spice_cookie_dough.n.01,180, granulated_salt.n.01,100,cooked__granulated_salt.n.01 -melted__cheddar.n.01,90,cooked__melted__cheddar.n.01 -chocolate_bar.n.01,30, spice_cookie.n.01,180, diced__lemon.n.01,58,cooked__diced__lemon.n.01 heap__of__granola.n.01,180, @@ -427,15 +415,11 @@ buttermilk_pancake.n.01,180, instant_coffee.n.01,100,cooked__instant_coffee.n.01 diced__chili.n.01,100,cooked__diced__chili.n.01 bagel_dough.n.01,180, -cheddar.n.02,90, -granulated_sugar.n.01,180,cooked__granulated_sugar.n.01 sugar_cookie.n.01,180, diced__spinach.n.01,58,cooked__diced__spinach.n.01 patty.n.01,74, raw_egg.n.01,90, tofu.n.02,150, -melted__grated_cheese.n.01,90,cooked__melted__grated_cheese.n.01 -half__feta.n.01,90, diced__beefsteak_tomato.n.01,58,cooked__diced__beefsteak_tomato.n.01 macaroni_and_cheese.n.01,90, bread_slice.n.01,180, @@ -451,11 +435,9 @@ soft_roll.n.01,180, orzo.n.01,100,cooked__orzo.n.01 vanilla.n.01,100, white_rice.n.01,100,cooked__white_rice.n.01 -lump_sugar.n.01,180, cookie_stick.n.01,180, half__apricot.n.01,58, fruitcake.n.02,180, -melted__butter.n.01,170,cooked__melted__butter.n.01 arborio_rice.n.01,100,cooked__arborio_rice.n.01 beaten_egg.n.01,74,cooked__beaten_egg.n.01 diced__mango.n.01,58,cooked__diced__mango.n.01 @@ -481,7 +463,6 @@ chard.n.02,58, cauliflower.n.02,58, half__beefsteak_tomato.n.01,58, pumpkin_pie_spice.n.01,50,cooked__pumpkin_pie_spice.n.01 -melted__white_chocolate.n.01,45,cooked__melted__white_chocolate.n.01 chickpea.n.03,100,cooked__chickpea.n.01 dumpling.n.01,100, salmon.n.03,74, @@ -491,7 +472,6 @@ ground_coffee.n.01,100,cooked__ground_coffee.n.01 bap.n.01,180, scrambled_eggs.n.01,74,cooked__scrambled_eggs.n.01 sugar_syrup.n.01,180,cooked__sugar_syrup.n.01 -diced__cheddar.n.01,90,cooked__diced__cheddar.n.01 sliced__brisket.n.01,74, diced__clove.n.01,58,cooked__diced__clove.n.01 half__bell_pepper.n.01,58, @@ -511,7 +491,6 @@ diced__virginia_ham.n.01,74,cooked__diced__virginia_ham.n.01 papaya.n.02,58, chopped__lettuce.n.01,58, lemon-pepper_seasoning.n.01,50,cooked__lemon-pepper_seasoning.n.01 -diced__feta.n.01,90,cooked__diced__feta.n.01 peppermint.n.01,50, biscuit_dough.n.01,180, chocolate_cake.n.01,180, @@ -538,7 +517,6 @@ diced__bay_leaf.n.01,58,cooked__diced__bay_leaf.n.01 diced__bean_curd.n.01,58,cooked__diced__bean_curd.n.01 diced__biscuit_dough.n.01,180,cooked__diced__biscuit_dough.n.01 diced__blackberry.n.01,58,cooked__diced__blackberry.n.01 -diced__bleu.n.01,82,cooked__diced__bleu.n.01 diced__bok_choy.n.01,58,cooked__diced__bok_choy.n.01 diced__brisket.n.01,63,cooked__diced__brisket.n.01 diced__broccoli_rabe.n.01,58,cooked__diced__broccoli_rabe.n.01 @@ -546,7 +524,6 @@ diced__broccolini.n.01,58,cooked__diced__broccolini.n.01 diced__brownie.n.01,180,cooked__diced__brownie.n.01 diced__brussels_sprouts.n.01,58,cooked__diced__brussels_sprouts.n.01 diced__burrito.n.01,140,cooked__diced__burrito.n.01 -diced__butter.n.01,38,cooked__diced__butter.n.01 diced__butter_cookie.n.01,180,cooked__diced__butter_cookie.n.01 diced__buttermilk_pancake.n.01,180,cooked__diced__buttermilk_pancake.n.01 diced__butternut_squash.n.01,58,cooked__diced__butternut_squash.n.01 @@ -624,7 +601,6 @@ diced__macaroon.n.01,180,cooked__diced__macaroon.n.01 diced__marshmallow.n.01,110,cooked__diced__marshmallow.n.01 diced__meat_loaf.n.01,74,cooked__diced__meat_loaf.n.01 diced__meatball.n.01,63,cooked__diced__meatball.n.01 -diced__mozzarella.n.01,71,cooked__diced__mozzarella.n.01 diced__muffin.n.01,93,cooked__diced__muffin.n.01 diced__mushroom.n.01,58,cooked__diced__mushroom.n.01 diced__mustard.n.01,50,cooked__diced__mustard.n.01 @@ -671,7 +647,6 @@ diced__sugar_cookie.n.01,180,cooked__diced__sugar_cookie.n.01 diced__sugar_cookie_dough.n.01,180,cooked__diced__sugar_cookie_dough.n.01 diced__sushi.n.01,71,cooked__diced__sushi.n.01 diced__sweet_corn.n.01,58,cooked__diced__sweet_corn.n.01 -diced__swiss_cheese.n.01,176,cooked__diced__swiss_cheese.n.01 diced__taco.n.01,176,cooked__diced__taco.n.01 diced__tenderloin.n.01,63,cooked__diced__tenderloin.n.01 diced__toast.n.01,177,cooked__diced__toast.n.01 @@ -708,7 +683,6 @@ half__bean_curd.n.01,58, half__beet.n.01,58, half__biscuit_dough.n.01,180, half__blackberry.n.01,58, -half__bleu.n.01,82, half__bok_choy.n.01,58, half__bratwurst.n.01,72, half__brisket.n.01,63, @@ -718,9 +692,6 @@ half__broccolini.n.01,58, half__brownie.n.01,180, half__brussels_sprouts.n.01,58, half__burrito.n.01,140, -half__butter.n.01,38, -half__butter_cookie.n.01,180, -half__buttermilk_pancake.n.01,180, half__butternut_squash.n.01,58, half__cantaloup.n.01,58, half__carne_asada.n.01,74, @@ -728,7 +699,6 @@ half__cauliflower.n.01,58, half__celery.n.01,58, half__chanterelle.n.01,204, half__chard.n.01,58, -half__cheddar.n.01,90, half__cheese_tart.n.01,180, half__cheesecake.n.01,82, half__cherry.n.01,58, @@ -801,7 +771,6 @@ half__macaroon.n.01,180, half__marshmallow.n.01,110, half__meat_loaf.n.01,74, half__meatball.n.01,63, -half__mozzarella.n.01,71, half__muffin.n.01,93, half__mustard.n.01,50, half__nectarine.n.01,58, @@ -846,7 +815,6 @@ half__sugar_cookie.n.01,180, half__sugar_cookie_dough.n.01,180, half__sushi.n.01,71, half__sweet_corn.n.01,58, -half__swiss_cheese.n.01,176, half__taco.n.01,176, half__tenderloin.n.01,63, half__toast.n.01,177, @@ -874,13 +842,6 @@ diced__roast_beef.n.01,74,cooked__diced__roast_beef.n.01 diced__tomato.n.01,58,cooked__diced__tomato.n.01 half__papaya.n.01,58, diced__papaya.n.01,58,cooked__diced__papaya.n.01 -melted__chocolate.n.01,58,cooked__melted__chocolate.n.01 -melted__cane_sugar.n.01,130,cooked__melted__cane_sugar.n.01 -melted__feta.n.01,90,cooked__melted__feta.n.01 -melted__granulated_sugar.n.01,130,cooked__melted__granulated_sugar.n.01 -melted__mozzarella.n.01,90,cooked__melted__mozzarella.n.01 -melted__swiss_cheese.n.01,90,cooked__melted__swiss_cheese.n.01 -melted__bleu.n.01,90,cooked__melted__bleu.n.01 half__carrot.n.01,91, diced__carrot.n.01,91,cooked__diced__carrot.n.01 half__clove.n.01,91, diff --git a/bddl/generated_data/prop_param_annots/diceable.csv b/bddl/generated_data/prop_param_annots/diceable.csv index f2ce058c..4ebf90f3 100644 --- a/bddl/generated_data/prop_param_annots/diceable.csv +++ b/bddl/generated_data/prop_param_annots/diceable.csv @@ -23,7 +23,7 @@ half__beet.n.01,diced__beet.n.01,cooked__diced__beet.n.01 half__bell_pepper.n.01,diced__bell_pepper.n.01,cooked__diced__bell_pepper.n.01 half__biscuit_dough.n.01,diced__biscuit_dough.n.01,cooked__diced__biscuit_dough.n.01 half__blackberry.n.01,diced__blackberry.n.01,cooked__diced__blackberry.n.01 -half__bleu.n.01,diced__bleu.n.01,cooked__diced__bleu.n.01 +half__bleu.n.01,diced__bleu.n.01, half__bok_choy.n.01,diced__bok_choy.n.01,cooked__diced__bok_choy.n.01 half__branch.n.01,diced__branch.n.01, half__bratwurst.n.01,diced__bratwurst.n.01,cooked__diced__bratwurst.n.01 @@ -34,7 +34,7 @@ half__broccolini.n.01,diced__broccolini.n.01,cooked__diced__broccolini.n.01 half__brownie.n.01,diced__brownie.n.01,cooked__diced__brownie.n.01 half__brussels_sprouts.n.01,diced__brussels_sprouts.n.01,cooked__diced__brussels_sprouts.n.01 half__burrito.n.01,diced__burrito.n.01,cooked__diced__burrito.n.01 -half__butter.n.01,diced__butter.n.01,cooked__diced__butter.n.01 +half__butter.n.01,diced__butter.n.01, half__butter_cookie.n.01,diced__butter_cookie.n.01,cooked__diced__butter_cookie.n.01 half__buttermilk_pancake.n.01,diced__buttermilk_pancake.n.01,cooked__diced__buttermilk_pancake.n.01 half__butternut_squash.n.01,diced__butternut_squash.n.01,cooked__diced__butternut_squash.n.01 @@ -44,7 +44,7 @@ half__cauliflower.n.01,diced__cauliflower.n.01,cooked__diced__cauliflower.n.01 half__celery.n.01,diced__celery.n.01,cooked__diced__celery.n.01 half__chanterelle.n.01,diced__chanterelle.n.01,cooked__diced__chanterelle.n.01 half__chard.n.01,diced__chard.n.01,cooked__diced__chard.n.01 -half__cheddar.n.01,diced__cheddar.n.01,cooked__diced__cheddar.n.01 +half__cheddar.n.01,diced__cheddar.n.01, half__cheese_tart.n.01,diced__cheese_tart.n.01,cooked__diced__cheese_tart.n.01 half__cheesecake.n.01,diced__cheesecake.n.01,cooked__diced__cheesecake.n.01 half__cherry.n.01,diced__cherry.n.01,cooked__diced__cherry.n.01 @@ -84,7 +84,7 @@ half__eggplant.n.01,diced__eggplant.n.01,cooked__diced__eggplant.n.01 half__enchilada.n.01,diced__enchilada.n.01,cooked__diced__enchilada.n.01 half__entire_leaf.n.01,diced__entire_leaf.n.01, half__fennel.n.01,diced__fennel.n.01,cooked__diced__fennel.n.01 -half__feta.n.01,diced__feta.n.01,cooked__diced__feta.n.01 +half__feta.n.01,diced__feta.n.01, half__fillet.n.01,diced__fillet.n.01,cooked__diced__fillet.n.01 half__frank.n.01,diced__frank.n.01,cooked__diced__frank.n.01 half__frankfurter_bun.n.01,diced__frankfurter_bun.n.01,cooked__diced__frankfurter_bun.n.01 @@ -130,7 +130,7 @@ half__mango.n.01,diced__mango.n.01,cooked__diced__mango.n.01 half__marshmallow.n.01,diced__marshmallow.n.01,cooked__diced__marshmallow.n.01 half__meat_loaf.n.01,diced__meat_loaf.n.01,cooked__diced__meat_loaf.n.01 half__meatball.n.01,diced__meatball.n.01,cooked__diced__meatball.n.01 -half__mozzarella.n.01,diced__mozzarella.n.01,cooked__diced__mozzarella.n.01 +half__mozzarella.n.01,diced__mozzarella.n.01, half__muffin.n.01,diced__muffin.n.01,cooked__diced__muffin.n.01 half__mushroom.n.01,diced__mushroom.n.01,cooked__diced__mushroom.n.01 half__mustard.n.01,diced__mustard.n.01,cooked__diced__mustard.n.01 @@ -189,7 +189,7 @@ half__sugar_cookie_dough.n.01,diced__sugar_cookie_dough.n.01,cooked__diced__suga half__sunflower.n.01,diced__sunflower.n.01, half__sushi.n.01,diced__sushi.n.01,cooked__diced__sushi.n.01 half__sweet_corn.n.01,diced__sweet_corn.n.01,cooked__diced__sweet_corn.n.01 -half__swiss_cheese.n.01,diced__swiss_cheese.n.01,cooked__diced__swiss_cheese.n.01 +half__swiss_cheese.n.01,diced__swiss_cheese.n.01, half__taco.n.01,diced__taco.n.01,cooked__diced__taco.n.01 half__tenderloin.n.01,diced__tenderloin.n.01,cooked__diced__tenderloin.n.01 half__tiramisu.n.01,diced__tiramisu.n.01, diff --git a/bddl/generated_data/prop_param_annots/flammable.csv b/bddl/generated_data/prop_param_annots/flammable.csv index b471670a..8ad48f7b 100644 --- a/bddl/generated_data/prop_param_annots/flammable.csv +++ b/bddl/generated_data/prop_param_annots/flammable.csv @@ -215,7 +215,6 @@ doily.n.01,250,1000,0.04,0.2 cooked__diced__broccoli.n.01,250,1000,0.04,0.2 magazine.n.02,250,1000,0.04,0.2 acetone.n.01,250,1000,0.04,0.2 -cooked__granulated_sugar.n.01,250,1000,0.04,0.2 curtain.n.01,250,1000,0.04,0.2 holly.n.03,250,1000,0.04,0.2 feta__box.n.01,250,1000,0.04,0.2 @@ -381,7 +380,6 @@ cooked__diced__biscuit_dough.n.01,250,1000,0.04,0.2 cooked__diced__butter_cookie.n.01,250,1000,0.04,0.2 cooked__diced__buttermilk_pancake.n.01,250,1000,0.04,0.2 cooked__diced__cantaloup.n.01,250,1000,0.04,0.2 -cooked__diced__cheddar.n.01,250,1000,0.04,0.2 cooked__diced__chicken_breast.n.01,250,1000,0.04,0.2 cooked__diced__chicken_tender.n.01,250,1000,0.04,0.2 cooked__diced__chicken_wing.n.01,250,1000,0.04,0.2 @@ -394,7 +392,6 @@ cooked__diced__crescent_roll.n.01,250,1000,0.04,0.2 cooked__diced__doughnut.n.01,250,1000,0.04,0.2 cooked__diced__dried_apricot.n.01,250,1000,0.04,0.2 cooked__diced__durian.n.01,250,1000,0.04,0.2 -cooked__diced__feta.n.01,250,1000,0.04,0.2 cooked__diced__frankfurter_bun.n.01,250,1000,0.04,0.2 cooked__diced__french_fries.n.01,250,1000,0.04,0.2 cooked__diced__french_toast.n.01,250,1000,0.04,0.2 @@ -414,7 +411,6 @@ cooked__diced__sugar_cookie.n.01,250,1000,0.04,0.2 cooked__diced__sweet_corn.n.01,250,1000,0.04,0.2 cooked__diced__tofu.n.01,250,1000,0.04,0.2 cooked__diced__turkey_leg.n.01,250,1000,0.04,0.2 -cooked__grated_cheese.n.01,250,1000,0.04,0.2 cooked__peanut.n.01,250,1000,0.04,0.2 cooked__ravioli.n.01,250,1000,0.04,0.2 diced__auricularia.n.01,250,1000,0.04,0.2 diff --git a/bddl/generated_data/prop_param_annots/meltable.csv b/bddl/generated_data/prop_param_annots/meltable.csv index 087e5935..313f70fc 100644 --- a/bddl/generated_data/prop_param_annots/meltable.csv +++ b/bddl/generated_data/prop_param_annots/meltable.csv @@ -4,13 +4,6 @@ cane_sugar.n.02,melted__cane_sugar.n.01 cheddar.n.02,melted__cheddar.n.01 chocolate_bar.n.01,melted__chocolate.n.01 chocolate_kiss.n.01,melted__chocolate.n.01 -cooked__cane_sugar.n.01,melted__cane_sugar.n.01 -cooked__chocolate_kiss.n.01,melted__chocolate.n.01 -cooked__diced__bleu.n.01,melted__bleu.n.01 -cooked__diced__cheddar.n.01,melted__cheddar.n.01 -cooked__diced__feta.n.01,melted__feta.n.01 -cooked__diced__mozzarella.n.01,melted__mozzarella.n.01 -cooked__diced__swiss_cheese.n.01,melted__swiss_cheese.n.01 diced__bleu.n.01,melted__bleu.n.01 diced__cheddar.n.01,melted__cheddar.n.01 diced__feta.n.01,melted__feta.n.01 @@ -31,6 +24,5 @@ white_chocolate.n.01,melted__white_chocolate.n.01 butter.n.01,melted__butter.n.01 half__butter.n.01,melted__butter.n.01 diced__butter.n.01,melted__butter.n.01 -cooked__diced__butter.n.01,cooked__melted__butter.n.01 -cooked__grated_cheese.n.01,cooked__melted__grated_cheese.n.01 grated_cheese.n.01,melted__grated_cheese.n.01 +parmesan.n.01,melted__parmesan.n.01 diff --git a/bddl/generated_data/propagated_annots_canonical.json b/bddl/generated_data/propagated_annots_canonical.json index 9e0f2326..6aa5f493 100644 --- a/bddl/generated_data/propagated_annots_canonical.json +++ b/bddl/generated_data/propagated_annots_canonical.json @@ -3895,6 +3895,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -4005,7 +4006,6 @@ "wrinkleable": {} }, "bleu.n.01": { - "cookable": {}, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -8732,7 +8732,6 @@ "substance": {} }, "butter.n.01": { - "cookable": {}, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -8871,6 +8870,7 @@ "openable": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -9399,7 +9399,6 @@ "wrinkleable": {} }, "cane_sugar.n.02": { - "cookable": {}, "freezable": {}, "meltable": {}, "microPhysicalSubstance": {}, @@ -10655,6 +10654,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -10849,7 +10849,6 @@ "wrinkleable": {} }, "cheddar.n.02": { - "cookable": {}, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -11487,7 +11486,6 @@ "freezable": {} }, "chocolate_bar.n.01": { - "cookable": {}, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -11590,7 +11588,6 @@ "wrinkleable": {} }, "chocolate_kiss.n.01": { - "cookable": {}, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": {}, @@ -13719,13 +13716,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__cane_sugar.n.01": { - "freezable": {}, - "meltable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__canola_oil.n.01": { "boilable": {}, "freezable": {}, @@ -13827,13 +13817,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__chocolate_kiss.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__chocolate_sauce.n.01": { "boilable": {}, "freezable": {}, @@ -14151,13 +14134,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__bleu.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__bok_choy.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -14214,13 +14190,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__butter.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__butter_cookie.n.01": { "flammable": {}, "freezable": {}, @@ -14286,14 +14255,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__cheddar.n.01": { - "flammable": {}, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__cheese_tart.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -14544,14 +14505,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__feta.n.01": { - "flammable": {}, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__fillet.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -14826,13 +14779,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__mozzarella.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__muffin.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -15197,13 +15143,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__swiss_cheese.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__taco.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -15441,21 +15380,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__granulated_sugar.n.01": { - "flammable": {}, - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__grated_cheese.n.01": { - "flammable": {}, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__gravy.n.01": { "boilable": {}, "freezable": {}, @@ -15707,90 +15631,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__melted__bleu.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__butter.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__cane_sugar.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__cheddar.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__chocolate.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__feta.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__granulated_sugar.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__grated_cheese.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__mozzarella.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__parmesan.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__swiss_cheese.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__white_chocolate.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__meringue.n.01": { "boilable": {}, "freezable": {}, @@ -15921,12 +15761,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__parmesan.n.01": { - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__pea.n.01": { "flammable": {}, "freezable": {}, @@ -18573,7 +18407,6 @@ "substance": {} }, "diced__bleu.n.01": { - "cookable": {}, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": {}, @@ -18653,7 +18486,6 @@ "substance": {} }, "diced__butter.n.01": { - "cookable": {}, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": {}, @@ -18734,7 +18566,6 @@ "substance": {} }, "diced__cheddar.n.01": { - "cookable": {}, "flammable": {}, "freezable": {}, "macroPhysicalSubstance": {}, @@ -19044,7 +18875,6 @@ "substance": {} }, "diced__feta.n.01": { - "cookable": {}, "flammable": {}, "freezable": {}, "macroPhysicalSubstance": {}, @@ -19384,7 +19214,6 @@ "substance": {} }, "diced__mozzarella.n.01": { - "cookable": {}, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": {}, @@ -19832,7 +19661,6 @@ "substance": {} }, "diced__swiss_cheese.n.01": { - "cookable": {}, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": {}, @@ -20366,6 +20194,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -24961,7 +24790,6 @@ "substance": {} }, "granulated_sugar.n.01": { - "cookable": {}, "freezable": {}, "meltable": {}, "microPhysicalSubstance": {}, @@ -25084,7 +24912,6 @@ "wrinkleable": {} }, "grated_cheese.n.01": { - "cookable": {}, "flammable": {}, "freezable": {}, "macroPhysicalSubstance": {}, @@ -26075,7 +25902,6 @@ "wrinkleable": {} }, "half__bleu.n.01": { - "cookable": {}, "deformable": {}, "diceable": {}, "disinfectable": {}, @@ -26287,7 +26113,6 @@ "wrinkleable": {} }, "half__butter.n.01": { - "cookable": {}, "diceable": {}, "disinfectable": {}, "dustyable": {}, @@ -26307,7 +26132,6 @@ "wrinkleable": {} }, "half__butter_cookie.n.01": { - "cookable": {}, "diceable": {}, "disinfectable": {}, "dustyable": {}, @@ -26553,7 +26377,6 @@ "wrinkleable": {} }, "half__cheddar.n.01": { - "cookable": {}, "deformable": {}, "diceable": {}, "disinfectable": {}, @@ -27428,7 +27251,6 @@ "wrinkleable": {} }, "half__feta.n.01": { - "cookable": {}, "deformable": {}, "diceable": {}, "disinfectable": {}, @@ -28425,7 +28247,6 @@ "wrinkleable": {} }, "half__mozzarella.n.01": { - "cookable": {}, "deformable": {}, "diceable": {}, "disinfectable": {}, @@ -29780,7 +29601,6 @@ "wrinkleable": {} }, "half__swiss_cheese.n.01": { - "cookable": {}, "diceable": {}, "disinfectable": {}, "dustyable": {}, @@ -31180,6 +31000,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -31646,6 +31467,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -33947,6 +33769,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -35337,7 +35160,6 @@ "wrinkleable": {} }, "lump_sugar.n.01": { - "cookable": {}, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -36450,7 +36272,6 @@ }, "melted__bleu.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36458,7 +36279,6 @@ }, "melted__butter.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36466,7 +36286,6 @@ }, "melted__cane_sugar.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36474,7 +36293,6 @@ }, "melted__cheddar.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36482,7 +36300,6 @@ }, "melted__chocolate.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36490,7 +36307,6 @@ }, "melted__feta.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36498,7 +36314,6 @@ }, "melted__granulated_sugar.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36506,7 +36321,6 @@ }, "melted__grated_cheese.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36514,7 +36328,6 @@ }, "melted__mozzarella.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36522,7 +36335,6 @@ }, "melted__parmesan.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36530,7 +36342,6 @@ }, "melted__swiss_cheese.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -36538,7 +36349,6 @@ }, "melted__white_chocolate.n.01": { "boilable": {}, - "cookable": {}, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -37320,7 +37130,6 @@ "wrinkleable": {} }, "mozzarella.n.01": { - "cookable": {}, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -39404,8 +39213,8 @@ "wrinkleable": {} }, "parmesan.n.01": { - "cookable": {}, "freezable": {}, + "meltable": {}, "microPhysicalSubstance": {}, "physicalSubstance": {}, "substance": {} @@ -50341,7 +50150,6 @@ "wrinkleable": {} }, "swiss_cheese.n.01": { - "cookable": {}, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -54747,7 +54555,6 @@ "freezable": {} }, "white_chocolate.n.01": { - "cookable": {}, "disinfectable": {}, "dustyable": {}, "freezable": {}, diff --git a/bddl/generated_data/propagated_annots_params.json b/bddl/generated_data/propagated_annots_params.json index 2bc78783..06ec84f5 100644 --- a/bddl/generated_data/propagated_annots_params.json +++ b/bddl/generated_data/propagated_annots_params.json @@ -9555,6 +9555,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -10247,9 +10248,6 @@ "wrinkleable": {} }, "bleu.n.01": { - "cookable": { - "cook_temperature": 82.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -18020,9 +18018,6 @@ "substance": {} }, "butter.n.01": { - "cookable": { - "cook_temperature": 38.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -18206,6 +18201,7 @@ "openable": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -18792,10 +18788,6 @@ "wrinkleable": {} }, "cane_sugar.n.02": { - "cookable": { - "cook_temperature": 130.0, - "substance_cooking_derivative_synset": "cooked__cane_sugar.n.01" - }, "freezable": {}, "meltable": { "meltable_derivative_synset": "melted__cane_sugar.n.01" @@ -21396,6 +21388,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -21621,9 +21614,6 @@ "wrinkleable": {} }, "cheddar.n.02": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -22983,9 +22973,6 @@ "freezable": {} }, "chocolate_bar.n.01": { - "cookable": { - "cook_temperature": 30.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -23131,10 +23118,6 @@ "wrinkleable": {} }, "chocolate_kiss.n.01": { - "cookable": { - "cook_temperature": 46.0, - "substance_cooking_derivative_synset": "cooked__chocolate_kiss.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -26138,15 +26121,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__cane_sugar.n.01": { - "freezable": {}, - "meltable": { - "meltable_derivative_synset": "melted__cane_sugar.n.01" - }, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__canola_oil.n.01": { "boilable": {}, "freezable": {}, @@ -26258,15 +26232,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__chocolate_kiss.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__chocolate.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__chocolate_sauce.n.01": { "boilable": {}, "freezable": {}, @@ -26644,15 +26609,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__bleu.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__bleu.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__bok_choy.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -26719,15 +26675,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__butter.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "cooked__melted__butter.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__butter_cookie.n.01": { "flammable": { "ignition_temperature": 250.0, @@ -26818,21 +26765,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__cheddar.n.01": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__cheddar.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__cheese_tart.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -27163,21 +27095,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__feta.n.01": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__feta.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__fillet.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -27502,15 +27419,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__mozzarella.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__mozzarella.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__muffin.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -27925,15 +27833,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__diced__swiss_cheese.n.01": { - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "melted__swiss_cheese.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__diced__taco.n.01": { "freezable": {}, "macroPhysicalSubstance": {}, @@ -28206,33 +28105,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__granulated_sugar.n.01": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__grated_cheese.n.01": { - "flammable": { - "ignition_temperature": 250.0, - "fire_temperature": 1000.0, - "heating_rate": 0.04, - "distance_threshold": 0.2 - }, - "freezable": {}, - "macroPhysicalSubstance": {}, - "meltable": { - "meltable_derivative_synset": "cooked__melted__grated_cheese.n.01" - }, - "physicalSubstance": {}, - "substance": {} - }, "cooked__gravy.n.01": { "boilable": {}, "freezable": {}, @@ -28509,90 +28381,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__melted__bleu.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__butter.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__cane_sugar.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__cheddar.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__chocolate.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__feta.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__granulated_sugar.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__grated_cheese.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__mozzarella.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__parmesan.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__swiss_cheese.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, - "cooked__melted__white_chocolate.n.01": { - "boilable": {}, - "freezable": {}, - "liquid": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__meringue.n.01": { "boilable": {}, "freezable": {}, @@ -28748,12 +28536,6 @@ "physicalSubstance": {}, "substance": {} }, - "cooked__parmesan.n.01": { - "freezable": {}, - "microPhysicalSubstance": {}, - "physicalSubstance": {}, - "substance": {} - }, "cooked__pea.n.01": { "flammable": { "ignition_temperature": 250.0, @@ -35250,10 +35032,6 @@ "substance": {} }, "diced__bleu.n.01": { - "cookable": { - "cook_temperature": 82.0, - "substance_cooking_derivative_synset": "cooked__diced__bleu.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -35377,10 +35155,6 @@ "substance": {} }, "diced__butter.n.01": { - "cookable": { - "cook_temperature": 38.0, - "substance_cooking_derivative_synset": "cooked__diced__butter.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -35508,10 +35282,6 @@ "substance": {} }, "diced__cheddar.n.01": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__diced__cheddar.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -36025,10 +35795,6 @@ "substance": {} }, "diced__feta.n.01": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__diced__feta.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -36562,10 +36328,6 @@ "substance": {} }, "diced__mozzarella.n.01": { - "cookable": { - "cook_temperature": 71.0, - "substance_cooking_derivative_synset": "cooked__diced__mozzarella.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -37237,10 +36999,6 @@ "substance": {} }, "diced__swiss_cheese.n.01": { - "cookable": { - "cook_temperature": 176.0, - "substance_cooking_derivative_synset": "cooked__diced__swiss_cheese.n.01" - }, "freezable": {}, "macroPhysicalSubstance": {}, "meltable": { @@ -39023,6 +38781,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -49276,10 +49035,6 @@ "substance": {} }, "granulated_sugar.n.01": { - "cookable": { - "cook_temperature": 180.0, - "substance_cooking_derivative_synset": "cooked__granulated_sugar.n.01" - }, "freezable": {}, "meltable": { "meltable_derivative_synset": "melted__granulated_sugar.n.01" @@ -49425,10 +49180,6 @@ "wrinkleable": {} }, "grated_cheese.n.01": { - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__grated_cheese.n.01" - }, "flammable": { "ignition_temperature": 250.0, "fire_temperature": 1000.0, @@ -50720,13 +50471,9 @@ "wrinkleable": {} }, "half__bleu.n.01": { - "cookable": { - "cook_temperature": 82.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__bleu.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__bleu.n.01" + "uncooked_diceable_derivative_synset": "diced__bleu.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -51013,12 +50760,8 @@ "wrinkleable": {} }, "half__butter.n.01": { - "cookable": { - "cook_temperature": 38.0 - }, "diceable": { - "uncooked_diceable_derivative_synset": "diced__butter.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__butter.n.01" + "uncooked_diceable_derivative_synset": "diced__butter.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -51042,9 +50785,6 @@ "wrinkleable": {} }, "half__butter_cookie.n.01": { - "cookable": { - "cook_temperature": 180.0 - }, "diceable": { "uncooked_diceable_derivative_synset": "diced__butter_cookie.n.01", "cooked_diceable_derivative_synset": "cooked__diced__butter_cookie.n.01" @@ -51074,9 +50814,7 @@ "wrinkleable": {} }, "half__buttermilk_pancake.n.01": { - "cookable": { - "cook_temperature": 180.0 - }, + "cookable": {}, "diceable": { "uncooked_diceable_derivative_synset": "diced__buttermilk_pancake.n.01", "cooked_diceable_derivative_synset": "cooked__diced__buttermilk_pancake.n.01" @@ -51373,13 +51111,9 @@ "wrinkleable": {} }, "half__cheddar.n.01": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__cheddar.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__cheddar.n.01" + "uncooked_diceable_derivative_synset": "diced__cheddar.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -52604,13 +52338,9 @@ "wrinkleable": {} }, "half__feta.n.01": { - "cookable": { - "cook_temperature": 90.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__feta.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__feta.n.01" + "uncooked_diceable_derivative_synset": "diced__feta.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -53966,13 +53696,9 @@ "wrinkleable": {} }, "half__mozzarella.n.01": { - "cookable": { - "cook_temperature": 71.0 - }, "deformable": {}, "diceable": { - "uncooked_diceable_derivative_synset": "diced__mozzarella.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__mozzarella.n.01" + "uncooked_diceable_derivative_synset": "diced__mozzarella.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -55779,12 +55505,8 @@ "wrinkleable": {} }, "half__swiss_cheese.n.01": { - "cookable": { - "cook_temperature": 176.0 - }, "diceable": { - "uncooked_diceable_derivative_synset": "diced__swiss_cheese.n.01", - "cooked_diceable_derivative_synset": "cooked__diced__swiss_cheese.n.01" + "uncooked_diceable_derivative_synset": "diced__swiss_cheese.n.01" }, "disinfectable": {}, "dustyable": {}, @@ -58629,6 +58351,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -59141,6 +58864,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -65165,6 +64889,7 @@ "nonSubstance": {}, "rigidBody": {}, "rustable": {}, + "sceneObject": {}, "scratchable": {}, "stainable": {}, "stickyable": {}, @@ -70675,9 +70400,6 @@ "wrinkleable": {} }, "lump_sugar.n.01": { - "cookable": { - "cook_temperature": 180.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -74765,10 +74487,6 @@ }, "melted__bleu.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__bleu.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74776,10 +74494,6 @@ }, "melted__butter.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 170.0, - "substance_cooking_derivative_synset": "cooked__melted__butter.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74787,10 +74501,6 @@ }, "melted__cane_sugar.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 130.0, - "substance_cooking_derivative_synset": "cooked__melted__cane_sugar.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74798,10 +74508,6 @@ }, "melted__cheddar.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__cheddar.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74809,10 +74515,6 @@ }, "melted__chocolate.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 58.0, - "substance_cooking_derivative_synset": "cooked__melted__chocolate.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74820,10 +74522,6 @@ }, "melted__feta.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__feta.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74831,10 +74529,6 @@ }, "melted__granulated_sugar.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 130.0, - "substance_cooking_derivative_synset": "cooked__melted__granulated_sugar.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74842,10 +74536,6 @@ }, "melted__grated_cheese.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__grated_cheese.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74853,10 +74543,6 @@ }, "melted__mozzarella.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__mozzarella.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74864,10 +74550,6 @@ }, "melted__parmesan.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__parmesan.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74875,10 +74557,6 @@ }, "melted__swiss_cheese.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 90.0, - "substance_cooking_derivative_synset": "cooked__melted__swiss_cheese.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -74886,10 +74564,6 @@ }, "melted__white_chocolate.n.01": { "boilable": {}, - "cookable": { - "cook_temperature": 45.0, - "substance_cooking_derivative_synset": "cooked__melted__white_chocolate.n.01" - }, "freezable": {}, "liquid": {}, "physicalSubstance": {}, @@ -75743,9 +75417,6 @@ "wrinkleable": {} }, "mozzarella.n.01": { - "cookable": { - "cook_temperature": 71.0 - }, "deformable": {}, "disinfectable": {}, "dustyable": {}, @@ -81518,11 +81189,10 @@ "wrinkleable": {} }, "parmesan.n.01": { - "cookable": { - "cook_temperature": 71.0, - "substance_cooking_derivative_synset": "cooked__parmesan.n.01" - }, "freezable": {}, + "meltable": { + "meltable_derivative_synset": "melted__parmesan.n.01" + }, "microPhysicalSubstance": {}, "physicalSubstance": {}, "substance": {} @@ -110329,9 +109999,6 @@ "wrinkleable": {} }, "swiss_cheese.n.01": { - "cookable": { - "cook_temperature": 176.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, @@ -120981,9 +120648,6 @@ "freezable": {} }, "white_chocolate.n.01": { - "cookable": { - "cook_temperature": 46.0 - }, "disinfectable": {}, "dustyable": {}, "freezable": {}, diff --git a/bddl/generated_data/properties_to_synsets.json b/bddl/generated_data/properties_to_synsets.json index ff1bc81f..0c9647a9 100644 --- a/bddl/generated_data/properties_to_synsets.json +++ b/bddl/generated_data/properties_to_synsets.json @@ -6094,7 +6094,6 @@ "cooked__brownie_batter.n.01", "cooked__cafe_au_lait.n.01", "cooked__cake_mix.n.01", - "cooked__cane_sugar.n.01", "cooked__canola_oil.n.01", "cooked__caraway_seed.n.01", "cooked__cardamom.n.01", @@ -6110,7 +6109,6 @@ "cooked__chicken_soup.n.01", "cooked__chickpea.n.01", "cooked__chili_powder.n.01", - "cooked__chocolate_kiss.n.01", "cooked__chocolate_sauce.n.01", "cooked__cider.n.01", "cooked__cinnamon.n.01", @@ -6160,7 +6158,6 @@ "cooked__diced__bell_pepper.n.01", "cooked__diced__biscuit_dough.n.01", "cooked__diced__blackberry.n.01", - "cooked__diced__bleu.n.01", "cooked__diced__bok_choy.n.01", "cooked__diced__bratwurst.n.01", "cooked__diced__brisket.n.01", @@ -6170,7 +6167,6 @@ "cooked__diced__brownie.n.01", "cooked__diced__brussels_sprouts.n.01", "cooked__diced__burrito.n.01", - "cooked__diced__butter.n.01", "cooked__diced__butter_cookie.n.01", "cooked__diced__buttermilk_pancake.n.01", "cooked__diced__butternut_squash.n.01", @@ -6181,7 +6177,6 @@ "cooked__diced__celery.n.01", "cooked__diced__chanterelle.n.01", "cooked__diced__chard.n.01", - "cooked__diced__cheddar.n.01", "cooked__diced__cheese_tart.n.01", "cooked__diced__cheesecake.n.01", "cooked__diced__cherry.n.01", @@ -6221,7 +6216,6 @@ "cooked__diced__eggplant.n.01", "cooked__diced__enchilada.n.01", "cooked__diced__fennel.n.01", - "cooked__diced__feta.n.01", "cooked__diced__fillet.n.01", "cooked__diced__frank.n.01", "cooked__diced__frankfurter_bun.n.01", @@ -6266,7 +6260,6 @@ "cooked__diced__meat_loaf.n.01", "cooked__diced__meatball.n.01", "cooked__diced__melon.n.01", - "cooked__diced__mozzarella.n.01", "cooked__diced__muffin.n.01", "cooked__diced__mushroom.n.01", "cooked__diced__mustard.n.01", @@ -6326,7 +6319,6 @@ "cooked__diced__sugar_cookie_dough.n.01", "cooked__diced__sushi.n.01", "cooked__diced__sweet_corn.n.01", - "cooked__diced__swiss_cheese.n.01", "cooked__diced__taco.n.01", "cooked__diced__tenderloin.n.01", "cooked__diced__toast.n.01", @@ -6364,8 +6356,6 @@ "cooked__ginger.n.01", "cooked__granola.n.01", "cooked__granulated_salt.n.01", - "cooked__granulated_sugar.n.01", - "cooked__grated_cheese.n.01", "cooked__gravy.n.01", "cooked__green_tea.n.01", "cooked__green_tea_latte.n.01", @@ -6403,18 +6393,6 @@ "cooked__marjoram.n.01", "cooked__mashed_potato.n.01", "cooked__mayonnaise.n.01", - "cooked__melted__bleu.n.01", - "cooked__melted__butter.n.01", - "cooked__melted__cane_sugar.n.01", - "cooked__melted__cheddar.n.01", - "cooked__melted__chocolate.n.01", - "cooked__melted__feta.n.01", - "cooked__melted__granulated_sugar.n.01", - "cooked__melted__grated_cheese.n.01", - "cooked__melted__mozzarella.n.01", - "cooked__melted__parmesan.n.01", - "cooked__melted__swiss_cheese.n.01", - "cooked__melted__white_chocolate.n.01", "cooked__meringue.n.01", "cooked__milkshake.n.01", "cooked__miso.n.01", @@ -6434,7 +6412,6 @@ "cooked__orzo.n.01", "cooked__pancake_batter.n.01", "cooked__paprika.n.01", - "cooked__parmesan.n.01", "cooked__pea.n.01", "cooked__peanut.n.01", "cooked__peanut_butter.n.01", @@ -41035,18 +41012,6 @@ "cooked__marinara.n.01", "cooked__mashed_potato.n.01", "cooked__mayonnaise.n.01", - "cooked__melted__bleu.n.01", - "cooked__melted__butter.n.01", - "cooked__melted__cane_sugar.n.01", - "cooked__melted__cheddar.n.01", - "cooked__melted__chocolate.n.01", - "cooked__melted__feta.n.01", - "cooked__melted__granulated_sugar.n.01", - "cooked__melted__grated_cheese.n.01", - "cooked__melted__mozzarella.n.01", - "cooked__melted__parmesan.n.01", - "cooked__melted__swiss_cheese.n.01", - "cooked__melted__white_chocolate.n.01", "cooked__meringue.n.01", "cooked__milkshake.n.01", "cooked__miso.n.01", @@ -41479,7 +41444,6 @@ "cooked__diced__cantaloup.n.01", "cooked__diced__carne_asada.n.01", "cooked__diced__chard.n.01", - "cooked__diced__cheddar.n.01", "cooked__diced__chicken.n.01", "cooked__diced__chicken_breast.n.01", "cooked__diced__chicken_tender.n.01", @@ -41496,7 +41460,6 @@ "cooked__diced__doughnut.n.01", "cooked__diced__dried_apricot.n.01", "cooked__diced__durian.n.01", - "cooked__diced__feta.n.01", "cooked__diced__frankfurter_bun.n.01", "cooked__diced__french_fries.n.01", "cooked__diced__french_toast.n.01", @@ -41524,8 +41487,6 @@ "cooked__diced__virginia_ham.n.01", "cooked__diced__zucchini.n.01", "cooked__fritter_batter.n.01", - "cooked__granulated_sugar.n.01", - "cooked__grated_cheese.n.01", "cooked__ground_beef.n.01", "cooked__kidney_bean.n.01", "cooked__marinade.n.01", @@ -42009,18 +41970,6 @@ "cooked__marinara.n.01", "cooked__mashed_potato.n.01", "cooked__mayonnaise.n.01", - "cooked__melted__bleu.n.01", - "cooked__melted__butter.n.01", - "cooked__melted__cane_sugar.n.01", - "cooked__melted__cheddar.n.01", - "cooked__melted__chocolate.n.01", - "cooked__melted__feta.n.01", - "cooked__melted__granulated_sugar.n.01", - "cooked__melted__grated_cheese.n.01", - "cooked__melted__mozzarella.n.01", - "cooked__melted__parmesan.n.01", - "cooked__melted__swiss_cheese.n.01", - "cooked__melted__white_chocolate.n.01", "cooked__meringue.n.01", "cooked__milkshake.n.01", "cooked__miso.n.01", @@ -42421,7 +42370,6 @@ "cooked__brownie_batter.n.01", "cooked__cafe_au_lait.n.01", "cooked__cake_mix.n.01", - "cooked__cane_sugar.n.01", "cooked__canola_oil.n.01", "cooked__caraway_seed.n.01", "cooked__cardamom.n.01", @@ -42437,7 +42385,6 @@ "cooked__chicken_soup.n.01", "cooked__chickpea.n.01", "cooked__chili_powder.n.01", - "cooked__chocolate_kiss.n.01", "cooked__chocolate_sauce.n.01", "cooked__cider.n.01", "cooked__cinnamon.n.01", @@ -42486,7 +42433,6 @@ "cooked__diced__bell_pepper.n.01", "cooked__diced__biscuit_dough.n.01", "cooked__diced__blackberry.n.01", - "cooked__diced__bleu.n.01", "cooked__diced__bok_choy.n.01", "cooked__diced__bratwurst.n.01", "cooked__diced__brisket.n.01", @@ -42496,7 +42442,6 @@ "cooked__diced__brownie.n.01", "cooked__diced__brussels_sprouts.n.01", "cooked__diced__burrito.n.01", - "cooked__diced__butter.n.01", "cooked__diced__butter_cookie.n.01", "cooked__diced__buttermilk_pancake.n.01", "cooked__diced__butternut_squash.n.01", @@ -42507,7 +42452,6 @@ "cooked__diced__celery.n.01", "cooked__diced__chanterelle.n.01", "cooked__diced__chard.n.01", - "cooked__diced__cheddar.n.01", "cooked__diced__cheese_tart.n.01", "cooked__diced__cheesecake.n.01", "cooked__diced__cherry.n.01", @@ -42547,7 +42491,6 @@ "cooked__diced__eggplant.n.01", "cooked__diced__enchilada.n.01", "cooked__diced__fennel.n.01", - "cooked__diced__feta.n.01", "cooked__diced__fillet.n.01", "cooked__diced__frank.n.01", "cooked__diced__frankfurter_bun.n.01", @@ -42592,7 +42535,6 @@ "cooked__diced__meat_loaf.n.01", "cooked__diced__meatball.n.01", "cooked__diced__melon.n.01", - "cooked__diced__mozzarella.n.01", "cooked__diced__muffin.n.01", "cooked__diced__mushroom.n.01", "cooked__diced__mustard.n.01", @@ -42652,7 +42594,6 @@ "cooked__diced__sugar_cookie_dough.n.01", "cooked__diced__sushi.n.01", "cooked__diced__sweet_corn.n.01", - "cooked__diced__swiss_cheese.n.01", "cooked__diced__taco.n.01", "cooked__diced__tenderloin.n.01", "cooked__diced__toast.n.01", @@ -42690,8 +42631,6 @@ "cooked__ginger.n.01", "cooked__granola.n.01", "cooked__granulated_salt.n.01", - "cooked__granulated_sugar.n.01", - "cooked__grated_cheese.n.01", "cooked__gravy.n.01", "cooked__green_tea.n.01", "cooked__green_tea_latte.n.01", @@ -42729,18 +42668,6 @@ "cooked__marjoram.n.01", "cooked__mashed_potato.n.01", "cooked__mayonnaise.n.01", - "cooked__melted__bleu.n.01", - "cooked__melted__butter.n.01", - "cooked__melted__cane_sugar.n.01", - "cooked__melted__cheddar.n.01", - "cooked__melted__chocolate.n.01", - "cooked__melted__feta.n.01", - "cooked__melted__granulated_sugar.n.01", - "cooked__melted__grated_cheese.n.01", - "cooked__melted__mozzarella.n.01", - "cooked__melted__parmesan.n.01", - "cooked__melted__swiss_cheese.n.01", - "cooked__melted__white_chocolate.n.01", "cooked__meringue.n.01", "cooked__milkshake.n.01", "cooked__miso.n.01", @@ -42760,7 +42687,6 @@ "cooked__orzo.n.01", "cooked__pancake_batter.n.01", "cooked__paprika.n.01", - "cooked__parmesan.n.01", "cooked__pea.n.01", "cooked__peanut.n.01", "cooked__peanut_butter.n.01", @@ -43552,7 +43478,6 @@ "cooked__brownie_batter.n.01", "cooked__cafe_au_lait.n.01", "cooked__cake_mix.n.01", - "cooked__cane_sugar.n.01", "cooked__canola_oil.n.01", "cooked__caraway_seed.n.01", "cooked__cardamom.n.01", @@ -43568,7 +43493,6 @@ "cooked__chicken_soup.n.01", "cooked__chickpea.n.01", "cooked__chili_powder.n.01", - "cooked__chocolate_kiss.n.01", "cooked__chocolate_sauce.n.01", "cooked__cider.n.01", "cooked__cinnamon.n.01", @@ -43618,7 +43542,6 @@ "cooked__diced__bell_pepper.n.01", "cooked__diced__biscuit_dough.n.01", "cooked__diced__blackberry.n.01", - "cooked__diced__bleu.n.01", "cooked__diced__bok_choy.n.01", "cooked__diced__bratwurst.n.01", "cooked__diced__brisket.n.01", @@ -43628,7 +43551,6 @@ "cooked__diced__brownie.n.01", "cooked__diced__brussels_sprouts.n.01", "cooked__diced__burrito.n.01", - "cooked__diced__butter.n.01", "cooked__diced__butter_cookie.n.01", "cooked__diced__buttermilk_pancake.n.01", "cooked__diced__butternut_squash.n.01", @@ -43639,7 +43561,6 @@ "cooked__diced__celery.n.01", "cooked__diced__chanterelle.n.01", "cooked__diced__chard.n.01", - "cooked__diced__cheddar.n.01", "cooked__diced__cheese_tart.n.01", "cooked__diced__cheesecake.n.01", "cooked__diced__cherry.n.01", @@ -43679,7 +43600,6 @@ "cooked__diced__eggplant.n.01", "cooked__diced__enchilada.n.01", "cooked__diced__fennel.n.01", - "cooked__diced__feta.n.01", "cooked__diced__fillet.n.01", "cooked__diced__frank.n.01", "cooked__diced__frankfurter_bun.n.01", @@ -43724,7 +43644,6 @@ "cooked__diced__meat_loaf.n.01", "cooked__diced__meatball.n.01", "cooked__diced__melon.n.01", - "cooked__diced__mozzarella.n.01", "cooked__diced__muffin.n.01", "cooked__diced__mushroom.n.01", "cooked__diced__mustard.n.01", @@ -43784,7 +43703,6 @@ "cooked__diced__sugar_cookie_dough.n.01", "cooked__diced__sushi.n.01", "cooked__diced__sweet_corn.n.01", - "cooked__diced__swiss_cheese.n.01", "cooked__diced__taco.n.01", "cooked__diced__tenderloin.n.01", "cooked__diced__toast.n.01", @@ -43822,8 +43740,6 @@ "cooked__ginger.n.01", "cooked__granola.n.01", "cooked__granulated_salt.n.01", - "cooked__granulated_sugar.n.01", - "cooked__grated_cheese.n.01", "cooked__gravy.n.01", "cooked__green_tea.n.01", "cooked__green_tea_latte.n.01", @@ -43861,18 +43777,6 @@ "cooked__marjoram.n.01", "cooked__mashed_potato.n.01", "cooked__mayonnaise.n.01", - "cooked__melted__bleu.n.01", - "cooked__melted__butter.n.01", - "cooked__melted__cane_sugar.n.01", - "cooked__melted__cheddar.n.01", - "cooked__melted__chocolate.n.01", - "cooked__melted__feta.n.01", - "cooked__melted__granulated_sugar.n.01", - "cooked__melted__grated_cheese.n.01", - "cooked__melted__mozzarella.n.01", - "cooked__melted__parmesan.n.01", - "cooked__melted__swiss_cheese.n.01", - "cooked__melted__white_chocolate.n.01", "cooked__meringue.n.01", "cooked__milkshake.n.01", "cooked__miso.n.01", @@ -43892,7 +43796,6 @@ "cooked__orzo.n.01", "cooked__pancake_batter.n.01", "cooked__paprika.n.01", - "cooked__parmesan.n.01", "cooked__pea.n.01", "cooked__peanut.n.01", "cooked__peanut_butter.n.01", @@ -45450,7 +45353,6 @@ "black_bean.n.01", "black_pepper.n.02", "blackberry.n.01", - "bleu.n.01", "blueberry.n.02", "blueberry_compote.n.01", "blueberry_mousse.n.01", @@ -45471,14 +45373,12 @@ "brownie_batter.n.01", "brussels_sprouts.n.01", "burrito.n.01", - "butter.n.01", "butter_cookie.n.01", "buttermilk_pancake.n.01", "butternut_squash.n.01", "cactus.n.01", "cafe_au_lait.n.01", "cake_mix.n.01", - "cane_sugar.n.02", "canola_oil.n.01", "cantaloup.n.02", "caraway_seed.n.01", @@ -45493,7 +45393,6 @@ "celery.n.02", "chanterelle.n.01", "chard.n.02", - "cheddar.n.02", "cheese_pastry_filling.n.01", "cheese_sauce.n.01", "cheese_tart.n.01", @@ -45516,12 +45415,10 @@ "chili_powder.n.01", "chinese_anise.n.02", "chives.n.01", - "chocolate_bar.n.01", "chocolate_biscuit.n.01", "chocolate_cake.n.01", "chocolate_chip_cookie.n.01", "chocolate_cookie_dough.n.01", - "chocolate_kiss.n.01", "chocolate_sauce.n.01", "chopped__lettuce.n.01", "chorizo.n.01", @@ -45591,7 +45488,6 @@ "diced__bell_pepper.n.01", "diced__biscuit_dough.n.01", "diced__blackberry.n.01", - "diced__bleu.n.01", "diced__bok_choy.n.01", "diced__bratwurst.n.01", "diced__brisket.n.01", @@ -45601,7 +45497,6 @@ "diced__brownie.n.01", "diced__brussels_sprouts.n.01", "diced__burrito.n.01", - "diced__butter.n.01", "diced__butter_cookie.n.01", "diced__buttermilk_pancake.n.01", "diced__butternut_squash.n.01", @@ -45612,7 +45507,6 @@ "diced__celery.n.01", "diced__chanterelle.n.01", "diced__chard.n.01", - "diced__cheddar.n.01", "diced__cheese_tart.n.01", "diced__cheesecake.n.01", "diced__cherry.n.01", @@ -45652,7 +45546,6 @@ "diced__eggplant.n.01", "diced__enchilada.n.01", "diced__fennel.n.01", - "diced__feta.n.01", "diced__fillet.n.01", "diced__frank.n.01", "diced__frankfurter_bun.n.01", @@ -45697,7 +45590,6 @@ "diced__meat_loaf.n.01", "diced__meatball.n.01", "diced__melon.n.01", - "diced__mozzarella.n.01", "diced__muffin.n.01", "diced__mushroom.n.01", "diced__mustard.n.01", @@ -45757,7 +45649,6 @@ "diced__sugar_cookie_dough.n.01", "diced__sushi.n.01", "diced__sweet_corn.n.01", - "diced__swiss_cheese.n.01", "diced__taco.n.01", "diced__tenderloin.n.01", "diced__toast.n.01", @@ -45822,10 +45713,8 @@ "granola.n.01", "granola_bar.n.01", "granulated_salt.n.01", - "granulated_sugar.n.01", "grape.n.01", "grapefruit.n.02", - "grated_cheese.n.01", "gravy.n.01", "green_bean.n.01", "green_onion.n.01", @@ -45860,7 +45749,6 @@ "half__bell_pepper.n.01", "half__biscuit_dough.n.01", "half__blackberry.n.01", - "half__bleu.n.01", "half__bok_choy.n.01", "half__bratwurst.n.01", "half__brisket.n.01", @@ -45870,8 +45758,6 @@ "half__brownie.n.01", "half__brussels_sprouts.n.01", "half__burrito.n.01", - "half__butter.n.01", - "half__butter_cookie.n.01", "half__buttermilk_pancake.n.01", "half__butternut_squash.n.01", "half__candied_yam.n.01", @@ -45882,7 +45768,6 @@ "half__celery.n.01", "half__chanterelle.n.01", "half__chard.n.01", - "half__cheddar.n.01", "half__cheese_danish.n.01", "half__cheese_tart.n.01", "half__cheesecake.n.01", @@ -45925,7 +45810,6 @@ "half__eggplant.n.01", "half__enchilada.n.01", "half__fennel.n.01", - "half__feta.n.01", "half__fillet.n.01", "half__frank.n.01", "half__frankfurter_bun.n.01", @@ -45973,7 +45857,6 @@ "half__marshmallow.n.01", "half__meat_loaf.n.01", "half__meatball.n.01", - "half__mozzarella.n.01", "half__muffin.n.01", "half__mushroom.n.01", "half__mustard.n.01", @@ -46040,7 +45923,6 @@ "half__sugar_cookie_dough.n.01", "half__sushi.n.01", "half__sweet_corn.n.01", - "half__swiss_cheese.n.01", "half__taco.n.01", "half__tenderloin.n.01", "half__toast.n.01", @@ -46112,7 +45994,6 @@ "lime_juice.n.01", "limeade.n.01", "lobster.n.01", - "lump_sugar.n.01", "macaroni.n.02", "macaroni_and_cheese.n.01", "macaroon.n.01", @@ -46128,25 +46009,12 @@ "mayonnaise.n.01", "meat_loaf.n.01", "meatball.n.01", - "melted__bleu.n.01", - "melted__butter.n.01", - "melted__cane_sugar.n.01", - "melted__cheddar.n.01", - "melted__chocolate.n.01", - "melted__feta.n.01", - "melted__granulated_sugar.n.01", - "melted__grated_cheese.n.01", - "melted__mozzarella.n.01", - "melted__parmesan.n.01", - "melted__swiss_cheese.n.01", - "melted__white_chocolate.n.01", "meringue.n.01", "milkshake.n.01", "mint.n.02", "mint.n.04", "miso.n.01", "molasses.n.01", - "mozzarella.n.01", "muffin.n.01", "muffin_batter.n.01", "mushroom.n.05", @@ -46173,7 +46041,6 @@ "pancake_batter.n.01", "papaya.n.02", "paprika.n.02", - "parmesan.n.01", "parsley.n.02", "parsnip.n.03", "pastry.n.01", @@ -46285,7 +46152,6 @@ "sunflower_seed.n.01", "sushi.n.01", "sweet_corn.n.02", - "swiss_cheese.n.01", "taco.n.02", "tea_bag.n.01", "tenderloin.n.02", @@ -46318,7 +46184,6 @@ "watermelon.n.02", "wheat.n.02", "whipped_cream.n.01", - "white_chocolate.n.01", "white_rice.n.01", "white_turnip.n.02", "white_wine.n.01", @@ -46379,7 +46244,6 @@ "cooked__brown_rice.n.01", "cooked__brown_sugar.n.01", "cooked__cake_mix.n.01", - "cooked__cane_sugar.n.01", "cooked__caraway_seed.n.01", "cooked__cardamom.n.01", "cooked__cayenne.n.01", @@ -46399,7 +46263,6 @@ "cooked__flour.n.01", "cooked__ginger.n.01", "cooked__granulated_salt.n.01", - "cooked__granulated_sugar.n.01", "cooked__ground_beef.n.01", "cooked__ground_coffee.n.01", "cooked__instant_coffee.n.01", @@ -46415,7 +46278,6 @@ "cooked__onion_powder.n.01", "cooked__orange_zest.n.01", "cooked__paprika.n.01", - "cooked__parmesan.n.01", "cooked__poultry_seasoning.n.01", "cooked__pumpkin_pie_spice.n.01", "cooked__pumpkin_seed.n.01", @@ -46570,7 +46432,6 @@ "cooked__blueberry.n.01", "cooked__cashew.n.01", "cooked__chickpea.n.01", - "cooked__chocolate_kiss.n.01", "cooked__coconut.n.01", "cooked__coffee_bean.n.01", "cooked__cranberry.n.01", @@ -46597,7 +46458,6 @@ "cooked__diced__bell_pepper.n.01", "cooked__diced__biscuit_dough.n.01", "cooked__diced__blackberry.n.01", - "cooked__diced__bleu.n.01", "cooked__diced__bok_choy.n.01", "cooked__diced__bratwurst.n.01", "cooked__diced__brisket.n.01", @@ -46607,7 +46467,6 @@ "cooked__diced__brownie.n.01", "cooked__diced__brussels_sprouts.n.01", "cooked__diced__burrito.n.01", - "cooked__diced__butter.n.01", "cooked__diced__butter_cookie.n.01", "cooked__diced__buttermilk_pancake.n.01", "cooked__diced__butternut_squash.n.01", @@ -46618,7 +46477,6 @@ "cooked__diced__celery.n.01", "cooked__diced__chanterelle.n.01", "cooked__diced__chard.n.01", - "cooked__diced__cheddar.n.01", "cooked__diced__cheese_tart.n.01", "cooked__diced__cheesecake.n.01", "cooked__diced__cherry.n.01", @@ -46658,7 +46516,6 @@ "cooked__diced__eggplant.n.01", "cooked__diced__enchilada.n.01", "cooked__diced__fennel.n.01", - "cooked__diced__feta.n.01", "cooked__diced__fillet.n.01", "cooked__diced__frank.n.01", "cooked__diced__frankfurter_bun.n.01", @@ -46703,7 +46560,6 @@ "cooked__diced__meat_loaf.n.01", "cooked__diced__meatball.n.01", "cooked__diced__melon.n.01", - "cooked__diced__mozzarella.n.01", "cooked__diced__muffin.n.01", "cooked__diced__mushroom.n.01", "cooked__diced__mustard.n.01", @@ -46763,7 +46619,6 @@ "cooked__diced__sugar_cookie_dough.n.01", "cooked__diced__sushi.n.01", "cooked__diced__sweet_corn.n.01", - "cooked__diced__swiss_cheese.n.01", "cooked__diced__taco.n.01", "cooked__diced__tenderloin.n.01", "cooked__diced__toast.n.01", @@ -46789,7 +46644,6 @@ "cooked__diced__zucchini.n.01", "cooked__dog_food.n.01", "cooked__granola.n.01", - "cooked__grated_cheese.n.01", "cooked__green_tea.n.01", "cooked__jelly_bean.n.01", "cooked__kidney_bean.n.01", @@ -47349,10 +47203,13 @@ "bathtub.n.01", "bed.n.01", "bench.n.01", + "blackboard.n.01", "booth.n.01", "breakfast_table.n.01", "cabinet.n.01", + "cabinet.n.03", "ceiling.n.01", + "chair.n.01", "chaise_longue.n.01", "checkout.n.03", "chest_of_drawers.n.01", @@ -47366,6 +47223,7 @@ "deep-freeze.n.02", "desk.n.01", "dishwasher.n.01", + "display_panel.n.01", "door.n.01", "driveway.n.01", "eames_chair.n.01", @@ -47381,9 +47239,12 @@ "gate.n.01", "grandfather_clock.n.01", "grill.n.02", + "highchair.n.01", + "hot_tub.n.02", "keyboard_instrument.n.01", "kitchen_table.n.01", "lawn.n.01", + "lawn_chair.n.01", "microwave.n.02", "mirror.n.01", "nozzle.n.01", @@ -47552,15 +47413,6 @@ "cheddar.n.02", "chocolate_bar.n.01", "chocolate_kiss.n.01", - "cooked__cane_sugar.n.01", - "cooked__chocolate_kiss.n.01", - "cooked__diced__bleu.n.01", - "cooked__diced__butter.n.01", - "cooked__diced__cheddar.n.01", - "cooked__diced__feta.n.01", - "cooked__diced__mozzarella.n.01", - "cooked__diced__swiss_cheese.n.01", - "cooked__grated_cheese.n.01", "diced__bleu.n.01", "diced__butter.n.01", "diced__cheddar.n.01", @@ -47579,6 +47431,7 @@ "kiss.n.03", "lump_sugar.n.01", "mozzarella.n.01", + "parmesan.n.01", "swiss_cheese.n.01", "white_chocolate.n.01" ], diff --git a/bddl/generated_data/syn_prop_annots_canonical.json b/bddl/generated_data/syn_prop_annots_canonical.json index ff34c198..26e5af3e 100644 --- a/bddl/generated_data/syn_prop_annots_canonical.json +++ b/bddl/generated_data/syn_prop_annots_canonical.json @@ -2596,6 +2596,7 @@ "freezable": {} }, "blackboard.n.01": { + "sceneObject": {}, "rigidBody": {}, "nonSubstance": {}, "wetable": {}, @@ -2697,7 +2698,6 @@ "freezable": {} }, "bleu.n.01": { - "cookable": {}, "sliceable": {}, "meltable": {}, "softBody": {}, @@ -6937,7 +6937,6 @@ "freezable": {} }, "butter.n.01": { - "cookable": {}, "sliceable": {}, "meltable": {}, "rigidBody": {}, @@ -7025,6 +7024,7 @@ "cabinet.n.03": { "breakable": {}, "openable": {}, + "sceneObject": {}, "rigidBody": {}, "nonSubstance": {}, "wetable": {}, @@ -7463,7 +7463,6 @@ "freezable": {} }, "cane_sugar.n.02": { - "cookable": {}, "meltable": {}, "microPhysicalSubstance": {}, "substance": {}, @@ -8687,7 +8686,6 @@ }, "cheddar.n.02": { "flammable": {}, - "cookable": {}, "sliceable": {}, "meltable": {}, "softBody": {}, @@ -9265,7 +9263,6 @@ "freezable": {} }, "chocolate_bar.n.01": { - "cookable": {}, "meltable": {}, "rigidBody": {}, "nonSubstance": {}, @@ -9365,7 +9362,6 @@ "freezable": {} }, "chocolate_kiss.n.01": { - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -10809,13 +10805,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__granulated_sugar.n.01": { - "flammable": {}, - "microPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__ground_beef.n.01": { "flammable": {}, "microPhysicalSubstance": {}, @@ -10859,13 +10848,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__melted__butter.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__noodle.n.01": { "flammable": {}, "macroPhysicalSubstance": {}, @@ -12461,7 +12443,6 @@ }, "diced__cheddar.n.01": { "flammable": {}, - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -12509,7 +12490,6 @@ }, "diced__feta.n.01": { "flammable": {}, - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -12829,6 +12809,7 @@ "freezable": {} }, "display_panel.n.01": { + "sceneObject": {}, "rigidBody": {}, "nonSubstance": {}, "wetable": {}, @@ -15583,7 +15564,6 @@ "freezable": {} }, "granulated_sugar.n.01": { - "cookable": {}, "meltable": {}, "microPhysicalSubstance": {}, "substance": {}, @@ -15665,7 +15645,6 @@ }, "grated_cheese.n.01": { "flammable": {}, - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -16203,7 +16182,6 @@ "freezable": {} }, "half__feta.n.01": { - "cookable": {}, "diceable": {}, "meltable": {}, "softBody": {}, @@ -17135,6 +17113,7 @@ }, "highchair.n.01": { "breakable": {}, + "sceneObject": {}, "rigidBody": {}, "nonSubstance": {}, "wetable": {}, @@ -17384,6 +17363,7 @@ "hot_tub.n.02": { "fillable": {}, "toggleable": {}, + "sceneObject": {}, "rigidBody": {}, "nonSubstance": {}, "wetable": {}, @@ -17684,6 +17664,14 @@ "physicalSubstance": {}, "freezable": {} }, + "cooked__iced_chocolate.n.01": { + "breakable": {}, + "liquid": {}, + "boilable": {}, + "substance": {}, + "physicalSubstance": {}, + "freezable": {} + }, "iced_chocolate.n.01": { "breakable": {}, "cookable": {}, @@ -19070,6 +19058,7 @@ "freezable": {} }, "lawn_chair.n.01": { + "sceneObject": {}, "rigidBody": {}, "nonSubstance": {}, "wetable": {}, @@ -20065,7 +20054,6 @@ "freezable": {} }, "lump_sugar.n.01": { - "cookable": {}, "meltable": {}, "rigidBody": {}, "nonSubstance": {}, @@ -20805,7 +20793,6 @@ "freezable": {} }, "melted__butter.n.01": { - "cookable": {}, "liquid": {}, "boilable": {}, "substance": {}, @@ -20813,7 +20800,6 @@ "freezable": {} }, "melted__cheddar.n.01": { - "cookable": {}, "liquid": {}, "boilable": {}, "substance": {}, @@ -20821,7 +20807,6 @@ "freezable": {} }, "melted__grated_cheese.n.01": { - "cookable": {}, "liquid": {}, "boilable": {}, "substance": {}, @@ -20829,7 +20814,6 @@ "freezable": {} }, "melted__parmesan.n.01": { - "cookable": {}, "liquid": {}, "boilable": {}, "substance": {}, @@ -20837,7 +20821,6 @@ "freezable": {} }, "melted__white_chocolate.n.01": { - "cookable": {}, "liquid": {}, "boilable": {}, "substance": {}, @@ -21276,7 +21259,6 @@ "freezable": {} }, "mozzarella.n.01": { - "cookable": {}, "sliceable": {}, "meltable": {}, "softBody": {}, @@ -21763,6 +21745,13 @@ "heatable": {}, "freezable": {} }, + "cooked__nut_butter.n.01": { + "liquid": {}, + "boilable": {}, + "substance": {}, + "physicalSubstance": {}, + "freezable": {} + }, "nut_butter.n.01": { "cookable": {}, "liquid": {}, @@ -22620,7 +22609,7 @@ "freezable": {} }, "parmesan.n.01": { - "cookable": {}, + "meltable": {}, "microPhysicalSubstance": {}, "substance": {}, "physicalSubstance": {}, @@ -22876,6 +22865,13 @@ "heatable": {}, "freezable": {} }, + "cooked__peanut_butter.n.01": { + "liquid": {}, + "boilable": {}, + "substance": {}, + "physicalSubstance": {}, + "freezable": {} + }, "peanut_butter.n.01": { "cookable": {}, "liquid": {}, @@ -30091,7 +30087,6 @@ "freezable": {} }, "swiss_cheese.n.01": { - "cookable": {}, "sliceable": {}, "meltable": {}, "rigidBody": {}, @@ -33237,7 +33232,6 @@ "freezable": {} }, "white_chocolate.n.01": { - "cookable": {}, "meltable": {}, "rigidBody": {}, "nonSubstance": {}, @@ -35898,7 +35892,6 @@ }, "half__cheddar.n.01": { "flammable": {}, - "cookable": {}, "diceable": {}, "meltable": {}, "softBody": {}, @@ -36518,7 +36511,6 @@ "freezable": {} }, "half__swiss_cheese.n.01": { - "cookable": {}, "diceable": {}, "meltable": {}, "rigidBody": {}, @@ -36538,7 +36530,6 @@ "freezable": {} }, "half__bleu.n.01": { - "cookable": {}, "diceable": {}, "meltable": {}, "softBody": {}, @@ -37316,7 +37307,6 @@ }, "half__butter_cookie.n.01": { "flammable": {}, - "cookable": {}, "diceable": {}, "rigidBody": {}, "nonSubstance": {}, @@ -37757,7 +37747,6 @@ "freezable": {} }, "half__butter.n.01": { - "cookable": {}, "diceable": {}, "meltable": {}, "rigidBody": {}, @@ -37873,7 +37862,6 @@ "freezable": {} }, "half__mozzarella.n.01": { - "cookable": {}, "diceable": {}, "meltable": {}, "softBody": {}, @@ -38632,7 +38620,6 @@ "freezable": {} }, "diced__swiss_cheese.n.01": { - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -38717,7 +38704,6 @@ "freezable": {} }, "diced__bleu.n.01": { - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -38890,7 +38876,6 @@ "freezable": {} }, "diced__butter.n.01": { - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -39635,7 +39620,6 @@ "freezable": {} }, "diced__mozzarella.n.01": { - "cookable": {}, "meltable": {}, "macroPhysicalSubstance": {}, "substance": {}, @@ -39858,14 +39842,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__diced__feta.n.01": { - "flammable": {}, - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__diced__walnut.n.01": { "macroPhysicalSubstance": {}, "substance": {}, @@ -39892,13 +39868,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__diced__mozzarella.n.01": { - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__diced__sweet_corn.n.01": { "flammable": {}, "macroPhysicalSubstance": {}, @@ -40089,13 +40058,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__diced__bleu.n.01": { - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__diced__pastry.n.01": { "macroPhysicalSubstance": {}, "substance": {}, @@ -40457,13 +40419,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__diced__swiss_cheese.n.01": { - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__diced__avocado.n.01": { "macroPhysicalSubstance": {}, "substance": {}, @@ -40599,14 +40554,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__diced__cheddar.n.01": { - "flammable": {}, - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__diced__pear.n.01": { "macroPhysicalSubstance": {}, "substance": {}, @@ -40801,20 +40748,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__diced__butter_cookie.n.01": { - "flammable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__diced__butter.n.01": { - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__diced__chicken_breast.n.01": { "flammable": {}, "macroPhysicalSubstance": {}, @@ -40958,14 +40891,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__grated_cheese.n.01": { - "flammable": {}, - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__whole_milk.n.01": { "liquid": {}, "boilable": {}, @@ -40994,13 +40919,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__melted__grated_cheese.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__yogurt.n.01": { "liquid": {}, "boilable": {}, @@ -41078,13 +40996,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__peanut_butter.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__custard.n.01": { "liquid": {}, "boilable": {}, @@ -41272,13 +41183,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__cane_sugar.n.01": { - "meltable": {}, - "microPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__ravioli.n.01": { "flammable": {}, "macroPhysicalSubstance": {}, @@ -41307,13 +41211,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__melted__cheddar.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__coriander.n.01": { "microPhysicalSubstance": {}, "substance": {}, @@ -41385,13 +41282,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__chocolate_kiss.n.01": { - "meltable": {}, - "macroPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__brownie_batter.n.01": { "liquid": {}, "boilable": {}, @@ -41472,13 +41362,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__melted__parmesan.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__nutmeg.n.01": { "microPhysicalSubstance": {}, "substance": {}, @@ -41517,12 +41400,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__parmesan.n.01": { - "microPhysicalSubstance": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__orange_juice.n.01": { "liquid": {}, "boilable": {}, @@ -41795,14 +41672,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__iced_chocolate.n.01": { - "breakable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__tomato_paste.n.01": { "liquid": {}, "boilable": {}, @@ -41973,20 +41842,6 @@ "physicalSubstance": {}, "freezable": {} }, - "cooked__melted__white_chocolate.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__nut_butter.n.01": { - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, "cooked__drip_coffee.n.01": { "liquid": {}, "boilable": {}, @@ -42098,14 +41953,6 @@ "freezable": {} }, "melted__chocolate.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__chocolate.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42113,14 +41960,6 @@ "freezable": {} }, "melted__cane_sugar.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__cane_sugar.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42128,14 +41967,6 @@ "freezable": {} }, "melted__feta.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__feta.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42143,14 +41974,6 @@ "freezable": {} }, "melted__granulated_sugar.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__granulated_sugar.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42158,14 +41981,6 @@ "freezable": {} }, "melted__mozzarella.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__mozzarella.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42173,14 +41988,6 @@ "freezable": {} }, "melted__swiss_cheese.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__swiss_cheese.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42188,14 +41995,6 @@ "freezable": {} }, "melted__bleu.n.01": { - "cookable": {}, - "liquid": {}, - "boilable": {}, - "substance": {}, - "physicalSubstance": {}, - "freezable": {} - }, - "cooked__melted__bleu.n.01": { "liquid": {}, "boilable": {}, "substance": {}, @@ -42672,5 +42471,12 @@ "substance": {}, "physicalSubstance": {}, "freezable": {} + }, + "cooked__diced__butter_cookie.n.01": { + "flammable": {}, + "macroPhysicalSubstance": {}, + "substance": {}, + "physicalSubstance": {}, + "freezable": {} } } \ No newline at end of file diff --git a/bddl/generated_data/synsets.csv b/bddl/generated_data/synsets.csv index d58ef12a..d74700eb 100644 --- a/bddl/generated_data/synsets.csv +++ b/bddl/generated_data/synsets.csv @@ -159,13 +159,13 @@ black_bean.n.01,common_bean.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,mac black_pepper.n.02,pepper.n.03,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance blackberry.n.01,"berry.n.01,drupelet.n.01",0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody blackboard_eraser.n.01,eraser.n.01,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -blackboard.n.01,sheet.n.06,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +blackboard.n.01,sheet.n.06,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody blade.n.09,cutting_implement.n.01,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,rigidBody blanket.n.01,bedclothes.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,cloth bleaching_agent__atomizer.n.01,dispenser.n.01,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,rigidBody bleaching_agent.n.01,agent.n.03,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid blender.n.01,mixer.n.04,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -bleu.n.01,cheese.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,softBody +bleu.n.01,cheese.n.01,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,softBody blouse.n.01,top.n.10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,cloth blueberry_compote.n.01,compote.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid blueberry_mousse.n.01,mousse.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -412,12 +412,12 @@ bust.n.03,sculpture.n.01,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody butane.n.01,"fuel.n.01,gas.n.02,methane_series.n.01",0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid butter__package.n.01,container.n.01,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody butter_cookie.n.01,cookie.n.01,0,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -butter.n.01,"dairy_product.n.01,food.n.02",0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody +butter.n.01,"dairy_product.n.01,food.n.02",0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody buttermilk_pancake.n.01,pancake.n.01,0,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody buttermilk.n.01,milk.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid butternut_squash.n.01,winter_squash.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody cabinet.n.01,furniture.n.01,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,rigidBody -cabinet.n.03,compartment.n.02,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +cabinet.n.03,compartment.n.02,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody cabinet.n.04,housing.n.02,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody cable.n.02,conductor.n.04,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rope cactus.n.01,succulent.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -444,7 +444,7 @@ can.n.01,container.n.01,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody candlestick.n.01,holder.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody candy_cane.n.01,candy.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody candy_dispenser_shelf.n.01,dispenser.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -cane_sugar.n.02,sugar.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,microPhysicalSubstance +cane_sugar.n.02,sugar.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,microPhysicalSubstance canister.n.02,container.n.01,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody canned_food.n.01,foodstuff.n.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody canola_oil.n.01,vegetable_oil.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -522,7 +522,7 @@ charcoal.n.02,writing_implement.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0, chard.n.02,greens.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody charger.n.02,device.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody checkout.n.03,counter.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody -cheddar.n.02,cheese.n.01,0,0,0,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,softBody +cheddar.n.02,cheese.n.01,0,0,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,softBody cheese_sauce.n.01,white_sauce.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cheese_tart.n.01,tart.n.02,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody cheesecake.n.01,cake.n.03,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,softBody @@ -558,12 +558,12 @@ chisel.n.01,edge_tool.n.01,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,rigidBody chives.n.01,alliaceous_plant.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody chlorine__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody chlorine.n.01,"chemical_element.n.01,gas.n.02,halogen.n.01",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -chocolate_bar.n.01,chocolate_candy.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody +chocolate_bar.n.01,chocolate_candy.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody chocolate_biscuit.n.01,cookie.n.01,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody chocolate_cake.n.01,cake.n.03,0,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,softBody chocolate_chip_cookie.n.01,cookie.n.01,0,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody chocolate_cookie_dough.n.01,dough.n.01,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,softBody -chocolate_kiss.n.01,"chocolate_candy.n.01,kiss.n.03",0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +chocolate_kiss.n.01,"chocolate_candy.n.01,kiss.n.03",0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance chocolate_milk.n.01,milk.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid chocolate_sauce__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody chocolate_sauce.n.01,sauce.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -673,14 +673,12 @@ cooked__diced__virginia_ham.n.01,ham.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__diced__zucchini.n.01,summer_squash.n.02,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__flour.n.01,foodstuff.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__fritter_batter.n.01,batter.n.02,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__granulated_sugar.n.01,sugar.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__ground_beef.n.01,beef.n.02,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__kidney_bean.n.01,common_bean.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__lemon-pepper_seasoning.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__marinade.n.01,condiment.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__marinara.n.01,spaghetti_sauce.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__marjoram.n.01,herb.n.02,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance -cooked__melted__butter.n.01,dairy_product.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__noodle.n.01,pasta.n.02,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__olive_oil.n.01,vegetable_oil.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__onion_powder.n.01,flavorer.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance @@ -797,13 +795,13 @@ diced__broccoli.n.01,cruciferous_vegetable.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0, diced__head_cabbage.n.01,cabbage.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__celery.n.01,vegetable.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__chard.n.01,greens.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -diced__cheddar.n.01,cheese.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +diced__cheddar.n.01,cheese.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__chicken_breast.n.01,breast.n.03,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__chicken.n.01,poultry.n.02,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__chili.n.01,hot_pepper.n.02,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__clove.n.01,garlic.n.02,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__cucumber.n.01,vegetable.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -diced__feta.n.01,cheese.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +diced__feta.n.01,cheese.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__green_onion.n.01,onion.n.03,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__kiwi.n.01,edible_fruit.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__lemon.n.01,citrus.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -830,7 +828,7 @@ disinfectant__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, disinfectant.n.01,agent.n.03,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid disk_drive.n.01,drive.n.10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody disk.n.01,round_shape.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -display_panel.n.01,display.n.06,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +display_panel.n.01,display.n.06,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody disposal.n.04,kitchen_appliance.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody diving_board.n.01,springboard.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody dixie_cup.n.01,cup.n.01,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1000,12 +998,12 @@ granola.n.01,cold_cereal.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroP granulated_salt.n.01,flavorer.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance granulated_sugar__jar.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody granulated_sugar__sack.n.01,bag.n.01,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -granulated_sugar.n.01,sugar.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,microPhysicalSubstance +granulated_sugar.n.01,sugar.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,microPhysicalSubstance grape.n.01,edible_fruit.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody grapefruit.n.02,citrus.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody grate.n.01,framework.n.03,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody grated_cheese__sack.n.01,bag.n.01,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -grated_cheese.n.01,cheese.n.01,0,0,0,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +grated_cheese.n.01,cheese.n.01,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance grater.n.01,kitchen_utensil.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody gravel.n.01,rock.n.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance gravestone.n.01,"memorial.n.03,stone.n.02",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1043,7 +1041,7 @@ half__bell_pepper.n.01,sweet_pepper.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0 half__chestnut.n.01,edible_nut.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__coconut.n.01,edible_nut.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__eggplant.n.01,solanaceous_vegetable.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody -half__feta.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody +half__feta.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody half__hard-boiled_egg.n.01,boiled_egg.n.01,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__lemon.n.01,citrus.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__lime.n.01,citrus.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1095,7 +1093,7 @@ hemp.n.01,plant_fiber.n.01,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody herb__jar.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody herbicide__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody herbicide.n.01,chemical.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -highchair.n.01,chair.n.01,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +highchair.n.01,chair.n.01,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody hiking_boot.n.01,boot.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody hinge.n.01,joint.n.05,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody hip.n.05,fruit.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1110,7 +1108,7 @@ hose.n.03,tube.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rope hospital_bed.n.02,furniture.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody hot_sauce__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody hot_sauce.n.01,sauce.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -hot_tub.n.02,vessel.n.03,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +hot_tub.n.02,vessel.n.03,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody hotdog.n.02,sandwich.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody house_paint__can.n.01,container.n.01,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody house_paint.n.01,paint.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,visualSubstance @@ -1129,6 +1127,7 @@ ice_pack.n.01,bag.n.01,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody ice_skate.n.01,skate.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody ice.n.01,crystal.n.01,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody iced_cappuccino.n.01,beverage.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +cooked__iced_chocolate.n.01,beverage.n.01,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid iced_chocolate.n.01,beverage.n.01,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid icepick.n.01,pick.n.06,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,rigidBody icetray.n.02,receptacle.n.01,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1213,7 +1212,7 @@ lantern.n.01,lamp.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody laptop.n.01,portable_computer.n.01,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody lasagna.n.01,pasta.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody lavender.n.01,shrub.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -lawn_chair.n.01,chair.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +lawn_chair.n.01,chair.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody lawn_mower.n.01,garden_tool.n.01,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody lawn.n.01,field.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody leaf_blower.n.01,home_appliance.n.01,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1277,7 +1276,7 @@ low-fat_milk.n.01,milk.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid lubricant__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody lubricant.n.01,substance.n.07,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid luggage_compartment.n.01,compartment.n.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -lump_sugar.n.01,sugar.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody +lump_sugar.n.01,sugar.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody lunch_box.n.01,container.n.01,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody macaroni.n.02,pasta.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance macaroni_and_cheese.n.01,pasta.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1324,11 +1323,11 @@ measuring_cup.n.01,measure.n.09,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigi meat_loaf.n.01,"dish.n.02,loaf_of_bread.n.01",0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody meat_thermometer.n.01,thermometer.n.01,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody meatball.n.01,dish.n.02,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -melted__butter.n.01,dairy_product.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__cheddar.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__grated_cheese.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__parmesan.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__white_chocolate.n.01,chocolate.n.02,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__butter.n.01,dairy_product.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__cheddar.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__grated_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__parmesan.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__white_chocolate.n.01,chocolate.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid menu.n.01,bill.n.07,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody meringue.n.01,topping.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid meter.n.02,measuring_instrument.n.01,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1358,7 +1357,7 @@ mouse.n.04,electronic_device.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ri mousepad.n.01,mat.n.07,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody mousetrap.n.01,trap.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody mouthpiece.n.06,aperture.n.03,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -mozzarella.n.01,cheese.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,softBody +mozzarella.n.01,cheese.n.01,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,softBody mud.n.03,earth.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,visualSubstance muffin.n.01,quick_bread.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,softBody mug.n.04,drinking_vessel.n.01,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1391,6 +1390,7 @@ noodle__jar.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBo noodle.n.01,pasta.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,macroPhysicalSubstance notebook.n.01,book.n.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody notepad.n.01,pad.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +cooked__nut_butter.n.01,spread.n.05,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid nut_butter.n.01,spread.n.05,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid nutmeg__shaker.n.01,container.n.01,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,rigidBody nutmeg.n.02,spice.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance @@ -1446,7 +1446,7 @@ paraffin.n.01,wax.n.01,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody parallel_bars.n.01,gymnastic_apparatus.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody parer.n.02,knife.n.01,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,rigidBody parmesan__shaker.n.01,container.n.01,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,rigidBody -parmesan.n.01,cheese.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance +parmesan.n.01,cheese.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,microPhysicalSubstance parsley.n.02,herb.n.02,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody parsnip.n.03,root_vegetable.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody party_favor.n.01,keepsake.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1462,6 +1462,7 @@ pea_pod.n.01,pod.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody pea.n.01,legume.n.03,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance peach.n.03,"drupe.n.01,edible_fruit.n.01",0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody peanut_butter__jar.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody +cooked__peanut_butter.n.01,spread.n.05,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid peanut_butter.n.01,spread.n.05,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid peanut_oil.n.01,vegetable_oil.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid peanut.n.01,pod.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -1904,7 +1905,7 @@ sweatshirt.n.01,pullover.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,cloth sweet_corn.n.02,corn.n.03,0,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody swimming_pool.n.01,"athletic_facility.n.01,pool.n.01",0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody swing.n.02,"mechanical_device.n.01,plaything.n.01",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -swiss_cheese.n.01,cheese.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody +swiss_cheese.n.01,cheese.n.01,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody switch.n.01,control.n.09,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody swivel_chair.n.01,chair.n.01,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody syringe.n.01,medical_instrument.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -2091,7 +2092,7 @@ whisk.n.01,mixer.n.04,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,rigidBody whiskey__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody whiskey_stone.n.01,rock.n.01,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody whistle.n.04,"acoustic_device.n.01,signaling_device.n.01",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody -white_chocolate.n.01,chocolate.n.02,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody +white_chocolate.n.01,chocolate.n.02,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,rigidBody white_rice__sack.n.01,bag.n.01,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody white_rice.n.01,rice.n.01,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance white_sauce__bottle.n.01,vessel.n.03,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -2246,7 +2247,7 @@ half__meatball.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidB half__parsley.n.01,herb.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__taco.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__cauliflower.n.01,cruciferous_vegetable.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody -half__cheddar.n.01,cheese.n.01,1,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody +half__cheddar.n.01,cheese.n.01,1,0,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody half__bacon.n.01,cut_of_pork.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__rutabaga.n.01,turnip.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__fruitcake.n.01,cake.n.03,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,softBody @@ -2278,8 +2279,8 @@ half__duck.n.01,poultry.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBo half__omelet.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__trout.n.01,fish.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__french_fries.n.01,starches.n.01,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody -half__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,rigidBody -half__bleu.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody +half__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,rigidBody +half__bleu.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody half__rope.n.01,line.n.18,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rope half__entire_leaf.n.01,leaf.n.01,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__sirloin.n.01,cut.n.06,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -2319,7 +2320,7 @@ half__ramen.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__sugar_cookie.n.01,cookie.n.01,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__bamboo.n.01,wood.n.01,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__pastry.n.01,dough.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,softBody -half__butter_cookie.n.01,cookie.n.01,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody +half__butter_cookie.n.01,cookie.n.01,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__porkchop.n.01,chop.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__prosciutto.n.01,ham.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__steak.n.01,cut.n.06,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -2342,13 +2343,13 @@ half__tenderloin.n.01,cut.n.06,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigid half__butternut_squash.n.01,winter_squash.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__tiramisu.n.01,dessert.n.01,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,softBody half__artichoke.n.01,vegetable.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody -half__butter.n.01,"dairy_product.n.01,food.n.02",1,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,rigidBody +half__butter.n.01,"dairy_product.n.01,food.n.02",1,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,rigidBody half__brownie.n.01,cookie.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,softBody half__fillet.n.01,piece.n.08,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__granola_bar.n.01,cookie.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__tuna.n.01,saltwater_fish.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__grapefruit.n.01,citrus.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody -half__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody +half__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,softBody half__bagel_dough.n.01,dough.n.01,1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,softBody half__kabob.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__bratwurst.n.01,pork_sausage.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -2406,7 +2407,7 @@ diced__gingerbread.n.01,cake.n.03,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ma diced__peppermint.n.01,mint.n.05,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__hemp.n.01,plant_fiber.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__biscuit_dough.n.01,dough.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -diced__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +diced__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__carne_asada.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__cheese_tart.n.01,tart.n.02,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__coconut.n.01,edible_nut.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2418,7 +2419,7 @@ diced__hamburger.n.01,sandwich.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diced__pizza.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__halibut.n.01,flatfish.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__chives.n.01,alliaceous_plant.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -diced__bleu.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +diced__bleu.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__danish.n.01,sweet_roll.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__auricularia.n.01,fungus_genus.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__burrito.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2442,7 +2443,7 @@ diced__date.n.01,edible_fruit.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,m diced__pomegranate.n.01,edible_fruit.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__arepa.n.01,sandwich.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__hard-boiled_egg.n.01,boiled_egg.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -diced__butter.n.01,"dairy_product.n.01,food.n.02",1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +diced__butter.n.01,"dairy_product.n.01,food.n.02",1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__ginger.n.01,flavorer.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__butternut_squash.n.01,winter_squash.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__sushi.n.01,dish.n.02,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2546,7 +2547,7 @@ diced__fennel.n.01,vegetable.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ma diced__lime.n.01,citrus.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__pita.n.01,flatbread.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__grapefruit.n.01,citrus.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -diced__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance +diced__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__ham_hock.n.01,leg.n.05,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__durian.n.01,edible_fruit.n.01,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diced__tenderloin.n.01,cut.n.06,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2579,12 +2580,10 @@ cooked__diced__chocolate_cake.n.01,cake.n.03,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0 cooked__diced__white_turnip.n.01,turnip.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__venison.n.01,game.n.07,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__gelatin.n.01,dainty.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__feta.n.01,cheese.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__walnut.n.01,edible_nut.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__durian.n.01,edible_fruit.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__club_sandwich.n.01,sandwich.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__bay_leaf.n.01,herb.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__sweet_corn.n.01,corn.n.03,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__kabob.n.01,dish.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__banana_bread.n.01,quick_bread.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2615,7 +2614,6 @@ cooked__diced__pita.n.01,flatbread.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__diced__prosciutto.n.01,ham.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__spinach.n.01,greens.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__sugar_cookie_dough.n.01,dough.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__bleu.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__pastry.n.01,dough.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__eggplant.n.01,solanaceous_vegetable.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__sugar_cookie.n.01,cookie.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2675,7 +2673,6 @@ cooked__diced__chocolate_biscuit.n.01,cookie.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__diced__hard-boiled_egg.n.01,boiled_egg.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__trout.n.01,fish.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__watermelon.n.01,melon.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__avocado.n.01,edible_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__bean_curd.n.01,curd.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__biscuit_dough.n.01,dough.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2698,7 +2695,6 @@ cooked__diced__fennel.n.01,vegetable.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__diced__vanilla.n.01,orchid.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__lemon_peel.n.01,peel.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__fruitcake.n.01,cake.n.03,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__cheddar.n.01,cheese.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__pear.n.01,"edible_fruit.n.01,pome.n.01",1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__turkey_leg.n.01,drumstick.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__date.n.01,edible_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2730,8 +2726,6 @@ cooked__diced__mango.n.01,edible_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__diced__chicken_wing.n.01,wing.n.09,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__pieplant.n.01,vegetable.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__lobster.n.01,shellfish.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__butter_cookie.n.01,cookie.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__diced__butter.n.01,"dairy_product.n.01,food.n.02",1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__chicken_breast.n.01,breast.n.03,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__apple.n.01,"edible_fruit.n.01,pome.n.01",1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__kale.n.01,cabbage.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2755,12 +2749,10 @@ cooked__diced__pomegranate.n.01,edible_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__diced__pineapple.n.01,edible_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__melon.n.01,melon.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__cranberry_juice.n.01,fruit_juice.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__grated_cheese.n.01,cheese.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__whole_milk.n.01,milk.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__barbecue_sauce.n.01,sauce.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__vanilla.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__jelly.n.01,conserve.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__grated_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__yogurt.n.01,"dairy_product.n.01,food.n.02",1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__ricotta.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__soy_sauce.n.01,condiment.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -2773,7 +2765,6 @@ cooked__cranberry.n.01,"berry.n.01,berry.n.02",1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 cooked__chili_powder.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__coffee_bean.n.01,seed.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__mayonnaise.n.01,dressing.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__peanut_butter.n.01,spread.n.05,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__custard.n.01,dish.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__cheese_pastry_filling.n.01,sauce.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__pine_nut.n.01,edible_nut.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance @@ -2802,12 +2793,10 @@ cooked__petite_marmite.n.01,soup.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, cooked__chicken_curry.n.01,curry.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__pistachio.n.01,edible_nut.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__cheese_sauce.n.01,white_sauce.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__cane_sugar.n.01,sugar.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__ravioli.n.01,pasta.n.02,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__hot_sauce.n.01,sauce.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__heavy_cream.n.01,cream.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__lime_juice.n.01,juice.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__cheddar.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__coriander.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__meringue.n.01,topping.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__poultry_seasoning.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance @@ -2819,7 +2808,6 @@ cooked__lentil.n.01,legume.n.03,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,micr cooked__blueberry.n.01,berry.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__limeade.n.01,fruit_drink.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__beef_broth.n.01,broth.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__chocolate_kiss.n.01,"chocolate_candy.n.01,kiss.n.03",1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__brownie_batter.n.01,batter.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__hummus.n.01,spread.n.05,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__stuffing.n.01,concoction.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -2832,14 +2820,12 @@ cooked__cinnamon.n.01,spice.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,mic cooked__canola_oil.n.01,vegetable_oil.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__pesto.n.01,sauce.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__blueberry_mousse.n.01,mousse.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__parmesan.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__nutmeg.n.01,spice.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__oat.n.01,grain.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__cocoa.n.01,beverage.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__dog_food.n.01,petfood.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__mashed_potato.n.01,starches.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__ground_coffee.n.01,coffee.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance -cooked__parmesan.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__orange_juice.n.01,fruit_juice.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__pancake_batter.n.01,batter.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__muffin_batter.n.01,batter.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -2881,7 +2867,6 @@ cooked__spaghetti.n.01,pasta.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ma cooked__granulated_salt.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__caraway_seed.n.01,flavorer.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__cashew.n.01,edible_nut.n.01,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -cooked__iced_chocolate.n.01,beverage.n.01,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__tomato_paste.n.01,ingredient.n.03,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__cake_mix.n.01,ready-mix.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance cooked__coconut_milk.n.01,milk.n.04,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid @@ -2908,8 +2893,6 @@ cooked__jam.n.01,conserve.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liqui cooked__raisin.n.01,dried_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__waffle_batter.n.01,batter.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__coca_cola.n.01,cola.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__white_chocolate.n.01,chocolate.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__nut_butter.n.01,spread.n.05,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__drip_coffee.n.01,coffee.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__onion_ring_batter.n.01,batter.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__ginger.n.01,spice.n.02,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,microPhysicalSubstance @@ -2919,20 +2902,13 @@ kettle.n.01,pot.n.01,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody electric_cauldron.n.01,pot.n.01,1,0,1,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody cooked__blueberry_compote.n.01,compote.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid cooked__diced__papaya.n.01,edible_fruit.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance -melted__chocolate.n.01,chocolate_candy.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__chocolate.n.01,chocolate_candy.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__cane_sugar.n.01,sugar.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__cane_sugar.n.01,sugar.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__feta.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__feta.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__granulated_sugar.n.01,sugar.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__granulated_sugar.n.01,sugar.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -melted__bleu.n.01,cheese.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid -cooked__melted__bleu.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__chocolate.n.01,chocolate_candy.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__cane_sugar.n.01,sugar.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__feta.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__granulated_sugar.n.01,sugar.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__mozzarella.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__swiss_cheese.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid +melted__bleu.n.01,cheese.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,liquid half__vanilla_flower.n.01,orchid.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__sourdough.n.01,dough.n.01,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,rigidBody half__shrimp.n.01,seafood.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody @@ -2963,3 +2939,4 @@ diced__roll_dough.n.01,dough.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ma diced__sourdough.n.01,dough.n.01,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__roll_dough.n.01,dough.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance cooked__diced__sourdough.n.01,dough.n.01,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance +cooked__diced__butter_cookie.n.01,cookie.n.01,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,macroPhysicalSubstance diff --git a/bddl/generated_data/synsets_to_descriptors.json b/bddl/generated_data/synsets_to_descriptors.json index dd9a9d8b..8700e354 100644 --- a/bddl/generated_data/synsets_to_descriptors.json +++ b/bddl/generated_data/synsets_to_descriptors.json @@ -11970,10 +11970,6 @@ ] ], "bleu.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -26706,10 +26702,6 @@ ] ], "butter.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -28752,10 +28744,6 @@ ] ], "cane_sugar.n.02": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -33048,10 +33036,6 @@ ] ], "cheddar.n.02": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -34916,10 +34900,6 @@ ] ], "chocolate_bar.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -35244,10 +35224,6 @@ ] ], "chocolate_kiss.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -41239,16 +41215,6 @@ "frozen" ] ], - "cooked__cane_sugar.n.01": [ - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__canola_oil.n.01": [ [ "boiling", @@ -41379,16 +41345,6 @@ "frozen" ] ], - "cooked__chocolate_kiss.n.01": [ - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__chocolate_sauce.n.01": [ [ "boiling", @@ -41779,16 +41735,6 @@ "frozen" ] ], - "cooked__diced__bleu.n.01": [ - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__diced__bok_choy.n.01": [ [ "frozen", @@ -41851,16 +41797,6 @@ "frozen" ] ], - "cooked__diced__butter.n.01": [ - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__diced__butter_cookie.n.01": [ [ "on_fire", @@ -41941,20 +41877,6 @@ "frozen" ] ], - "cooked__diced__cheddar.n.01": [ - [ - "on_fire", - "on_fire" - ], - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__diced__cheese_tart.n.01": [ [ "frozen", @@ -42253,20 +42175,6 @@ "frozen" ] ], - "cooked__diced__feta.n.01": [ - [ - "on_fire", - "on_fire" - ], - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__diced__fillet.n.01": [ [ "frozen", @@ -42571,16 +42479,6 @@ "frozen" ] ], - "cooked__diced__mozzarella.n.01": [ - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__diced__muffin.n.01": [ [ "frozen", @@ -42975,16 +42873,6 @@ "frozen" ] ], - "cooked__diced__swiss_cheese.n.01": [ - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__diced__taco.n.01": [ [ "frozen", @@ -43267,30 +43155,6 @@ "frozen" ] ], - "cooked__granulated_sugar.n.01": [ - [ - "on_fire", - "on_fire" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__grated_cheese.n.01": [ - [ - "on_fire", - "on_fire" - ], - [ - "frozen", - "frozen" - ], - [ - "melted", - "melted" - ] - ], "cooked__gravy.n.01": [ [ "boiling", @@ -43629,126 +43493,6 @@ "frozen" ] ], - "cooked__melted__bleu.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__butter.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__cane_sugar.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__cheddar.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__chocolate.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__feta.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__granulated_sugar.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__grated_cheese.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__mozzarella.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__parmesan.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__swiss_cheese.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], - "cooked__melted__white_chocolate.n.01": [ - [ - "boiling", - "boiling" - ], - [ - "frozen", - "frozen" - ] - ], "cooked__meringue.n.01": [ [ "boiling", @@ -43927,12 +43671,6 @@ "frozen" ] ], - "cooked__parmesan.n.01": [ - [ - "frozen", - "frozen" - ] - ], "cooked__pea.n.01": [ [ "on_fire", @@ -50852,10 +50590,6 @@ ] ], "diced__bleu.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -50974,10 +50708,6 @@ ] ], "diced__butter.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -51100,10 +50830,6 @@ ] ], "diced__cheddar.n.01": [ - [ - "cooked", - "cooked" - ], [ "on_fire", "on_fire" @@ -51584,10 +51310,6 @@ ] ], "diced__feta.n.01": [ - [ - "cooked", - "cooked" - ], [ "on_fire", "on_fire" @@ -52098,10 +51820,6 @@ ] ], "diced__mozzarella.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -52756,10 +52474,6 @@ ] ], "diced__swiss_cheese.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -67560,10 +67274,6 @@ ] ], "granulated_sugar.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -67924,10 +67634,6 @@ ] ], "grated_cheese.n.01": [ - [ - "cooked", - "cooked" - ], [ "on_fire", "on_fire" @@ -70906,10 +70612,6 @@ ] ], "half__bleu.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -71592,10 +71294,6 @@ ] ], "half__butter.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -71658,10 +71356,6 @@ ] ], "half__butter_cookie.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -72456,10 +72150,6 @@ ] ], "half__cheddar.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -75286,10 +74976,6 @@ ] ], "half__feta.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -78510,10 +78196,6 @@ ] ], "half__mozzarella.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -82892,10 +82574,6 @@ ] ], "half__swiss_cheese.n.01": [ - [ - "cooked", - "cooked" - ], [ "diced", "diced" @@ -99654,10 +99332,6 @@ ] ], "lump_sugar.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -102936,10 +102610,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -102950,10 +102620,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -102964,10 +102630,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -102978,10 +102640,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -102992,10 +102650,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103006,10 +102660,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103020,10 +102670,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103034,10 +102680,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103048,10 +102690,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103062,10 +102700,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103076,10 +102710,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -103090,10 +102720,6 @@ "boiling", "boiling" ], - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" @@ -105350,10 +104976,6 @@ ] ], "mozzarella.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -111426,13 +111048,13 @@ ] ], "parmesan.n.01": [ - [ - "cooked", - "cooked" - ], [ "frozen", "frozen" + ], + [ + "melted", + "melted" ] ], "parmesan__shaker.n.01": [ @@ -143904,10 +143526,6 @@ ] ], "swiss_cheese.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" @@ -157142,10 +156760,6 @@ ] ], "white_chocolate.n.01": [ - [ - "cooked", - "cooked" - ], [ "disinfected", "disinfected" diff --git a/bddl/generated_data/transition_map/tm_jsons/dicing.json b/bddl/generated_data/transition_map/tm_jsons/dicing.json index 37e2d941..e3e65d08 100644 --- a/bddl/generated_data/transition_map/tm_jsons/dicing.json +++ b/bddl/generated_data/transition_map/tm_jsons/dicing.json @@ -373,23 +373,6 @@ "cooked__diced__blackberry.n.01": 1 } }, - { - "rule_name": "cooked-half__bleu.n.01-dicing", - "input_synsets": { - "half__bleu.n.01": 1 - }, - "input_states": { - "half__bleu.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__bleu.n.01": 1 - } - }, { "rule_name": "cooked-half__bok_choy.n.01-dicing", "input_synsets": { @@ -543,40 +526,6 @@ "cooked__diced__burrito.n.01": 1 } }, - { - "rule_name": "cooked-half__butter.n.01-dicing", - "input_synsets": { - "half__butter.n.01": 1 - }, - "input_states": { - "half__butter.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__butter.n.01": 1 - } - }, - { - "rule_name": "cooked-half__butter_cookie.n.01-dicing", - "input_synsets": { - "half__butter_cookie.n.01": 1 - }, - "input_states": { - "half__butter_cookie.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__butter_cookie.n.01": 1 - } - }, { "rule_name": "cooked-half__buttermilk_pancake.n.01-dicing", "input_synsets": { @@ -730,23 +679,6 @@ "cooked__diced__chard.n.01": 1 } }, - { - "rule_name": "cooked-half__cheddar.n.01-dicing", - "input_synsets": { - "half__cheddar.n.01": 1 - }, - "input_states": { - "half__cheddar.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__cheddar.n.01": 1 - } - }, { "rule_name": "cooked-half__cheese_tart.n.01-dicing", "input_synsets": { @@ -1410,23 +1342,6 @@ "cooked__diced__fennel.n.01": 1 } }, - { - "rule_name": "cooked-half__feta.n.01-dicing", - "input_synsets": { - "half__feta.n.01": 1 - }, - "input_states": { - "half__feta.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__feta.n.01": 1 - } - }, { "rule_name": "cooked-half__fillet.n.01-dicing", "input_synsets": { @@ -2158,23 +2073,6 @@ "cooked__diced__meatball.n.01": 1 } }, - { - "rule_name": "cooked-half__mozzarella.n.01-dicing", - "input_synsets": { - "half__mozzarella.n.01": 1 - }, - "input_states": { - "half__mozzarella.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__mozzarella.n.01": 1 - } - }, { "rule_name": "cooked-half__muffin.n.01-dicing", "input_synsets": { @@ -3144,23 +3042,6 @@ "cooked__diced__sweet_corn.n.01": 1 } }, - { - "rule_name": "cooked-half__swiss_cheese.n.01-dicing", - "input_synsets": { - "half__swiss_cheese.n.01": 1 - }, - "input_states": { - "half__swiss_cheese.n.01": [ - [ - "cooked", - true - ] - ] - }, - "output_synsets": { - "cooked__diced__swiss_cheese.n.01": 1 - } - }, { "rule_name": "cooked-half__taco.n.01-dicing", "input_synsets": { diff --git a/bddl/generated_data/transition_map/tm_jsons/melting.json b/bddl/generated_data/transition_map/tm_jsons/melting.json index 74987208..4f3c969d 100644 --- a/bddl/generated_data/transition_map/tm_jsons/melting.json +++ b/bddl/generated_data/transition_map/tm_jsons/melting.json @@ -53,87 +53,6 @@ "melted__chocolate.n.01": 1 } }, - { - "rule_name": "cooked__cane_sugar.n.01-melting", - "input_synsets": { - "cooked__cane_sugar.n.01": 1 - }, - "output_synsets": { - "melted__cane_sugar.n.01": 1 - } - }, - { - "rule_name": "cooked__chocolate_kiss.n.01-melting", - "input_synsets": { - "cooked__chocolate_kiss.n.01": 1 - }, - "output_synsets": { - "melted__chocolate.n.01": 1 - } - }, - { - "rule_name": "cooked__diced__bleu.n.01-melting", - "input_synsets": { - "cooked__diced__bleu.n.01": 1 - }, - "output_synsets": { - "melted__bleu.n.01": 1 - } - }, - { - "rule_name": "cooked__diced__butter.n.01-melting", - "input_synsets": { - "cooked__diced__butter.n.01": 1 - }, - "output_synsets": { - "cooked__melted__butter.n.01": 1 - } - }, - { - "rule_name": "cooked__diced__cheddar.n.01-melting", - "input_synsets": { - "cooked__diced__cheddar.n.01": 1 - }, - "output_synsets": { - "melted__cheddar.n.01": 1 - } - }, - { - "rule_name": "cooked__diced__feta.n.01-melting", - "input_synsets": { - "cooked__diced__feta.n.01": 1 - }, - "output_synsets": { - "melted__feta.n.01": 1 - } - }, - { - "rule_name": "cooked__diced__mozzarella.n.01-melting", - "input_synsets": { - "cooked__diced__mozzarella.n.01": 1 - }, - "output_synsets": { - "melted__mozzarella.n.01": 1 - } - }, - { - "rule_name": "cooked__diced__swiss_cheese.n.01-melting", - "input_synsets": { - "cooked__diced__swiss_cheese.n.01": 1 - }, - "output_synsets": { - "melted__swiss_cheese.n.01": 1 - } - }, - { - "rule_name": "cooked__grated_cheese.n.01-melting", - "input_synsets": { - "cooked__grated_cheese.n.01": 1 - }, - "output_synsets": { - "cooked__melted__grated_cheese.n.01": 1 - } - }, { "rule_name": "diced__bleu.n.01-melting", "input_synsets": { @@ -287,6 +206,15 @@ "melted__mozzarella.n.01": 1 } }, + { + "rule_name": "parmesan.n.01-melting", + "input_synsets": { + "parmesan.n.01": 1 + }, + "output_synsets": { + "melted__parmesan.n.01": 1 + } + }, { "rule_name": "swiss_cheese.n.01-melting", "input_synsets": { diff --git a/bddl/generated_data/transition_map/tm_jsons/substance_cooking.json b/bddl/generated_data/transition_map/tm_jsons/substance_cooking.json index f89be347..2c982a89 100644 --- a/bddl/generated_data/transition_map/tm_jsons/substance_cooking.json +++ b/bddl/generated_data/transition_map/tm_jsons/substance_cooking.json @@ -170,15 +170,6 @@ "cooked__cake_mix.n.01": 1 } }, - { - "rule_name": "cane_sugar.n.02-cooking", - "input_synsets": { - "cane_sugar.n.02": 1 - }, - "output_synsets": { - "cooked__cane_sugar.n.01": 1 - } - }, { "rule_name": "canola_oil.n.01-cooking", "input_synsets": { @@ -305,15 +296,6 @@ "cooked__chili_powder.n.01": 1 } }, - { - "rule_name": "chocolate_kiss.n.01-cooking", - "input_synsets": { - "chocolate_kiss.n.01": 1 - }, - "output_synsets": { - "cooked__chocolate_kiss.n.01": 1 - } - }, { "rule_name": "chocolate_sauce.n.01-cooking", "input_synsets": { @@ -755,15 +737,6 @@ "cooked__diced__blackberry.n.01": 1 } }, - { - "rule_name": "diced__bleu.n.01-cooking", - "input_synsets": { - "diced__bleu.n.01": 1 - }, - "output_synsets": { - "cooked__diced__bleu.n.01": 1 - } - }, { "rule_name": "diced__bok_choy.n.01-cooking", "input_synsets": { @@ -845,15 +818,6 @@ "cooked__diced__burrito.n.01": 1 } }, - { - "rule_name": "diced__butter.n.01-cooking", - "input_synsets": { - "diced__butter.n.01": 1 - }, - "output_synsets": { - "cooked__diced__butter.n.01": 1 - } - }, { "rule_name": "diced__butter_cookie.n.01-cooking", "input_synsets": { @@ -944,15 +908,6 @@ "cooked__diced__chard.n.01": 1 } }, - { - "rule_name": "diced__cheddar.n.01-cooking", - "input_synsets": { - "diced__cheddar.n.01": 1 - }, - "output_synsets": { - "cooked__diced__cheddar.n.01": 1 - } - }, { "rule_name": "diced__cheese_tart.n.01-cooking", "input_synsets": { @@ -1304,15 +1259,6 @@ "cooked__diced__fennel.n.01": 1 } }, - { - "rule_name": "diced__feta.n.01-cooking", - "input_synsets": { - "diced__feta.n.01": 1 - }, - "output_synsets": { - "cooked__diced__feta.n.01": 1 - } - }, { "rule_name": "diced__fillet.n.01-cooking", "input_synsets": { @@ -1709,15 +1655,6 @@ "cooked__diced__melon.n.01": 1 } }, - { - "rule_name": "diced__mozzarella.n.01-cooking", - "input_synsets": { - "diced__mozzarella.n.01": 1 - }, - "output_synsets": { - "cooked__diced__mozzarella.n.01": 1 - } - }, { "rule_name": "diced__muffin.n.01-cooking", "input_synsets": { @@ -2249,15 +2186,6 @@ "cooked__diced__sweet_corn.n.01": 1 } }, - { - "rule_name": "diced__swiss_cheese.n.01-cooking", - "input_synsets": { - "diced__swiss_cheese.n.01": 1 - }, - "output_synsets": { - "cooked__diced__swiss_cheese.n.01": 1 - } - }, { "rule_name": "diced__taco.n.01-cooking", "input_synsets": { @@ -2591,24 +2519,6 @@ "cooked__granulated_salt.n.01": 1 } }, - { - "rule_name": "granulated_sugar.n.01-cooking", - "input_synsets": { - "granulated_sugar.n.01": 1 - }, - "output_synsets": { - "cooked__granulated_sugar.n.01": 1 - } - }, - { - "rule_name": "grated_cheese.n.01-cooking", - "input_synsets": { - "grated_cheese.n.01": 1 - }, - "output_synsets": { - "cooked__grated_cheese.n.01": 1 - } - }, { "rule_name": "gravy.n.01-cooking", "input_synsets": { @@ -2924,114 +2834,6 @@ "cooked__mayonnaise.n.01": 1 } }, - { - "rule_name": "melted__bleu.n.01-cooking", - "input_synsets": { - "melted__bleu.n.01": 1 - }, - "output_synsets": { - "cooked__melted__bleu.n.01": 1 - } - }, - { - "rule_name": "melted__butter.n.01-cooking", - "input_synsets": { - "melted__butter.n.01": 1 - }, - "output_synsets": { - "cooked__melted__butter.n.01": 1 - } - }, - { - "rule_name": "melted__cane_sugar.n.01-cooking", - "input_synsets": { - "melted__cane_sugar.n.01": 1 - }, - "output_synsets": { - "cooked__melted__cane_sugar.n.01": 1 - } - }, - { - "rule_name": "melted__cheddar.n.01-cooking", - "input_synsets": { - "melted__cheddar.n.01": 1 - }, - "output_synsets": { - "cooked__melted__cheddar.n.01": 1 - } - }, - { - "rule_name": "melted__chocolate.n.01-cooking", - "input_synsets": { - "melted__chocolate.n.01": 1 - }, - "output_synsets": { - "cooked__melted__chocolate.n.01": 1 - } - }, - { - "rule_name": "melted__feta.n.01-cooking", - "input_synsets": { - "melted__feta.n.01": 1 - }, - "output_synsets": { - "cooked__melted__feta.n.01": 1 - } - }, - { - "rule_name": "melted__granulated_sugar.n.01-cooking", - "input_synsets": { - "melted__granulated_sugar.n.01": 1 - }, - "output_synsets": { - "cooked__melted__granulated_sugar.n.01": 1 - } - }, - { - "rule_name": "melted__grated_cheese.n.01-cooking", - "input_synsets": { - "melted__grated_cheese.n.01": 1 - }, - "output_synsets": { - "cooked__melted__grated_cheese.n.01": 1 - } - }, - { - "rule_name": "melted__mozzarella.n.01-cooking", - "input_synsets": { - "melted__mozzarella.n.01": 1 - }, - "output_synsets": { - "cooked__melted__mozzarella.n.01": 1 - } - }, - { - "rule_name": "melted__parmesan.n.01-cooking", - "input_synsets": { - "melted__parmesan.n.01": 1 - }, - "output_synsets": { - "cooked__melted__parmesan.n.01": 1 - } - }, - { - "rule_name": "melted__swiss_cheese.n.01-cooking", - "input_synsets": { - "melted__swiss_cheese.n.01": 1 - }, - "output_synsets": { - "cooked__melted__swiss_cheese.n.01": 1 - } - }, - { - "rule_name": "melted__white_chocolate.n.01-cooking", - "input_synsets": { - "melted__white_chocolate.n.01": 1 - }, - "output_synsets": { - "cooked__melted__white_chocolate.n.01": 1 - } - }, { "rule_name": "meringue.n.01-cooking", "input_synsets": { @@ -3185,15 +2987,6 @@ "cooked__paprika.n.01": 1 } }, - { - "rule_name": "parmesan.n.01-cooking", - "input_synsets": { - "parmesan.n.01": 1 - }, - "output_synsets": { - "cooked__parmesan.n.01": 1 - } - }, { "rule_name": "pea.n.01-cooking", "input_synsets": { diff --git a/bddl/knowledge_base/models.py b/bddl/knowledge_base/models.py index ffa5baaf..832f74b4 100644 --- a/bddl/knowledge_base/models.py +++ b/bddl/knowledge_base/models.py @@ -303,8 +303,10 @@ def required_meta_links(self) -> Set[str]: continue required_links.add('heatsource') - if 'fillable' in properties: - required_links.add('fillable') + # This is left out because the fillable annotations are currently automatically generated + # TODO: Re-enable this after the fillable annotations have been backported. + # if 'fillable' in properties: + # required_links.add('fillable') if 'toggleable' in properties: required_links.add('togglebutton') diff --git a/bddl/knowledge_base/processing.py b/bddl/knowledge_base/processing.py index d7ed0549..cbe336d4 100644 --- a/bddl/knowledge_base/processing.py +++ b/bddl/knowledge_base/processing.py @@ -309,7 +309,7 @@ def create_transitions(self): json_paths = glob.glob(str(GENERATED_DATA_DIR / "transition_map/tm_jsons/*.json")) transitions = [] for jp in json_paths: - if "washer_" in jp: + if "washer" in jp: continue with open(jp) as f: transitions.extend(json.load(f))