Merge branch 'develop' into particle_remover_annots_synsets

StanfordVL · Jan 10, 2024 · aaf45f4 · aaf45f4
2 parents 1dcb2da + c0f12d8
commit aaf45f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/bddl/activity_definitions/preparing_food_for_adult/problem0.bddl b/bddl/activity_definitions/preparing_food_for_adult/problem0.bddl
@@ -36,9 +36,6 @@
             (cooked steak.n.01_1)
         )
         (contains bowl.n.01_2 diced__potato.n.01_1)
-        (not 
-            (cooked diced__potato.n.01_1)
-        )
         (inside bowl.n.01_2 electric_refrigerator.n.01_1) 
         (inside plate.n.04_1 cabinet.n.01_1) 
         (inside frying_pan.n.01_1 cabinet.n.01_1)

diff --git a/bddl/activity_definitions/putting_in_a_pool/problem0.bddl b/bddl/activity_definitions/putting_in_a_pool/problem0.bddl
@@ -8,21 +8,23 @@
         floor.n.01_1 - floor.n.01
         lawn.n.01_1 - lawn.n.01
         tree.n.01_1 tree.n.01_2 - tree.n.01
+        bucket.n.01_1 - bucket.n.01
+        sink.n.01_1 - sink.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init 
         (filled pool.n.01_1 water.n.06_1) 
         (ontop person.n.01_1 floor.n.01_1) 
-        (ontop person.n.01_2 floor.n.01_1) 
-        (not 
-            (frozen water.n.06_1)
-        ) 
-        (inroom floor.n.01_1 garden) 
+        (ontop person.n.01_2 floor.n.01_1)
+        (inroom floor.n.01_1 garden)
         (inroom lawn.n.01_1 garden) 
         (inroom tree.n.01_1 garden) 
         (inroom tree.n.01_2 garden) 
-        (inroom pool.n.01_1 garden) 
+        (inroom pool.n.01_1 garden)
+        (ontop bucket.n.01_1 floor.n.02_1)
+        (inroom floor.n.02_1 bathroom)
+        (inroom sink.n.01_1 bathroom)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 

diff --git a/bddl/activity_definitions/toast_sunflower_seeds/problem0.bddl b/bddl/activity_definitions/toast_sunflower_seeds/problem0.bddl
@@ -15,9 +15,6 @@
 
     (:init 
         (filled sunflower_seed__bag.n.01_1 sunflower_seed.n.01_1)
-        (not 
-            (cooked sunflower_seed.n.01_1)
-        )
         (inside sunflower_seed__bag.n.01_1 cabinet.n.01_1) 
         (inside tray.n.01_1 cabinet.n.01_1)
         (inside cookie_sheet.n.01_1 cabinet.n.01_1)