QueueManagedJob and MouldAssemblyBuffer updated

dream/simulation/MouldAssemblyBuffer.py

@@ -27,7 +27,8 @@ Only if all the mould (order) components are present, will it be able to dispose
 '''
 
 from QueueManagedJob import QueueManagedJob
-from SimPy.Simulation import now
+# from SimPy.Simulation import now
+import simpy
 
 # ===========================================================================
 # Error in the setting up of the WIP
@@ -109,7 +110,7 @@ class MouldAssemblyBuffer(QueueManagedJob):
                 for secondary in [x for x in activeEntity.order.secondaryComponentsList if activeEntity.order.basicsEnded]:
                     if secondary.currentStation.__class__.__name__=='ConditionalBuffer':
 #                         print now(), self.id, '                                                    signalling conditional buffer'
-                        secondary.currentStation.canDispose.signal(now())
+                        secondary.currentStation.canDispose.succeed(self.env.now)
                         break
             # for all the components that have the same parent Order as the activeEntity
             activeEntity.order.componentsReadyForAssembly = 1

dream/simulation/QueueManagedJob.py

@@ -25,7 +25,8 @@ Created on 4 Feb 2014
 inherits from QueueJobShop. The difference is that it reads the operator from the Entity and
 checks if he is available before it disposed it
 '''
-from SimPy.Simulation import now
+# from SimPy.Simulation import now
+import simpy
 from QueueJobShop import QueueJobShop
 
 # ===========================================================================
@@ -116,7 +117,7 @@ class QueueManagedJob(QueueJobShop):
                         if not G.Router.invoked:
 #                             self.printTrace(self.id, signal='router')
                             G.Router.invoked=True
-                            G.Router.isCalled.signal(now())
+                            G.Router.isCalled.succeed(self.env.now)
                         return True
             else:
                 return False