misc bug fixes

This commit is contained in:
Markus 2019-02-15 09:11:58 -02:00
parent ed2ccf5421
commit 47cfc12560
3 changed files with 4 additions and 4 deletions

View File

@ -30,7 +30,7 @@ class Configuration(object):
elif (key=='mechanisms'): elif (key=='mechanisms'):
self.partial_state_updates = value self.partial_state_updates = value
if (self.state_dict == {}): if (self.initial_state == {}):
raise Exception('The initial conditions of the system have not been set') raise Exception('The initial conditions of the system have not been set')
@ -118,7 +118,7 @@ class Processor:
return sdf_values, bdf_values return sdf_values, bdf_values
elif (bdf.empty == True) and (sdf.empty == False): elif (bdf.empty == True) and (sdf.empty == False):
sdf_values = sdf.values.tolist() sdf_values = sdf.values.tolist()
bdf_values = [[self.b_identity] * len(sdf_values) for m in range(len(partial_state_updates))] bdf_values = [[self.p_identity] * len(sdf_values) for m in range(len(partial_state_updates))]
return sdf_values, bdf_values return sdf_values, bdf_values
else: else:
sdf_values = sdf.values.tolist() sdf_values = sdf.values.tolist()
@ -159,7 +159,7 @@ class Processor:
if len(partial_state_updates) != 0: if len(partial_state_updates) != 0:
sanitize_partial_state_updates(partial_state_updates) sanitize_partial_state_updates(partial_state_updates)
bdf = self.create_matrix_field(partial_state_updates, 'policies') bdf = self.create_matrix_field(partial_state_updates, 'policies')
sdf = self.create_matrix_field(partial_state_updates, 'states') sdf = self.create_matrix_field(partial_state_updates, 'state_update_functions')
sdf_values, bdf_values = no_update_handler(bdf, sdf) sdf_values, bdf_values = no_update_handler(bdf, sdf)
zipped_list = list(zip(sdf_values, bdf_values)) zipped_list = list(zip(sdf_values, bdf_values))
else: else:

Binary file not shown.

BIN
dist/cadCAD-0.2.tar.gz vendored

Binary file not shown.