Commit 07a18c95 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis

shouldYield method corrected

parent ae767ce7
...@@ -407,7 +407,7 @@ class Machine(CoreObject): ...@@ -407,7 +407,7 @@ class Machine(CoreObject):
methodsRequired.append(tup) methodsRequired.append(tup)
else: else:
methodsNotRequired.append(tup) methodsNotRequired.append(tup)
required = False required = True
from Globals import getMethodFromName from Globals import getMethodFromName
# print ' '*20, 'Requested methods' # print ' '*20, 'Requested methods'
if methodsRequired: if methodsRequired:
...@@ -416,10 +416,8 @@ class Machine(CoreObject): ...@@ -416,10 +416,8 @@ class Machine(CoreObject):
# print ' '*20,method, # print ' '*20,method,
objMethod=getMethodFromName('Dream.Machine.'+method) objMethod=getMethodFromName('Dream.Machine.'+method)
# print objMethod(self) # print objMethod(self)
required = required or (objMethod(self)) required = required and (objMethod(self))
else: notRequired = True
required=True
notRequired = False
# print ' '*20, 'not Requested methods' # print ' '*20, 'not Requested methods'
if methodsNotRequired: if methodsNotRequired:
for methodTup in methodsNotRequired: for methodTup in methodsNotRequired:
...@@ -427,7 +425,9 @@ class Machine(CoreObject): ...@@ -427,7 +425,9 @@ class Machine(CoreObject):
# print ' '*20,method, # print ' '*20,method,
objMethod=getMethodFromName('Dream.Machine.'+method) objMethod=getMethodFromName('Dream.Machine.'+method)
# print objMethod(self) # print objMethod(self)
notRequired = notRequired or (objMethod(self)) notRequired = notRequired and (objMethod(self))
else:
notRequired=False
methodsRequest=required and not notRequired methodsRequest=required and not notRequired
if (self.operatorPool!="None")\ if (self.operatorPool!="None")\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment