Commit 4a66a23a authored by Georgios Dagkakis's avatar Georgios Dagkakis

operator to ouput schedule

parent 0b842589
...@@ -37,7 +37,7 @@ from ObjectResource import ObjectResource ...@@ -37,7 +37,7 @@ from ObjectResource import ObjectResource
class Operator(ObjectResource): class Operator(ObjectResource):
family='Operator' family='Operator'
def __init__(self, id, name, capacity=1, schedulingRule='FIFO', skills=[], available=True,**kw): def __init__(self, id, name, capacity=1, schedulingRule='FIFO', skills=[], available=True,ouputSchedule=False,**kw):
ObjectResource.__init__(self,id=id, name=name) ObjectResource.__init__(self,id=id, name=name)
self.objName=name self.objName=name
self.capacity=int(capacity) # repairman is an instance of resource self.capacity=int(capacity) # repairman is an instance of resource
...@@ -83,6 +83,8 @@ class Operator(ObjectResource): ...@@ -83,6 +83,8 @@ class Operator(ObjectResource):
self.available=available self.available=available
from Globals import G from Globals import G
G.OperatorsList.append(self) G.OperatorsList.append(self)
# flag to show if the operator will output his schedule in the results
self.ouputSchedule=ouputSchedule
def initialize(self): def initialize(self):
ObjectResource.initialize(self) ObjectResource.initialize(self)
...@@ -330,6 +332,11 @@ class Operator(ObjectResource): ...@@ -330,6 +332,11 @@ class Operator(ObjectResource):
json['results']['working_ratio'] = getConfidenceIntervals(self.Working) json['results']['working_ratio'] = getConfidenceIntervals(self.Working)
json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting) json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting)
json['results']['off_shift_ratio'] = getConfidenceIntervals(self.OffShift) json['results']['off_shift_ratio'] = getConfidenceIntervals(self.OffShift)
if self.ouputSchedule:
if self.schedule:
json['results']['schedule']=[]
for record in self.schedule:
json['results']['schedule'].append({'stationId':record[0].id,'time':record[1]})
G.outputJSON['elementList'].append(json) G.outputJSON['elementList'].append(json)
#=========================================================================== #===========================================================================
......
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