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
5238fb27
Commit
5238fb27
authored
Sep 09, 2014
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more objects to reset after signalling
parent
b5661200
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
0 deletions
+5
-0
dream/simulation/Globals.py
dream/simulation/Globals.py
+2
-0
dream/simulation/MachineJobShop.py
dream/simulation/MachineJobShop.py
+1
-0
dream/simulation/ManPyObject.py
dream/simulation/ManPyObject.py
+2
-0
No files found.
dream/simulation/Globals.py
View file @
5238fb27
...
...
@@ -283,6 +283,7 @@ def setWIP(entityList):
if
entity
.
currentStation
.
expectedSignals
[
'canDispose'
]:
succeedTuple
=
(
G
.
env
,
G
.
env
.
now
)
entity
.
currentStation
.
canDispose
.
succeed
(
succeedTuple
)
entity
.
currentStation
.
expectedSignals
[
'canDispose'
]
=
0
# if we are in the start of the simulation the object is of server type then we should send initialWIP signal
# TODO, maybe use 'class_family attribute here'
if
G
.
env
.
now
==
0
and
entity
.
currentStation
:
...
...
@@ -296,6 +297,7 @@ def setWIP(entityList):
if
entity
.
currentStation
.
expectedSignals
[
'initialWIP'
]:
succeedTuple
=
(
G
.
env
,
G
.
env
.
now
)
entity
.
currentStation
.
initialWIP
.
succeed
(
succeedTuple
)
entity
.
currentStation
.
expectedSignals
[
'initialWIP'
]
=
0
def
countIntervalThroughput
():
...
...
dream/simulation/MachineJobShop.py
View file @
5238fb27
...
...
@@ -295,6 +295,7 @@ class MachineJobShop(Machine):
if
self
.
expectedSignals
[
'preemptQueue'
]:
succeedTuple
=
(
self
,
self
.
env
.
now
)
self
.
preemptQueue
.
succeed
(
succeedTuple
)
self
.
expectedSignals
[
'preemptQueue'
]
=
0
# TODO: consider the case when a failure has the Station down. The event preempt will not be received now()
# but at a later simulation time.
...
...
dream/simulation/ManPyObject.py
View file @
5238fb27
...
...
@@ -59,6 +59,7 @@ class ManPyObject(object):
G
.
Router
.
invoked
=
True
succeedTuple
=
(
G
.
env
,
G
.
env
.
now
)
G
.
Router
.
isCalled
.
succeed
(
succeedTuple
)
G
.
Router
.
expectedSignals
[
'isCalled'
]
=
0
#===========================================================================
# signalRouter method
...
...
@@ -78,6 +79,7 @@ class ManPyObject(object):
G
.
Router
.
invoked
=
True
succeedTuple
=
(
G
.
env
,
G
.
env
.
now
)
G
.
Router
.
isCalled
.
succeed
(
succeedTuple
)
G
.
Router
.
expectedSignals
[
'isCalled'
]
=
0
return
True
except
:
return
False
...
...
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