jeffemmett
/
cadCAD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support list of mechsteps instead of dict

This commit is contained in:
Markus 2019-02-11 10:01:36 -02:00
parent ef7b42a39a
commit 53c8764563
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SimCAD/configuration/__init__.py
View File

@ -108,18 +108,29 @@ class Processor:
bdf_values = [[self.b_identity] * len(sdf_values)] bdf_values = [[self.b_identity] * len(sdf_values)]
return sdf_values, bdf_values return sdf_values, bdf_values
if len(mechanisms) != 0: def sanitize_mechanisms(m):
# for backwards compatibility we accept the old keys # for backwards compatibility we accept the old keys
# ('behaviors' and 'states') and rename them # ('behaviors' and 'states') and rename them
for k, v in mechanisms.items(): def rename_keys(d):
try: try:
v['policies'] = v.pop('behaviors') d['policies'] = d.pop('behaviors')
except KeyError: except KeyError:
pass pass
try: try:
v['state_update_functions'] = v.pop('states') d['state_update_functions'] = d.pop('states')
except KeyError: except KeyError:
pass pass
if (type(m)==list):
for v in m:
rename_keys(v)
elif (type(m)==dict):
for k, v in mechanisms.items():
rename_keys(v)
return
if len(mechanisms) != 0:
sanitize_mechanisms(mechanisms)
bdf = self.create_matrix_field(mechanisms, 'policies') bdf = self.create_matrix_field(mechanisms, 'policies')
sdf = self.create_matrix_field(mechanisms, 'state_update_functions') sdf = self.create_matrix_field(mechanisms, 'state_update_functions')
sdf_values, bdf_values = no_update_handler(bdf, sdf) sdf_values, bdf_values = no_update_handler(bdf, sdf)