diff --git a/PowerDiagram.py b/PowerDiagram.py index 0dd959a..bad1ae9 100644 --- a/PowerDiagram.py +++ b/PowerDiagram.py @@ -150,12 +150,15 @@ class Plug(object): if in_con: # apply incoming connection amperes limitation capacity = add_capacity_constraints (capacity, in_con.get_max_amperes()) + # print(str(self)+ 'after incoming connection amperes limitation, capacity = ' + str(capacity)) else: # apply the machine containing this plug's amperes limitation capacity = add_capacity_constraints (capacity, self.machine.get_max_amperes()) + # print(str(self)+'apply the machine containing this plug s amperes limitation, capacity = ' + str(capacity)) # apply this plug's amperes limitation capacity = add_capacity_constraints (capacity, self.current_capacity_constraint) + # print(str(self)+'after apply this plug s amperes limitation, capacity = ' + str(capacity)) return capacity @@ -178,8 +181,8 @@ class Connection(object): self.current_capacity_constraint = None # the maximum amperes in this connection def __str__(self): - return str(self.from_plug) + ' -> ' + str(self.to_plug) - + return str(self.from_plug) + ' -> ' + str(self.to_plug) + ' (' + str(self.from_plug.get_max_amperes()) + str(self.get_max_amperes()) + 'A)' + def get_max_amperes(self): capacity = self.from_plug.get_max_amperes() capacity = add_capacity_constraints (capacity, self.to_plug.current_capacity_constraint) @@ -248,6 +251,7 @@ class PowerConfig(object): plug_capacity = get_plug_type_attr(cur, plug_type, 'max_amps') #if plug_capacity: # print('plug_capacity : %f A' % plug_capacity) + # print("read_plug_capacity : plug capacity for plug.machine.name="+plug.machine.name+" plug="+str(plug)+" : "+ str(plug_capacity)+ "A") return plug_capacity sqliteDbPath=':memory:' # sqlite-specific special name for a file stored in memory. We could use something like '/tmp/simpadb.sqlite' here but this would make parsing really slow (1 minute instead of 1s), unless either :