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

StanfordVL · Mar 14, 2024 · 30c561e · 30c561e
2 parents c327653 + 4534d3b
commit 30c561e
Show file tree

Hide file tree

Showing 8 changed files with 1,422 additions and 1,436 deletions.
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
@@ -28392,12 +28392,12 @@
                                     "wardrobe"
                                   ],
                                   "abilities": {
+                                    "attachable": {},
                                     "disinfectable": {},
                                     "dustyable": {},
                                     "grassyable": {},
                                     "moldyable": {},
                                     "nonSubstance": {},
-                                    "openable": {},
                                     "rigidBody": {},
                                     "rustable": {},
                                     "sceneObject": {},
@@ -107379,7 +107379,6 @@
                                         "coatrack"
                                       ],
                                       "abilities": {
-                                        "attachable": {},
                                         "breakable": {},
                                         "disinfectable": {},
                                         "dustyable": {},

diff --git a/bddl/generated_data/propagated_annots_canonical.json b/bddl/generated_data/propagated_annots_canonical.json
@@ -11263,7 +11263,6 @@
     "visualSubstance": {}
   },
   "coatrack.n.01": {
-    "attachable": {},
     "breakable": {},
     "disinfectable": {},
     "dustyable": {},
@@ -49327,12 +49326,12 @@
     "wrinkleable": {}
   },
   "wardrobe.n.01": {
+    "attachable": {},
     "disinfectable": {},
     "dustyable": {},
     "grassyable": {},
     "moldyable": {},
     "nonSubstance": {},
-    "openable": {},
     "rigidBody": {},
     "rustable": {},
     "sceneObject": {},

diff --git a/bddl/generated_data/propagated_annots_params.json b/bddl/generated_data/propagated_annots_params.json
@@ -21918,7 +21918,6 @@
         "visualSubstance": {}
     },
     "coatrack.n.01": {
-        "attachable": {},
         "breakable": {},
         "disinfectable": {},
         "dustyable": {},
@@ -111681,12 +111680,12 @@
         "wrinkleable": {}
     },
     "wardrobe.n.01": {
+        "attachable": {},
         "disinfectable": {},
         "dustyable": {},
         "grassyable": {},
         "moldyable": {},
         "nonSubstance": {},
-        "openable": {},
         "rigidBody": {},
         "rustable": {},
         "sceneObject": {},

diff --git a/bddl/generated_data/properties_to_synsets.json b/bddl/generated_data/properties_to_synsets.json
@@ -38314,7 +38314,6 @@
         "canoe.n.01",
         "car.n.01",
         "clothesline_rope.n.01",
-        "coatrack.n.01",
         "cork.n.04",
         "curtain_rod.n.01",
         "dartboard.n.01",
@@ -38362,6 +38361,7 @@
         "trout.n.01",
         "vegetation.n.01",
         "wall_nail.n.01",
+        "wardrobe.n.01",
         "webcam.n.02",
         "wind_chime.n.01",
         "window_blind.n.01",
@@ -42716,7 +42716,6 @@
         "toaster_oven.n.01",
         "trailer.n.03",
         "van.n.05",
-        "wardrobe.n.01",
         "washer.n.03",
         "white_goods.n.01",
         "window.n.01"

diff --git a/bddl/generated_data/syn_prop_annots_canonical.json b/bddl/generated_data/syn_prop_annots_canonical.json
@@ -9067,7 +9067,6 @@
         "breakable": {},
         "rigidBody": {},
         "nonSubstance": {},
-        "attachable": {},
         "wetable": {},
         "stickyable": {},
         "dustyable": {},
@@ -30020,10 +30019,10 @@
         "disinfectable": {}
     },
     "wardrobe.n.01": {
-        "openable": {},
         "sceneObject": {},
         "rigidBody": {},
         "nonSubstance": {},
+        "attachable": {},
         "wetable": {},
         "stickyable": {},
         "dustyable": {},

diff --git a/bddl/generated_data/synsets.csv b/bddl/generated_data/synsets.csv
@@ -2063,7 +2063,7 @@ wallboard.n.01,board.n.03,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody
 wallet.n.01,case.n.05,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody
 wallpaper.n.01,paper.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody
 walnut.n.01,edible_nut.n.01,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody
-wardrobe.n.01,furniture.n.01,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody
+wardrobe.n.01,furniture.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody
 washer.n.03,white_goods.n.01,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,rigidBody
 watch.n.01,timepiece.n.01,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,rigidBody
 water__atomizer.n.01,dispenser.n.01,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,rigidBody

diff --git a/bddl/generated_data/synsets_to_descriptors.json b/bddl/generated_data/synsets_to_descriptors.json
@@ -33093,10 +33093,6 @@
     "coat_of_paint.n.01": [],
     "coating.n.01": [],
     "coatrack.n.01": [
-        [
-            "attached",
-            "attached"
-        ],
         [
             "broken",
             "broken"
@@ -136222,6 +136218,10 @@
         ]
     ],
     "wardrobe.n.01": [
+        [
+            "attached",
+            "attached"
+        ],
         [
             "disinfected",
             "disinfected"
@@ -136238,10 +136238,6 @@
             "moldy",
             "moldy"
         ],
-        [
-            "open",
-            "open"
-        ],
         [
             "rusty",
             "rusty"