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
fcf9dbaf
Commit
fcf9dbaf
authored
Jan 09, 2016
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SkilledOperatorRouter to consider machine blocked if the reassembly is blocked
parent
86e35941
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
dream/simulation/SkilledOperatorRouter.py
dream/simulation/SkilledOperatorRouter.py
+9
-1
No files found.
dream/simulation/SkilledOperatorRouter.py
View file @
fcf9dbaf
...
@@ -218,9 +218,17 @@ class SkilledRouter(Router):
...
@@ -218,9 +218,17 @@ class SkilledRouter(Router):
machinesForSecondPhaseDict
=
{}
machinesForSecondPhaseDict
=
{}
for
stationId
in
self
.
availableStationsDict
.
keys
():
for
stationId
in
self
.
availableStationsDict
.
keys
():
machine
=
Globals
.
findObjectById
(
stationId
)
machine
=
Globals
.
findObjectById
(
stationId
)
if
machine
.
isBlocked
:
nextObject
=
machine
.
next
[
0
]
nextObjectClassName
=
nextObject
.
__class__
.
__name__
reassemblyBlocksMachine
=
False
if
'Reassembly'
in
nextObjectClassName
:
if
nextObject
.
getActiveObjectQueue
():
if
nextObject
.
getActiveObjectQueue
()[
0
].
type
==
'Batch'
:
reassemblyBlocksMachine
=
True
if
machine
.
isBlocked
or
reassemblyBlocksMachine
:
machinesForSecondPhaseDict
[
stationId
]
=
self
.
availableStationsDict
[
stationId
]
machinesForSecondPhaseDict
[
stationId
]
=
self
.
availableStationsDict
[
stationId
]
del
self
.
availableStationsDict
[
stationId
]
del
self
.
availableStationsDict
[
stationId
]
# run the LP method only for the machines that are not blocked
# run the LP method only for the machines that are not blocked
solution
=
opAss_LP
(
self
.
availableStationsDict
,
self
.
availableOperatorList
,
solution
=
opAss_LP
(
self
.
availableStationsDict
,
self
.
availableOperatorList
,
self
.
operators
,
previousAssignment
=
self
.
previousSolution
,
self
.
operators
,
previousAssignment
=
self
.
previousSolution
,
...
...
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