more bddl simplifications

StanfordVL · Mar 17, 2024 · 39dcc92 · 39dcc92
1 parent a299076
commit 39dcc92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/bddl/activity_definitions/hanging_clothes_on_clothesline/problem0.bddl b/bddl/activity_definitions/hanging_clothes_on_clothesline/problem0.bddl
@@ -6,17 +6,14 @@
         hamper.n.02_1 - hamper.n.02
         floor.n.01_1 - floor.n.01
         water.n.06_1 - water.n.06
-        long_trousers.n.01_1 - long_trousers.n.01
         clothesline.n.01_1 - clothesline.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init
         (inside underwear.n.01_1 hamper.n.02_1)
         (ontop hamper.n.02_1 floor.n.01_1)
-        (saturated long_trousers.n.01_1 water.n.06_1)
         (ontop clothesline.n.01_1 floor.n.01_1)
-        (inside long_trousers.n.01_1 hamper.n.02_1)
         (saturated underwear.n.01_1 water.n.06_1)
         (inroom floor.n.01_1 garden)
         (ontop agent.n.01_1 floor.n.01_1)
@@ -25,7 +22,6 @@
     (:goal
         (and
             (draped ?underwear.n.01_1 ?clothesline.n.01_1)
-            (draped ?long_trousers.n.01_1 ?clothesline.n.01_1)
         )
     )
 )
diff --git a/bddl/activity_definitions/making_the_bed/problem0.bddl b/bddl/activity_definitions/making_the_bed/problem0.bddl
@@ -3,18 +3,16 @@
 
     (:objects
         pillow.n.01_1 - pillow.n.01
-        hamper.n.02_1 - hamper.n.02
         blanket.n.01_1 - blanket.n.01
         bed.n.01_1 - bed.n.01
         floor.n.01_1 - floor.n.01
         agent.n.01_1 - agent.n.01
     )
 
     (:init 
-        (inside pillow.n.01_1 hamper.n.02_1) 
-        (inside blanket.n.01_1 hamper.n.02_1) 
-        (ontop hamper.n.02_1 floor.n.01_1) 
-        (inroom bed.n.01_1 bedroom) 
+        (ontop pillow.n.01_1 floor.n.01_1)
+        (ontop blanket.n.01_1 floor.n.01_1)
+        (inroom bed.n.01_1 bedroom)
         (inroom floor.n.01_1 bedroom) 
         (ontop agent.n.01_1 floor.n.01_1)
     )

diff --git a/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl b/bddl/activity_definitions/putting_towels_in_bathroom/problem0.bddl
@@ -14,7 +14,7 @@
         (ontop bath_towel.n.01_1 bed.n.01_1)
         (ontop hand_towel.n.01_1 bed.n.01_1)
         (inroom floor.n.01_1 bedroom)
-        (inroom bed.n.01_1 bathroom)
+        (inroom bed.n.01_1 bedroom)
         (inroom towel_rack.n.01_1 bathroom) 
         (ontop agent.n.01_1 floor.n.01_1)
     )

diff --git a/bddl/activity_definitions/setup_a_bar_for_a_cocktail_party/problem0.bddl b/bddl/activity_definitions/setup_a_bar_for_a_cocktail_party/problem0.bddl
@@ -20,7 +20,6 @@
         corkscrew.n.01_1 - corkscrew.n.01
         tray.n.01_1 - tray.n.01
         floor.n.01_1 - floor.n.01
-        shelf.n.01_1 shelf.n.01_2 - shelf.n.01
         agent.n.01_1 - agent.n.01
     )
 
@@ -45,16 +44,14 @@
         (inside tray.n.01_1 electric_refrigerator.n.01_1)
         (ontop bucket.n.01_1 bar.n.02_1) 
         (ontop corkscrew.n.01_1 bar.n.02_1) 
-        (ontop shot_glass.n.01_1 shelf.n.01_1)
-        (ontop shot_glass.n.01_2 shelf.n.01_1)
-        (ontop wineglass.n.01_1 shelf.n.01_1)
-        (ontop wineglass.n.01_2 shelf.n.01_1)
-        (ontop water_glass.n.02_1 shelf.n.01_2)
-        (ontop water_glass.n.02_2 shelf.n.01_2)
+        (ontop shot_glass.n.01_1 bar.n.02_1)
+        (ontop shot_glass.n.01_2 bar.n.02_1)
+        (ontop wineglass.n.01_1 bar.n.02_1)
+        (ontop wineglass.n.01_2 bar.n.02_1)
+        (ontop water_glass.n.02_1 bar.n.02_1)
+        (ontop water_glass.n.02_2 bar.n.02_1)
         (inroom bar.n.02_1 bar) 
-        (inroom electric_refrigerator.n.01_1 bar) 
-        (inroom shelf.n.01_1 bar) 
-        (inroom shelf.n.01_2 bar) 
+        (inroom electric_refrigerator.n.01_1 bar)
         (inroom floor.n.01_1 bar) 
         (ontop agent.n.01_1 floor.n.01_1)
     )