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
2af8039a
Commit
2af8039a
authored
Mar 03, 2014
by
Ioannis Papagiannopoulos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fix to entitiesFinishedMoving of OpratorRouter
parent
9191b0f3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
dream/simulation/OperatorRouter.py
dream/simulation/OperatorRouter.py
+7
-1
No files found.
dream/simulation/OperatorRouter.py
View file @
2af8039a
...
@@ -152,6 +152,8 @@ class Router(ObjectInterruption):
...
@@ -152,6 +152,8 @@ class Router(ObjectInterruption):
# pending entities are entities about to enter an other machine, updated by endProcessingActions()
# pending entities are entities about to enter an other machine, updated by endProcessingActions()
# if there are any pending entities
# if there are any pending entities
if
len
(
G
.
pendingEntities
):
if
len
(
G
.
pendingEntities
):
# local variable
allEntitiesMoved
=
False
# for each one of them
# for each one of them
for
entity
in
G
.
pendingEntities
:
for
entity
in
G
.
pendingEntities
:
# if they are residing in a machine which waits to dispose and is functional
# if they are residing in a machine which waits to dispose and is functional
...
@@ -169,12 +171,16 @@ class Router(ObjectInterruption):
...
@@ -169,12 +171,16 @@ class Router(ObjectInterruption):
elif
entity
.
currentStation
in
G
.
QueueList
:
elif
entity
.
currentStation
in
G
.
QueueList
:
# if the hot flag of the entity is raised
# if the hot flag of the entity is raised
if
entity
.
hot
:
if
entity
.
hot
:
return
True
allEntitiesMoved
=
True
# return True
else
:
else
:
return
False
return
False
elif
entity
.
currentStation
in
G
.
OrderDecompositionList
:
elif
entity
.
currentStation
in
G
.
OrderDecompositionList
:
return
False
return
False
# TODO: this list can check all the available object in G.objList
# TODO: this list can check all the available object in G.objList
# if no entity returned False then return True
if
allEntitiesMoved
:
return
True
return
True
return
True
# =======================================================================
# =======================================================================
...
...
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