Merge branch 'develop' of github.com:StanfordVL/bddl into develop

StanfordVL · Mar 15, 2024 · 17dab3c · 17dab3c
2 parents 5650019 + 2b96a52
commit 17dab3c
Show file tree

Hide file tree

Showing 13 changed files with 1,487 additions and 1,483 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup python
       uses: actions/setup-python@v2
       with:
-        python-version: "3.8"
+        python-version: "3.10"
         architecture: x64
 
     - name: Install BDDL
@@ -30,3 +30,6 @@ jobs:
 
     - name: Run transition map tests
       run: python tests/tm_tests.py
+
+    - name: Test if knowledgebase loads OK
+      run: python -c "from bddl.knowledge_base import *"
diff --git a/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl b/bddl/activity_definitions/tidying_up_wardrobe/problem0.bddl
@@ -30,18 +30,18 @@
             (exists 
                 (?hanger.n.02 - hanger.n.02)
                 (and 
-                    (draped ?jersey.n.03_1 ?hanger.n.02_1)
+                    (draped ?jersey.n.03_1 ?hanger.n.02)
                     (not 
-                        (draped ?underwear.n.01_1 ?hanger.n.02_1)
+                        (draped ?underwear.n.01_1 ?hanger.n.02)
                     )
                 )
             )
             (exists 
                 (?hanger.n.02 - hanger.n.02)
                 (and 
-                    (draped ?underwear.n.01_1 ?hanger.n.02_1)
+                    (draped ?underwear.n.01_1 ?hanger.n.02)
                     (not 
-                        (draped ?jersey.n.03_1 ?hanger.n.02_1)
+                        (draped ?jersey.n.03_1 ?hanger.n.02)
                     )
                 )
             )

diff --git a/bddl/generated_data/object_renames.csv b/bddl/generated_data/object_renames.csv
diff --git a/bddl/generated_data/output_hierarchy_properties.json b/bddl/generated_data/output_hierarchy_properties.json
@@ -22449,7 +22449,7 @@
                                         "dust.n.01": [],
                                         "dirt.n.02": [],
                                         "debris.n.01": [],
-                                        "bunchgrass.n.01": [],
+                                        "bunchgrass.n.01": null,
                                         "mud.n.03": [
                                           [
                                             "saturated",
@@ -22997,7 +22997,7 @@
                                         "wrinkle.n.01": null
                                       },
                                       "default_visual_conditions": [],
-                                      "default_non_fluid_conditions": [],
+                                      "default_non_fluid_conditions": null,
                                       "default_fluid_conditions": null,
                                       "method": "adjacency"
                                     },
@@ -23684,10 +23684,30 @@
                                     "particleRemover": {
                                       "conditions": {
                                         "water.n.06": [],
-                                        "dust.n.01": [],
-                                        "dirt.n.02": [],
-                                        "debris.n.01": [],
-                                        "bunchgrass.n.01": [],
+                                        "dust.n.01": [
+                                          [
+                                            "saturated",
+                                            "water.n.06"
+                                          ]
+                                        ],
+                                        "dirt.n.02": [
+                                          [
+                                            "saturated",
+                                            "water.n.06"
+                                          ]
+                                        ],
+                                        "debris.n.01": [
+                                          [
+                                            "saturated",
+                                            "water.n.06"
+                                          ]
+                                        ],
+                                        "bunchgrass.n.01": [
+                                          [
+                                            "saturated",
+                                            "water.n.06"
+                                          ]
+                                        ],
                                         "mud.n.03": [
                                           [
                                             "saturated",
@@ -24234,8 +24254,18 @@
                                         ],
                                         "wrinkle.n.01": null
                                       },
-                                      "default_visual_conditions": [],
-                                      "default_non_fluid_conditions": [],
+                                      "default_visual_conditions": [
+                                        [
+                                          "saturated",
+                                          "water.n.06"
+                                        ]
+                                      ],
+                                      "default_non_fluid_conditions": [
+                                        [
+                                          "saturated",
+                                          "water.n.06"
+                                        ]
+                                      ],
                                       "default_fluid_conditions": [],
                                       "method": "adjacency"
                                     },
@@ -27122,7 +27152,7 @@
                                             "wrinkle.n.01": null
                                           },
                                           "default_visual_conditions": null,
-                                          "default_non_fluid_conditions": [],
+                                          "default_non_fluid_conditions": null,
                                           "default_fluid_conditions": [],
                                           "method": "adjacency"
                                         },
@@ -28397,7 +28427,6 @@
                                     "grassyable": {},
                                     "moldyable": {},
                                     "nonSubstance": {},
-                                    "openable": {},
                                     "rigidBody": {},
                                     "rustable": {},
                                     "sceneObject": {},
@@ -72891,7 +72920,7 @@
                                                 "wrinkle.n.01": null
                                               },
                                               "default_visual_conditions": null,
-                                              "default_non_fluid_conditions": [],
+                                              "default_non_fluid_conditions": null,
                                               "default_fluid_conditions": [],
                                               "method": "adjacency"
                                             },
@@ -126866,7 +126895,7 @@
                                         "wrinkle.n.01": null
                                       },
                                       "default_visual_conditions": null,
-                                      "default_non_fluid_conditions": [],
+                                      "default_non_fluid_conditions": null,
                                       "default_fluid_conditions": [],
                                       "method": "adjacency"
                                     },