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
ba28a8f8
Commit
ba28a8f8
authored
Sep 30, 2014
by
Ioannis Papagiannopoulos
Committed by
Georgios Dagkakis
Oct 07, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction to router
parent
6356fd9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
dream/simulation/OperatorRouter.py
dream/simulation/OperatorRouter.py
+2
-1
No files found.
dream/simulation/OperatorRouter.py
View file @
ba28a8f8
...
@@ -383,7 +383,8 @@ class Router(ObjectInterruption):
...
@@ -383,7 +383,8 @@ class Router(ObjectInterruption):
for
predecessor
in
station
.
previous
:
for
predecessor
in
station
.
previous
:
if
predecessor
in
self
.
pendingQueues
and
not
station
in
occupiedStations
and
station
.
isInRouteOf
(
predecessor
):
if
predecessor
in
self
.
pendingQueues
and
not
station
in
occupiedStations
and
station
.
isInRouteOf
(
predecessor
):
if
predecessor
.
getActiveObjectQueue
()[
0
]
in
self
.
pending
\
if
predecessor
.
getActiveObjectQueue
()[
0
]
in
self
.
pending
\
and
not
predecessor
.
getActiveObjectQueue
()[
0
]
in
occupiedEntities
:
and
not
predecessor
.
getActiveObjectQueue
()[
0
]
in
occupiedEntities
\
and
not
predecessor
.
getActiveObjectQueue
()[
0
]
in
operator
.
candidateEntities
:
operator
.
candidateEntities
.
append
(
predecessor
.
getActiveObjectQueue
()[
0
])
operator
.
candidateEntities
.
append
(
predecessor
.
getActiveObjectQueue
()[
0
])
# operator.candidateEntities+=[x for x in predecessor.getActiveObjectQueue()
# operator.candidateEntities+=[x for x in predecessor.getActiveObjectQueue()
# if x in self.pending and not x in occupiedEntities]
# if x in self.pending and not x in occupiedEntities]
...
...
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