Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more migration to bddl #248

Closed
wants to merge 5 commits into from
Closed

more migration to bddl #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f0ef89
more migration to bddl
sanjanasrivastava Jan 10, 2024
1dcb2da
Merge branch 'develop' into particle_remover_annots_synsets
ChengshuLi Jan 10, 2024
aaf45f4
Merge branch 'develop' into particle_remover_annots_synsets
ChengshuLi Jan 10, 2024
c1046cb
Merge branch 'develop' into particle_remover_annots_synsets
ChengshuLi Jan 10, 2024
e3efee1
make particle applier/remover/source/sink param annot human readable
ChengshuLi Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions bddl/data_generation/process_prop_param_annots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
# Helpers
LEAF_SYNSETS_SET = set(pd.read_csv(LEAF_SYNSETS_FILE)["synset"])

# Specific methods for applying / removing particles
class ParticleModifyMethod(IntEnum):
ADJACENCY = 0
PROJECTION = 1

# Specific condition types for applying / removing particles
class ParticleModifyCondition(IntEnum):
FUNCTION = 0
Expand Down Expand Up @@ -83,18 +78,14 @@ def get_synsets_to_particle_remover_params():

default_visual_conditions = parse_conditions_entry(record["other visualSubstances"])
default_physical_conditions = parse_conditions_entry(record["other physicalSubstances"])
if record["method"] == "projection":
method = ParticleModifyMethod.PROJECTION
elif record["method"] == "adjacency":
method = ParticleModifyMethod.ADJACENCY
else:
if record["method"] not in {"projection", "adjacency"}:
raise ValueError(f"Synset {record['synset']} prop particleRemover has invalid method {record['method']}")

remover_kwargs = {
"conditions": {},
"default_visual_conditions": default_visual_conditions,
"default_physical_conditions": default_physical_conditions,
"method": method
"method": record["method"],
}

# Iterate through all the columns headed by a substance, in no particular order since their ultimate location is a dict
Expand Down Expand Up @@ -180,9 +171,9 @@ def create_get_save_propagated_annots_params(syns_to_props):
formatted_conditions = []
for condition in conditions:
if condition == "gravity:True":
formatted_conditions.append((ParticleModifyCondition.GRAVITY, True))
formatted_conditions.append(("gravity", True))
elif condition == "toggled_on:True":
formatted_conditions.append((ParticleModifyCondition.TOGGLEDON, True))
formatted_conditions.append(("toggled_on", True))
else:
raise ValueError(f"Synset {param_record['synset']} prop {prop} has unhandled condition {condition}")
formatted_param_value = {
Expand All @@ -198,7 +189,7 @@ def create_get_save_propagated_annots_params(syns_to_props):
# `method` values
elif param_name == "method":
if (prop == "particleApplier") or (prop == "particleSource"):
formatted_param_value = ParticleModifyMethod.PROJECTION
formatted_param_value = "projection"
else:
raise ValueError(f"prop {prop} not handled for parameter name `method`")

Expand Down
Loading
Loading