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
6f14429b
Commit
6f14429b
authored
Feb 21, 2014
by
Ioannis Papagiannopoulos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TODOs added
parent
8a21002a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
dream/simulation/CoreObject.py
dream/simulation/CoreObject.py
+4
-1
dream/simulation/Machine.py
dream/simulation/Machine.py
+5
-2
No files found.
dream/simulation/CoreObject.py
View file @
6f14429b
...
@@ -221,7 +221,7 @@ class CoreObject(Process):
...
@@ -221,7 +221,7 @@ class CoreObject(Process):
if
activeEntity
.
manager
.
activeCallersList
:
if
activeEntity
.
manager
.
activeCallersList
:
activeEntity
.
manager
.
activeCallersList
=
[]
activeEntity
.
manager
.
activeCallersList
=
[]
self
.
outputTrace
(
activeEntity
.
name
,
"got into "
+
self
.
objName
)
self
.
outputTrace
(
activeEntity
.
name
,
"got into "
+
self
.
objName
)
# if the successor of the object is a machine that is operated with operationType 'Load'
#
TODO:
if the successor of the object is a machine that is operated with operationType 'Load'
# then the flag hot of the activeEntity must be set to True
# then the flag hot of the activeEntity must be set to True
# to signalize that the entity has reached its final destination before the next Machine
# to signalize that the entity has reached its final destination before the next Machine
# if the entity is not of type Job
# if the entity is not of type Job
...
@@ -231,6 +231,9 @@ class CoreObject(Process):
...
@@ -231,6 +231,9 @@ class CoreObject(Process):
# for all the objects in the next list
# for all the objects in the next list
for
object
in
activeObject
.
next
:
for
object
in
activeObject
.
next
:
# if the object is not in the MachineList
# if the object is not in the MachineList
# TODO: We must consider also the case that entities can be blocked before they can reach
# the heating point. In such a case they must be removed from the G.pendingEntities list
# and added again after they are unblocked
if
not
object
in
G
.
MachineList
:
if
not
object
in
G
.
MachineList
:
successorsAreMachines
=
False
successorsAreMachines
=
False
break
break
...
...
dream/simulation/Machine.py
View file @
6f14429b
...
@@ -460,8 +460,11 @@ class Machine(CoreObject):
...
@@ -460,8 +460,11 @@ class Machine(CoreObject):
activeEntity
=
activeObjectQueue
[
0
]
activeEntity
=
activeObjectQueue
[
0
]
# the entity that just got processed is cold again it will get
# the entity that just got processed is cold again it will get
# hot again by the time it reaches the giver of the next machine
# hot again by the time it reaches the giver of the next machine
# TODO: check first if the next station is not of type Machine before
# TODO: Not only Machines require time to process entities
# you cool the entity down
# entities such as batchReassembly/Decomposition require time to process entities
# TODO: We must consider also the case that entities can be blocked before they can reach
# the heating point. In such a case they must be removed from the G.pendingEntities list
# and added again after they are unblocked
if
activeEntity
.
family
==
'Entity'
:
if
activeEntity
.
family
==
'Entity'
:
successorsAreMachines
=
True
successorsAreMachines
=
True
from
Globals
import
G
from
Globals
import
G
...
...
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