unused attributes removed

dream/simulation/ConditionalBuffer.py

@@ -59,28 +59,6 @@ class ConditionalBuffer(QueueManagedJob):
         activeObject=self.getActiveObject()
         activeObjectQueue=self.getActiveObjectQueue()
         
-#         # TODO: when the callerObject is not defined will receive error ass the checkIfResourceIsAvailable requests a caller
-#         
-#         #search if for one or more of the Entities the operator is available
-#         haveEntityWithAvailableManager=False
-#         for entity in [x for x in activeObjectQueue if x.manager]:
-#             if entity.manager.checkIfResourceIsAvailable(thecaller):
-#                 haveEntityWithAvailableManager=True
-#                 break
-#         #if none of the Entities has an available manager return False
-#         if not haveEntityWithAvailableManager:
-#             return False
-#         #sort the internal queue so that the Entities that have an available manager go in the front
-#         activeObject.sortEntities()
-#         #if we have only one possible receiver just check if the Queue holds one or more entities
-#         if(callerObject==None):
-#             return len(activeObjectQueue)>0
-#         
-#         #return True if the Queue has Entities and the caller is in the self.next list
-#         return len(activeObjectQueue)>0\
-#                 and (thecaller in activeObject.next)\
-#                 and thecaller.isInRoute(activeObject)
-        
         # and then perform the default behaviour
         if QueueManagedJob.haveToDispose(self,callerObject):
             return activeObject.checkCondition()

dream/simulation/Machine.py

@@ -203,11 +203,6 @@ class Machine(CoreObject):
         self.setupTimeCurrentEntity = 0             # holds the time to setup the machine before processing the current entity
         # TODO: check whether the requestingEntity variable can be used in OperatorPreemptive
         self.requestingEntity=None
-        # flag that shows if the station is ready to proceed with the getEntity
-        #    the router must set the flag to false if the station must not proceed with getEntity
-        #    he must also assign the operator to the station that will proceed (operatorAssignedTo)
-        self.canProceedWithGetEntity=False
-        self.inPositionToGet=False
         # variables used for interruptions
         self.tinM=0
         self.timeRestartingProcessing=0
@@ -746,7 +741,6 @@ class Machine(CoreObject):
     #                   prepare the machine to be operated
     # =======================================================================
     def requestRouter(self):
-        self.inPositionToGet=True
         if not self.router.isCalled():
             self.router.invoke()
             

dream/simulation/MachineJobShop.py

@@ -49,10 +49,7 @@ class MachineJobShop(Machine):
         activeObject=self.getActiveObject()
         activeObjectQueue=activeObject.getActiveObjectQueue()
         activeEntity=activeObjectQueue[0]
-        #=======================================================================
-#         # TESTING
-#         print activeObject.getActiveObjectQueue()[0].name,"ended processing in "+activeObject.objName
-        #=======================================================================
+        self.printTrace(activeObject.getActiveObjectQueue()[0].name,"ended processing in "+activeObject.objName)
         # reset the variables used to handle the interruptions timing 
         self.timeRestartingProcessing=0
         self.breakTime=0

dream/simulation/Queue.py

@@ -70,8 +70,6 @@ class Queue(CoreObject):
         self.wip_stat_list = []
         # event used by router
         self.loadOperatorAvailable=SimEvent('loadOperatorAvailable')
-        # flag used by router to check whether the 
-        self.canProceedWithGetEntity=False
 
     @staticmethod
     def getSupportedSchedulingRules():