Commit ae360855 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis

minro clean-up

parent dda1f9bf
...@@ -236,8 +236,6 @@ class BatchReassembly(CoreObject): ...@@ -236,8 +236,6 @@ class BatchReassembly(CoreObject):
numberOfUnits+=subBatch.numberOfUnits numberOfUnits+=subBatch.numberOfUnits
# the batch to be reassembled # the batch to be reassembled
batchToBeReassembled = activeObjectQueue[0].parentBatch batchToBeReassembled = activeObjectQueue[0].parentBatch
# # if the activeEntity is hot then the subBatches should be also hot
# batchToBeReassembled.hot=activeObjectQueue[0].hot
# if the activeEntity is in the pendingEntities list then place the subBatches there # if the activeEntity is in the pendingEntities list then place the subBatches there
if activeObjectQueue[0] in G.pendingEntities: if activeObjectQueue[0] in G.pendingEntities:
G.pendingEntities.append(batchToBeReassembled) G.pendingEntities.append(batchToBeReassembled)
......
...@@ -263,16 +263,6 @@ def setWIP(entityList): ...@@ -263,16 +263,6 @@ def setWIP(entityList):
# the following to be performed only if there is a current station. Orders, Projects e.t.c do not have # the following to be performed only if there is a current station. Orders, Projects e.t.c do not have
# TODO, maybe we should loop in wiplist here # TODO, maybe we should loop in wiplist here
if (not (entity.currentStation in G.MachineList)) and entity.currentStation: if (not (entity.currentStation in G.MachineList)) and entity.currentStation:
# variable to inform whether the successors are machines or not
successorsAreMachines=True
for nextObject in entity.currentStation.next:
if not nextObject in G.MachineList:
successorsAreMachines=False
break
if not successorsAreMachines:
entity.hot = False
else:
entity.hot = True
# add the entity to the pendingEntities list # add the entity to the pendingEntities list
G.pendingEntities.append(entity) G.pendingEntities.append(entity)
......
...@@ -53,10 +53,6 @@ class Mould(Job): # inherits from the Job class ...@@ -53,10 +53,6 @@ class Mould(Job): # inherits from the Job class
# if the order is not None, and the order.manager is given # if the order is not None, and the order.manager is given
if self.order.manager: if self.order.manager:
self.manager=self.order.manager self.manager=self.order.manager
#=======================================================================
# variable to be used by OperatorRouter
self.hot=False
#=======================================================================
# used by printRoute # used by printRoute
if self.order: if self.order:
self.alias=self.order.alias+'C'+str(len(G.OrderComponentList)) self.alias=self.order.alias+'C'+str(len(G.OrderComponentList))
\ No newline at end of file
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