Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
08651c3d
Commit
08651c3d
authored
Jun 29, 2015
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction in SkilledRouter
parent
a9bc89f9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
dream/simulation/SkilledOperatorRouter.py
dream/simulation/SkilledOperatorRouter.py
+1
-6
No files found.
dream/simulation/SkilledOperatorRouter.py
View file @
08651c3d
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment