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
1d4fc3c6
Commit
1d4fc3c6
authored
Sep 09, 2014
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CoreObject to send isRequested also in the new way
parent
9164973f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
dream/simulation/Assembly.py
dream/simulation/Assembly.py
+1
-0
dream/simulation/CoreObject.py
dream/simulation/CoreObject.py
+4
-2
No files found.
dream/simulation/Assembly.py
View file @
1d4fc3c6
...
...
@@ -168,6 +168,7 @@ class Assembly(CoreObject):
for
i
in
range
(
self
.
getActiveObjectQueue
()[
0
].
capacity
):
#this loop will be carried until the Frame is full with the parts
self
.
printTrace
(
self
.
id
,
waitEvent
=
'(to load parts)'
)
self
.
expectedSignals
[
'isRequested'
]
=
1
yield
self
.
isRequested
if
self
.
isRequested
.
value
:
transmitter
,
eventTime
=
self
.
isRequested
.
value
...
...
dream/simulation/CoreObject.py
View file @
1d4fc3c6
...
...
@@ -493,8 +493,10 @@ class CoreObject(ManPyObject):
self
.
printTrace
(
self
.
id
,
signalReceiver
=
self
.
receiver
.
id
)
# assign the entry of the receiver
self
.
receiver
.
assignEntryTo
()
if
self
.
receiver
.
expectedSignals
[
'isRequested'
]:
succeedTuple
=
(
self
,
self
.
env
.
now
)
self
.
receiver
.
isRequested
.
succeed
(
succeedTuple
)
self
.
receiver
.
expectedSignals
[
'isRequested'
]
=
0
return
True
# if no receiver can accept then try to preempt a receive if the stations holds a critical order
self
.
preemptReceiver
()
...
...
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