Fix some issues

StanfordVL · Feb 1, 2025 · 0f68597 · 0f68597
1 parent 9234fb4
commit 0f68597
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 31 deletions.
diff --git a/bddl/activity_definitions/sweeping_floors/problem0.bddl b/bddl/activity_definitions/sweeping_floors/problem0.bddl
@@ -14,7 +14,6 @@
         (covered floor.n.01_1 dust.n.01_1) 
         (covered rug.n.01_1 dust.n.01_1) 
         (ontop rug.n.01_1 floor.n.01_1) 
-        (unfolded rug.n.01_1)
         (ontop broom.n.01_1 floor.n.01_1) 
         (ontop dustpan.n.02_1 floor.n.01_1) 
         (inroom floor.n.01_1 bathroom) 
@@ -26,6 +25,9 @@
             (not 
                 (covered ?floor.n.01_1 ?dust.n.01_1)
             )
+            (not 
+                (covered ?rug.n.01_1 ?dust.n.01_1)
+            )
         )
     )
 )
diff --git a/bddl/activity_definitions/wash_delicates_in_the_laundry/problem0.bddl b/bddl/activity_definitions/wash_delicates_in_the_laundry/problem0.bddl
@@ -6,57 +6,34 @@
         undergarment.n.01_1 undergarment.n.01_2 undergarment.n.01_3 undergarment.n.01_4 - undergarment.n.01
         stain.n.01_1 - stain.n.01
         dust.n.01_1 - dust.n.01
-        sweater.n.01_1 - sweater.n.01
         detergent.n.02_1 - detergent.n.02
         detergent__bottle.n.01_1 - detergent__bottle.n.01
-        undergarment.n.01_1 undergarment.n.01_2 - undergarment.n.01
         floor.n.01_1 - floor.n.01
         clothes_dryer.n.01_1 - clothes_dryer.n.01
+        bed.n.01_1 - bed.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init 
-        (inside undergarment.n.01_1 washer.n.03_1) 
+        (ontop undergarment.n.01_1 bed.n.01_1) 
         (covered undergarment.n.01_1 stain.n.01_1) 
-        (inside undergarment.n.01_2 washer.n.03_1) 
+        (ontop undergarment.n.01_2 bed.n.01_1) 
         (covered undergarment.n.01_2 stain.n.01_1) 
-        (inside undergarment.n.01_3 washer.n.03_1) 
+        (ontop undergarment.n.01_3 bed.n.01_1) 
         (covered undergarment.n.01_3 dust.n.01_1) 
-        (inside undergarment.n.01_4 washer.n.03_1) 
+        (ontop undergarment.n.01_4 bed.n.01_1) 
         (covered undergarment.n.01_4 dust.n.01_1) 
-        (inside sweater.n.01_1 washer.n.03_1) 
-        (covered sweater.n.01_1 stain.n.01_1) 
-        (inside undergarment.n.01_1 washer.n.03_1) 
-        (covered undergarment.n.01_1 stain.n.01_1) 
-        (inside undergarment.n.01_2 washer.n.03_1) 
-        (covered undergarment.n.01_2 stain.n.01_1) 
         (filled detergent__bottle.n.01_1 detergent.n.02_1) 
         (ontop detergent__bottle.n.01_1 washer.n.03_1)
-        (inroom floor.n.01_1 utility_room) 
+        (inroom floor.n.01_1 bedroom) 
         (inroom washer.n.03_1 utility_room) 
         (inroom clothes_dryer.n.01_1 utility_room)
+        (inroom bed.n.01_1 bedroom)
         (ontop agent.n.01_1 floor.n.01_1)
     )
 
     (:goal 
         (and 
-            (forall 
-                (?undergarment.n.01 - undergarment.n.01)
-                (and
-                    (not
-                        (covered ?undergarment.n.01 ?stain.n.01_1)
-                    )
-                    (not
-                        (covered ?undergarment.n.01 ?dust.n.01_1)
-                    )
-                )
-            )
-            (forall 
-                (?sweater.n.01 - sweater.n.01)
-                (not
-                    (covered ?sweater.n.01 ?stain.n.01_1)
-                )
-            )
             (forall 
                 (?undergarment.n.01 - undergarment.n.01)
                 (not