SkilledOperatorRouter to pass previous assignment to LP method. Default weight...

SkilledOperatorRouter to pass previous assignment to LP method. Default weight set to 0 so that old tests run. weights to be set as input

dream/simulation/SkilledOperatorRouter.py

@@ -195,7 +195,7 @@ class SkilledRouter(Router):
                 #     as it doesn't support zero WIP levels
                 #===================================================================
                 solution=opAss_LP(self.availableStationsDict, self.availableOperatorList, 
-                                  self.operators)
+                                  self.operators, previousAssignment=self.previousSolution)
 #                 print '-------'
 #                 print self.env.now, solution
                 # XXX assign the operators to operatorPools

dream/simulation/opAss_LPmethod.py

@@ -4,7 +4,7 @@ Created on 2 Jul 2014
 @author: Anna
 '''
 
-def opAss_LP(machineList, PBlist, PBskills, previousAssignment={}, weightFactors = [2, 1, 0.5, 2, 1, 1], Tool={}):
+def opAss_LP(machineList, PBlist, PBskills, previousAssignment={}, weightFactors = [2, 1, 0, 2, 1, 1], Tool={}):
     
     from pulp import LpProblem, LpMaximize, LpVariable, LpBinary, lpSum, LpStatus
     import pulp