Commit 49f94abd authored by Georgios Dagkakis's avatar Georgios Dagkakis

machine to be able to have technology attr. This is good for grouping machines

parent dc2c9978
...@@ -49,6 +49,7 @@ class BatchScrapMachine(Machine): ...@@ -49,6 +49,7 @@ class BatchScrapMachine(Machine):
operatorPool='None',operationType='None',\ operatorPool='None',operationType='None',\
setupTime=None, loadTime=None, setupTime=None, loadTime=None,
canDeliverOnInterruption=False, canDeliverOnInterruption=False,
technology=None,
**kw): **kw):
if not processingTime: if not processingTime:
processingTime = {'distributionType': 'Fixed', processingTime = {'distributionType': 'Fixed',
...@@ -61,6 +62,7 @@ class BatchScrapMachine(Machine): ...@@ -61,6 +62,7 @@ class BatchScrapMachine(Machine):
canDeliverOnInterruption=canDeliverOnInterruption, canDeliverOnInterruption=canDeliverOnInterruption,
operatorPool=operatorPool,operationType=operationType,\ operatorPool=operatorPool,operationType=operationType,\
setupTime=setupTime, loadTime=loadTime, setupTime=setupTime, loadTime=loadTime,
technology=technology
) )
# set the attributes of the scrap quantity distribution # set the attributes of the scrap quantity distribution
......
...@@ -54,7 +54,7 @@ class Machine(CoreObject): ...@@ -54,7 +54,7 @@ class Machine(CoreObject):
operatorPool='None',operationType='None',\ operatorPool='None',operationType='None',\
setupTime=None, loadTime=None, setupTime=None, loadTime=None,
preemption={}, preemption={},
canDeliverOnInterruption=False, **kw): canDeliverOnInterruption=False, technology=None,**kw):
self.type="Machine" #String that shows the type of object self.type="Machine" #String that shows the type of object
CoreObject.__init__(self, id, name) CoreObject.__init__(self, id, name)
from Globals import G from Globals import G
...@@ -120,6 +120,8 @@ class Machine(CoreObject): ...@@ -120,6 +120,8 @@ class Machine(CoreObject):
self.multOperationTypeList = OTlist self.multOperationTypeList = OTlist
else: else:
self.multOperationTypeList.append(self.operationType) self.multOperationTypeList.append(self.operationType)
# technology is used to group machines that perform the same operation when needed
self.technology=technology
# flags used for preemption purposes # flags used for preemption purposes
self.isPreemptive=False self.isPreemptive=False
......
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