Merge branch 'master' of msdl.uantwerpen.be:yentl/PythonPDEVS

This commit is contained in:
Yentl Van Tendeloo 2017-12-15 09:40:58 +01:00
commit 56810fd457
18 changed files with 537 additions and 4 deletions

View file

@ -657,10 +657,10 @@ class CoupledDEVS(BaseDEVS):
" '%s' and '%s' belong to the same model" +
" '%s'. " +
" Direct feedback coupling not allowed") % (
self.getModelFullName(),
p1.getPortFullName(),
p2.getPortFullName(),
p1.host_DEVS.getModelFullName()))
self.getModelName(),
p1.getPortName(),
p2.getPortName(),
p1.host_DEVS.getModelName()))
else:
p1.outline.append(p2)
p2.inline.append(p1)