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
98bda3c9
Commit
98bda3c9
authored
Mar 03, 2015
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'loadOperatorSynch'
parents
a60a1fbb
5b016013
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
12 deletions
+14
-12
dream/simulation/Machine.py
dream/simulation/Machine.py
+13
-3
dream/tests/dump/SkilledOperatorParallel01.json.result
dream/tests/dump/SkilledOperatorParallel01.json.result
+1
-9
No files found.
dream/simulation/Machine.py
View file @
98bda3c9
...
@@ -576,14 +576,24 @@ class Machine(CoreObject):
...
@@ -576,14 +576,24 @@ class Machine(CoreObject):
assert
eventTime
==
self
.
env
.
now
,
'interruptionEnd received later than created'
assert
eventTime
==
self
.
env
.
now
,
'interruptionEnd received later than created'
self
.
printTrace
(
self
.
id
,
interruptionEnd
=
str
(
eventTime
))
self
.
printTrace
(
self
.
id
,
interruptionEnd
=
str
(
eventTime
))
self
.
interruptionEnd
=
self
.
env
.
event
()
self
.
interruptionEnd
=
self
.
env
.
event
()
# try to signal the Giver, otherwise wait until it is requested
if
self
.
signalGiver
():
break
if
self
.
loadOperatorAvailable
in
receivedEvent
:
if
self
.
loadOperatorAvailable
in
receivedEvent
:
transmitter
,
eventTime
=
self
.
loadOperatorAvailable
.
value
transmitter
,
eventTime
=
self
.
loadOperatorAvailable
.
value
assert
eventTime
==
self
.
env
.
now
,
'loadOperatorAvailable received later than created'
assert
eventTime
==
self
.
env
.
now
,
'loadOperatorAvailable received later than created'
self
.
printTrace
(
self
.
id
,
loadOperatorAvailable
=
str
(
eventTime
))
self
.
printTrace
(
self
.
id
,
loadOperatorAvailable
=
str
(
eventTime
))
self
.
loadOperatorAvailable
=
self
.
env
.
event
()
self
.
loadOperatorAvailable
=
self
.
env
.
event
()
# try to signal the Giver, otherwise wait until it is requested
# try to signal the Giver, otherwise wait until it is requested
if
self
.
signalGiver
():
if
self
.
signalGiver
():
break
from
Globals
import
G
# XXX cleaner implementation needed
# if there is router that is not skilled break
if
G
.
Router
:
if
not
'Skilled'
in
str
(
G
.
Router
.
__class__
):
break
# else continue, the giver should also check
continue
if
self
.
initialWIP
in
receivedEvent
:
if
self
.
initialWIP
in
receivedEvent
:
transmitter
,
eventTime
=
self
.
initialWIP
.
value
transmitter
,
eventTime
=
self
.
initialWIP
.
value
assert
transmitter
==
self
.
env
,
'initialWIP was not sent by the Environment'
assert
transmitter
==
self
.
env
,
'initialWIP was not sent by the Environment'
...
...
dream/tests/dump/SkilledOperatorParallel01.json.result
View file @
98bda3c9
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
],
],
"schedule": [
"schedule": [
{
{
"entranceTime": 0,
"entranceTime": 0
.0
,
"stationId": "M1"
"stationId": "M1"
}
}
],
],
...
@@ -162,14 +162,6 @@
...
@@ -162,14 +162,6 @@
0.0,
0.0,
2.0
2.0
],
],
[
0.0,
1.0
],
[
0.0,
1.0
],
[
[
0.0,
0.0,
2.0
2.0
...
...
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