Commit 08651c3d authored by Georgios Dagkakis's avatar Georgios Dagkakis

correction in SkilledRouter

parent a9bc89f9
...@@ -199,9 +199,6 @@ class SkilledRouter(Router): ...@@ -199,9 +199,6 @@ class SkilledRouter(Router):
LPFlag=True LPFlag=True
if self.checkCondition: if self.checkCondition:
LPFlag=self.checkIfAllocationShouldBeCalled() LPFlag=self.checkIfAllocationShouldBeCalled()
# in case there are not available stations or operators there is no need to call the LP
if (not self.availableStationsDict) or (not self.availableOperatorList):
LPFlag=False
#=================================================================== #===================================================================
# # XXX run the LP assignment algorithm # # XXX run the LP assignment algorithm
...@@ -213,13 +210,11 @@ class SkilledRouter(Router): ...@@ -213,13 +210,11 @@ class SkilledRouter(Router):
import time import time
startLP=time.time() startLP=time.time()
if LPFlag: if LPFlag:
# print self.env.now, 'LP called'
solution=opAss_LP(self.availableStationsDict, self.availableOperatorList, solution=opAss_LP(self.availableStationsDict, self.availableOperatorList,
self.operators, previousAssignment=self.previousSolution, self.operators, previousAssignment=self.previousSolution,
weightFactors=self.weightFactors,Tool=self.tool) weightFactors=self.weightFactors,Tool=self.tool)
else: else:
# print self.env.now, 'no need to call LP' solution=self.previousSolution
solution={}
# print '-------' # print '-------'
# print self.env.now, solution # print self.env.now, solution
# print 'time needed',time.time()-startLP # print 'time needed',time.time()-startLP
......
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