only cookable and fillable are heatable

StanfordVL · Mar 11, 2024 · a5e69b9 · a5e69b9
1 parent 3f14b32
commit a5e69b9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/bddl/activity_definitions/cook_lasagne/problem0.bddl b/bddl/activity_definitions/cook_lasagne/problem0.bddl
@@ -9,10 +9,7 @@
     )
 
     (:init 
-        (ontop lasagna.n.01_1 oven.n.01_1) 
-        (not 
-            (hot oven.n.01_1)
-        ) 
+        (ontop lasagna.n.01_1 oven.n.01_1)
         (not 
             (cooked lasagna.n.01_1)
         ) 
@@ -26,11 +23,7 @@
             (exists 
                 (?lasagna.n.01 - lasagna.n.01) 
                 (ontop ?lasagna.n.01 ?oven.n.01_1)
-            ) 
-            (exists 
-                (?oven.n.01 - oven.n.01) 
-                (hot ?oven.n.01)
-            ) 
+            )
             (forall 
                 (?lasagna.n.01 - lasagna.n.01) 
                 (cooked ?lasagna.n.01_1)

diff --git a/bddl/activity_definitions/cook_pumpkin_seeds/problem0.bddl b/bddl/activity_definitions/cook_pumpkin_seeds/problem0.bddl
@@ -17,10 +17,7 @@
     	agent.n.01_1 - agent.n.01
     )
 
-    (:init 
-        (not 
-            (hot oven.n.01_1)
-        ) 
+    (:init
         (filled pumpkin_seed__bag.n.01_1 pumpkin_seed.n.01_1) 
         (ontop pumpkin_seed__bag.n.01_1 chopping_board.n.01_1) 
         (insource salt__shaker.n.01_1 salt.n.02_1)
@@ -41,7 +38,6 @@
             (real ?cooked__pumpkin_seed.n.01_1)
             (covered ?cookie_sheet.n.01_1 ?cooked__pumpkin_seed.n.01_1) 
             (covered ?cookie_sheet.n.01_1 ?salt.n.02_1) 
-            (hot ?oven.n.01_1)
         )
     )
 )
diff --git a/bddl/data_generation/get_syn_prop_annots_canonical.py b/bddl/data_generation/get_syn_prop_annots_canonical.py
@@ -126,6 +126,9 @@ def add_programmatic_properties(synset_content): # runs programmatic addition ov
             synset_content[synset]["deformable"] = {}
         if ("cloth" in synset_content[synset]) or ("rope" in synset_content[synset]):
             synset_content[synset]["drapeable"] = {}
+        if ("nonSubstance" in synset_content[synset]) and ("cookable" in synset_content[synset] or "fillable" in synset_content[synset]):
+            # cookables and fillables are both heatable
+            synset_content[synset]["heatable"] = {}
         if "nonSubstance" in synset_content[synset]: # non-substances are both wetable and mixable
                 synset_content[synset].update({
                     "wetable": {},
@@ -139,7 +142,6 @@ def add_programmatic_properties(synset_content): # runs programmatic addition ov
                     "rustable": {},
                     "wrinkleable": {},
                     "disinfectable": {},
-                    "heatable": {}          # All nonsubstances are heatable. Substances are not heatable.
                 })
         synset_content[synset]["freezable"] = {}    # all synsets are freezable
 

diff --git a/bddl/data_generation/process_prop_param_annots.py b/bddl/data_generation/process_prop_param_annots.py
@@ -147,8 +147,6 @@ def create_get_save_propagated_annots_params(syns_to_props):
                             raise ValueError(f"synset {param_record['synset']} cookable annotation has NaN value for parameter {param_name}. Either handle NaN or annotate parameter value.")
                         elif prop == "flammable":
                             raise ValueError(f"synset {param_record['synset']} flammable annotation has NaN value for parameter {param_name}. Either handle NaN or annotate parameter value.")
-                        elif prop == "heatable":
-                            raise ValueError(f"synset {param_record['synset']} heatable annotation has NaN value for parameter {param_name}. Either handle NaN or annotate parameter value.")
                         elif prop == "heatSource":
                             raise ValueError(f"synset {param_record['synset']} heatSource annotation has NaN value for parameter {param_name}. Either handle NaN or annotate parameter value.")
                         elif prop == "particleApplier":

diff --git a/bddl/data_generation/pull_sheets.py b/bddl/data_generation/pull_sheets.py
@@ -22,7 +22,6 @@
   (SYNSET_PARAMS_SHEET_KEY, "coldSource", "prop_param_annots/coldSource.csv"),
   (SYNSET_PARAMS_SHEET_KEY, "cookable", "prop_param_annots/cookable.csv"),
   (SYNSET_PARAMS_SHEET_KEY, "flammable", "prop_param_annots/flammable.csv"),
-  (SYNSET_PARAMS_SHEET_KEY, "heatable", "prop_param_annots/heatable.csv"),
   (SYNSET_PARAMS_SHEET_KEY, "particleApplier", "prop_param_annots/particleApplier.csv"),
   (SYNSET_PARAMS_SHEET_KEY, "particleSource", "prop_param_annots/particleSource.csv"),
   (SYNSET_PARAMS_SHEET_KEY, "particleRemover", "prop_param_annots/particleRemover.csv"),