Skip to content

Commit

Permalink
Merge branch 'develop' into particle_remover_annots_synsets
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChengshuLi
ChengshuLi committed Jan 10, 2024
2 parents aaf45f4 + 8ec756c commit c1046cb
Show file tree
Hide file tree
Showing 14 changed files with 2,170 additions and 2,415 deletions.
4,277 changes: 2,139 additions & 2,138 deletions bddl/generated_data/category_mapping.csv
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions bddl/generated_data/object_renames.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ granola_pile-mwhrhm,1,1,granola_pile,mwhrhm,heap_of_granola,#N/A,heap__of__grano
grass_patch-kqhokv,1,1,grass_patch,kqhokv,bunchgrass,#N/A,bunchgrass.n.01,0,1
gravel_pile-kcsyrn,1,1,gravel_pile,kcsyrn,heap_of_gravel,#N/A,heap__of__gravel.n.01,0,1
diced_green_onion-fjafda,1,1,diced_green_onion,fjafda,diced__green_onion,#N/A,diced__green_onion.n.01,0,1
diced_green_onion-iwoaoo,1,1,diced_green_onion,iwoaoo,diced__green_onion,#N/A,diced__green_onion.n.01,0,0
diced_green_onion-iwoaoo,1,1,diced_green_onion,iwoaoo,diced__green_onion,#N/A,diced__green_onion.n.01,0,1
diced_green_onion-lwuaas,1,1,diced_green_onion,lwuaas,diced__green_onion,#N/A,diced__green_onion.n.01,0,1
grocery_bag-ruryqd,1,1,grocery_bag,ruryqd,paper_bag,#N/A,sack.n.01,0,1
ground_clove-vzamzb,1,1,ground_clove,vzamzb,bottle_of_ground_cloves,#N/A,bottle__of__ground_cloves.n.01,0,1
Expand All @@ -410,8 +410,8 @@ hutch-svhjxd,1,1,hutch,svhjxd,desk,hutch.n.01,desk.n.01,0,1
ink_cartridge-ltblou,1,1,ink_cartridge,ltblou,boxed_ink_cartridge,#N/A,boxed__ink_cartridge.n.01,0,1
ink_cartridge-oepuip,1,1,ink_cartridge,oepuip,boxed_ink_cartridge,#N/A,boxed__ink_cartridge.n.01,0,1
ink_cartridge-oinelo,1,1,ink_cartridge,oinelo,boxed_ink_cartridge,#N/A,boxed__ink_cartridge.n.01,0,1
isopropanol-mjcbfc,1,1,isopropanol,mjcbfc,isopropanol_dispenser,#N/A,isopropanol__dispenser.n.01,0,1
jam-vxjbjf,1,1,jam,vxjbjf,jar_of_jam,#N/A,jar__of__jam.n.01,0,1
isopropanol-mjcbfc,1,1,isopropanol,mjcbfc,isopropanol_dispenser,isopropyl_alcohol.n.01,isopropanol__dispenser.n.01,0,1
jam-vxjbjf,1,1,jam,vxjbjf,jar_of_jam,jam.n.01,jar__of__jam.n.01,0,1
jar-fyfahz,1,1,jar,fyfahz,jar_of_grains,mason_jar.n.01,jar__of__grains.n.01,0,1
jar-gtnmis,1,1,jar,gtnmis,jar_of_grains,mason_jar.n.01,jar__of__grains.n.01,0,1
jar-irqkdw,1,1,jar,irqkdw,jar_of_grains,mason_jar.n.01,jar__of__grains.n.01,0,1
Expand Down Expand Up @@ -1349,3 +1349,4 @@ half_macaron-gafeof,,1,half_macaron,gafeof,half_macaroon,#N/A,half__macaroon.n.0
half_macaron-znmffr,,1,half_macaron,znmffr,half_macaroon,#N/A,half__macaroon.n.01,0,0
half_tortilla_chips-plnyld,,1,half_tortilla_chips,plnyld,half_tortilla_chip,#N/A,half__tortilla_chip.n.01,0,0
half_tortilla_chips-sbleta,,1,half_tortilla_chips,sbleta,half_tortilla_chip,#N/A,half__tortilla_chip.n.01,0,0
savory_spice_shaker-ykujyn,,1,savory_spice_shaker,ykujyn,pepper_shaker,#N/A,pepper__shaker.n.01,0,0
22 changes: 12 additions & 10 deletions bddl/generated_data/output_hierarchy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2390,13 +2390,6 @@
"parsley_shaker"
]
},
{
"name": "savory_spice__shaker.n.01",
"hasModel": true,
"categories": [
"savory_spice_shaker"
]
},
{
"name": "package.n.02",
"hasModel": true,
Expand Down Expand Up @@ -17354,7 +17347,10 @@
"children": [
{
"name": "isopropyl_alcohol.n.01",
"hasModel": true
"hasModel": true,
"categories": [
"isopropanol"
]
}
]
},
Expand Down Expand Up @@ -21145,7 +21141,10 @@
"children": [
{
"name": "jam.n.01",
"hasModel": true
"hasModel": true,
"categories": [
"jam"
]
},
{
"name": "jelly.n.02",
Expand Down Expand Up @@ -29646,7 +29645,10 @@
"children": [
{
"name": "isopropyl_alcohol.n.01",
"hasModel": true
"hasModel": true,
"categories": [
"isopropanol"
]
}
]
},
Expand Down
76 changes: 10 additions & 66 deletions bddl/generated_data/output_hierarchy_properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,6 @@
},
"moldyable": {},
"nonSubstance": {},
"particleApplier": {
"method": "projection",
"conditions": {
"air_freshener": [
[
"toggled_on",
true
]
]
}
},
"rigidBody": {},
"rustable": {},
"scratchable": {},
Expand Down Expand Up @@ -315,17 +304,6 @@
},
"moldyable": {},
"nonSubstance": {},
"particleApplier": {
"method": "projection",
"conditions": {
"deodorant": [
[
"toggled_on",
true
]
]
}
},
"rigidBody": {},
"rustable": {},
"scratchable": {},
Expand Down Expand Up @@ -12221,49 +12199,6 @@
"wrinkleable": {}
}
},
{
"name": "savory_spice__shaker.n.01",
"hasModel": true,
"categories": [
"savory_spice_shaker"
],
"abilities": {
"disinfectable": {},
"dustyable": {},
"freezable": {},
"grassyable": {},
"heatable": {
"heat_temperature": 40.0
},
"moldyable": {},
"needsOrientation": {},
"nonSubstance": {},
"particleApplier": {
"method": "projection",
"conditions": {
"savory_spice": [
[
"toggled_on",
true
],
[
"gravity",
true
]
]
}
},
"rigidBody": {},
"rustable": {},
"scratchable": {},
"stainable": {},
"stickyable": {},
"tarnishable": {},
"toggleable": {},
"wetable": {},
"wrinkleable": {}
}
},
{
"name": "package.n.02",
"hasModel": true,
Expand Down Expand Up @@ -156795,6 +156730,9 @@
{
"name": "isopropyl_alcohol.n.01",
"hasModel": true,
"categories": [
"isopropanol"
],
"abilities": {
"boilable": {},
"flammable": {
Expand Down Expand Up @@ -171496,6 +171434,9 @@
{
"name": "jam.n.01",
"hasModel": true,
"categories": [
"jam"
],
"abilities": {
"boilable": {},
"cookable": {
Expand Down Expand Up @@ -205468,6 +205409,9 @@
{
"name": "isopropyl_alcohol.n.01",
"hasModel": true,
"categories": [
"isopropanol"
],
"abilities": {
"boilable": {},
"flammable": {
Expand Down Expand Up @@ -212940,4 +212884,4 @@
"freezable": {},
"heatable": {}
}
}
}
1 change: 0 additions & 1 deletion bddl/generated_data/prop_param_annots/heatable.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,6 @@ blanket.n.01,40
drink__dispenser.n.01,40
bunchgrass.n.01,40
charcoal.n.01,40
savory_spice__shaker.n.01,40
string.n.01,40
guacamole.n.01,40
box__of__beer.n.01,40
Expand Down
3 changes: 0 additions & 3 deletions bddl/generated_data/prop_param_annots/particleApplier.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
synset,method,conditions,system
acetone__atomizer.n.01,projection,toggled_on:True,acetone
air_freshener__atomizer.n.01,projection,toggled_on:True,air_freshener
allspice__shaker.n.01,projection,toggled_on:True;gravity:True,allspice
ammonia_water__atomizer.n.01,projection,toggled_on:True,ammonia_water
bleaching_agent__atomizer.n.01,projection,toggled_on:True,bleaching_agent
Expand All @@ -12,7 +11,6 @@ coriander__shaker.n.01,projection,toggled_on:True;gravity:True,coriander
cream_of_tartar__shaker.n.01,projection,toggled_on:True;gravity:True,cream_of_tartar
cumin__shaker.n.01,projection,toggled_on:True;gravity:True,cumin
curry_powder__shaker.n.01,projection,toggled_on:True;gravity:True,curry_powder
deodorant__atomizer.n.01,projection,toggled_on:True,deodorant
detergent__atomizer.n.01,projection,toggled_on:True,detergent
drink__dispenser.n.01,projection,toggled_on:True,water
fertilizer__atomizer.n.01,projection,toggled_on:True,fertilizer
Expand All @@ -36,7 +34,6 @@ rubbing_alcohol__atomizer.n.01,projection,toggled_on:True,rubbing_alcohol
saffron__shaker.n.01,projection,toggled_on:True;gravity:True,saffron
sage__shaker.n.01,projection,toggled_on:True;gravity:True,sage
salt__shaker.n.01,projection,toggled_on:True;gravity:True,salt
savory_spice__shaker.n.01,projection,toggled_on:True;gravity:True,savory_spice
sealant__atomizer.n.01,projection,toggled_on:True,sealant
sesame_seed__shaker.n.01,projection,toggled_on:True;gravity:True,sesame_seed
shampoo__dispenser.n.01,projection,toggled_on:True,shampoo
Expand Down
22 changes: 0 additions & 22 deletions bddl/generated_data/propagated_annots_canonical.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@
"heatable": {},
"moldyable": {},
"nonSubstance": {},
"particleApplier": {},
"rigidBody": {},
"rustable": {},
"scratchable": {},
Expand Down Expand Up @@ -18767,7 +18766,6 @@
"heatable": {},
"moldyable": {},
"nonSubstance": {},
"particleApplier": {},
"rigidBody": {},
"rustable": {},
"scratchable": {},
Expand Down Expand Up @@ -46848,26 +46846,6 @@
"freezable": {},
"heatable": {}
},
"savory_spice__shaker.n.01": {
"disinfectable": {},
"dustyable": {},
"freezable": {},
"grassyable": {},
"heatable": {},
"moldyable": {},
"needsOrientation": {},
"nonSubstance": {},
"particleApplier": {},
"rigidBody": {},
"rustable": {},
"scratchable": {},
"stainable": {},
"stickyable": {},
"tarnishable": {},
"toggleable": {},
"wetable": {},
"wrinkleable": {}
},
"saw.n.02": {
"disinfectable": {},
"dustyable": {},
Expand Down
60 changes: 1 addition & 59 deletions bddl/generated_data/propagated_annots_params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,6 @@
},
"moldyable": {},
"nonSubstance": {},
"particleApplier": {
"method": "projection",
"conditions": {
"air_freshener": [
[
"toggled_on",
true
]
]
}
},
"rigidBody": {},
"rustable": {},
"scratchable": {},
Expand Down Expand Up @@ -35878,17 +35867,6 @@
},
"moldyable": {},
"nonSubstance": {},
"particleApplier": {
"method": "projection",
"conditions": {
"deodorant": [
[
"toggled_on",
true
]
]
}
},
"rigidBody": {},
"rustable": {},
"scratchable": {},
Expand Down Expand Up @@ -98727,42 +98705,6 @@
"freezable": {},
"heatable": {}
},
"savory_spice__shaker.n.01": {
"disinfectable": {},
"dustyable": {},
"freezable": {},
"grassyable": {},
"heatable": {
"heat_temperature": 40.0
},
"moldyable": {},
"needsOrientation": {},
"nonSubstance": {},
"particleApplier": {
"method": "projection",
"conditions": {
"savory_spice": [
[
"toggled_on",
true
],
[
"gravity",
true
]
]
}
},
"rigidBody": {},
"rustable": {},
"scratchable": {},
"stainable": {},
"stickyable": {},
"tarnishable": {},
"toggleable": {},
"wetable": {},
"wrinkleable": {}
},
"saw.n.02": {
"disinfectable": {},
"dustyable": {},
Expand Down Expand Up @@ -127878,4 +127820,4 @@
"wetable": {},
"wrinkleable": {}
}
}
}
Loading

0 comments on commit c1046cb

Please sign in to comment.