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
e2f6a4f4
Commit
e2f6a4f4
authored
Jul 14, 2014
by
Ioannis Papagiannopoulos
Committed by
Georgios Dagkakis
Sep 01, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cherry-pick from readWIPseperatelly. schedule now holds exit time from stations
parent
5bfbf793
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
dream/simulation/CoreObject.py
dream/simulation/CoreObject.py
+7
-0
dream/simulation/MouldAssembly.py
dream/simulation/MouldAssembly.py
+6
-2
No files found.
dream/simulation/CoreObject.py
View file @
e2f6a4f4
...
@@ -181,6 +181,13 @@ class CoreObject(object):
...
@@ -181,6 +181,13 @@ class CoreObject(object):
self
.
timeLastEntityLeft
=
self
.
env
.
now
self
.
timeLastEntityLeft
=
self
.
env
.
now
self
.
outputTrace
(
entity
.
name
,
"released "
+
self
.
objName
)
self
.
outputTrace
(
entity
.
name
,
"released "
+
self
.
objName
)
#append the time to schedule so that it can be read in the result
#remember that every entity has it's schedule which is supposed to be updated every time
# he entity enters a new object
if
entity
.
schedule
:
entity
.
schedule
[
-
1
].
append
(
self
.
env
.
now
)
# update wipStatList
# update wipStatList
if
self
.
gatherWipStat
:
if
self
.
gatherWipStat
:
self
.
wipStatList
.
append
([
self
.
env
.
now
,
len
(
activeObjectQueue
)])
self
.
wipStatList
.
append
([
self
.
env
.
now
,
len
(
activeObjectQueue
)])
...
...
dream/simulation/MouldAssembly.py
View file @
e2f6a4f4
...
@@ -174,9 +174,13 @@ class MouldAssembly(MachineManagedJob):
...
@@ -174,9 +174,13 @@ class MouldAssembly(MachineManagedJob):
# assert that there is a parent order
# assert that there is a parent order
assert
self
.
mouldParent
.
type
==
'Order'
,
'the type of the assembled to be mould
\
'
s parent is not correct'
assert
self
.
mouldParent
.
type
==
'Order'
,
'the type of the assembled to be mould
\
'
s parent is not correct'
# delete the contents of the internal queue
# delete the contents of the internal queue
for
element
in
activeObjectQueue
:
temp_activeObjectQueue
=
list
(
activeObjectQueue
)
for
element
in
temp_activeObjectQueue
:
# update their schedule
element
.
schedule
[
-
1
].
append
(
self
.
env
.
now
)
# remove the elements
activeObjectQueue
.
remove
(
element
)
activeObjectQueue
.
remove
(
element
)
# del
activeObjectQueue[:]
del
temp_
activeObjectQueue
[:]
# after assembling reset the capacity
# after assembling reset the capacity
activeObject
.
updateCapacity
(
1
)
activeObject
.
updateCapacity
(
1
)
#if there is a mould to be assembled
#if there is a mould to be assembled
...
...
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