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
e24f9ba5
Commit
e24f9ba5
authored
11 years ago
by
Georgios Dagkakis
Committed by
Sebastien Robin
11 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
queue object updated so that it uses the new methods
parent
56cff46e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
40 deletions
+62
-40
dream/simulation/Machine.py
dream/simulation/Machine.py
+9
-7
dream/simulation/Queue.py
dream/simulation/Queue.py
+53
-33
No files found.
dream/simulation/Machine.py
View file @
e24f9ba5
...
@@ -228,18 +228,20 @@ class Machine(CoreObject):
...
@@ -228,18 +228,20 @@ class Machine(CoreObject):
maxTimeWaiting
=
0
maxTimeWaiting
=
0
#loop through the predecessors to see which have to dispose and which is the one blocked for longer
#loop through the predecessors to see which have to dispose and which is the one blocked for longer
for
i
in
range
(
len
(
activeObject
.
previous
)):
i
=
0
if
(
activeObject
.
previous
[
i
].
haveToDispose
(
self
)):
for
object
in
activeObject
.
previous
:
if
(
object
.
haveToDispose
(
activeObject
)):
isRequested
=
True
isRequested
=
True
if
(
activeObject
.
previous
[
i
]
.
downTimeInTryingToReleaseCurrentEntity
>
0
):
if
(
object
.
downTimeInTryingToReleaseCurrentEntity
>
0
):
timeWaiting
=
now
()
-
activeObject
.
previous
[
i
]
.
timeLastFailureEnded
timeWaiting
=
now
()
-
object
.
timeLastFailureEnded
else
:
else
:
timeWaiting
=
now
()
-
activeObject
.
previous
[
i
]
.
timeLastEntityEnded
timeWaiting
=
now
()
-
object
.
timeLastEntityEnded
#if more than one predecessor have to dispose take the part from the one that is blocked longer
#if more than one predecessor have to dispose take the part from the one that is blocked longer
if
(
timeWaiting
>=
maxTimeWaiting
):
if
(
timeWaiting
>=
maxTimeWaiting
):
self
.
predecessorIndex
=
i
activeObject
.
predecessorIndex
=
i
maxTimeWaiting
=
timeWaiting
maxTimeWaiting
=
timeWaiting
i
+=
1
return
len
(
activeObjectQueue
)
<
activeObject
.
capacity
and
isRequested
return
len
(
activeObjectQueue
)
<
activeObject
.
capacity
and
isRequested
#checks if the machine down or it can dispose the object
#checks if the machine down or it can dispose the object
...
...
This diff is collapsed.
Click to expand it.
dream/simulation/Queue.py
View file @
e24f9ba5
...
@@ -86,6 +86,8 @@ class Queue(CoreObject):
...
@@ -86,6 +86,8 @@ class Queue(CoreObject):
self
.
waitToDispose
=
False
#shows if the object waits to dispose an entity
self
.
waitToDispose
=
False
#shows if the object waits to dispose an entity
def
run
(
self
):
def
run
(
self
):
activeObjectQueue
=
self
.
getActiveObjectQueue
()
while
1
:
while
1
:
yield
waituntil
,
self
,
self
.
canAcceptAndIsRequested
#wait until the Queue can accept an entity
yield
waituntil
,
self
,
self
.
canAcceptAndIsRequested
#wait until the Queue can accept an entity
#and one predecessor requests it
#and one predecessor requests it
...
@@ -93,91 +95,109 @@ class Queue(CoreObject):
...
@@ -93,91 +95,109 @@ class Queue(CoreObject):
#if entity just got to the dummyQ set its startTime as the current time
#if entity just got to the dummyQ set its startTime as the current time
if
self
.
isDummy
:
if
self
.
isDummy
:
self
.
Res
.
activeQ
[
0
].
startTime
=
now
()
activeObjectQueue
[
0
].
startTime
=
now
()
#checks if the Queue can accept an entity
#checks if the Queue can accept an entity
#it checks also who called it and returns TRUE only to the predecessor that will give the entity.
#it checks also who called it and returns TRUE only to the predecessor that will give the entity.
def
canAccept
(
self
,
callerObject
=
None
):
def
canAccept
(
self
,
callerObject
=
None
):
activeObject
=
self
.
getActiveObject
()
activeObjectQueue
=
self
.
getActiveObjectQueue
()
giverObject
=
self
.
getGiverObject
()
#if we have only one predecessor just check if there is a place available
#if we have only one predecessor just check if there is a place available
if
(
len
(
self
.
previous
)
==
1
or
callerObject
==
None
):
if
(
len
(
activeObject
.
previous
)
==
1
or
callerObject
==
None
):
return
len
(
self
.
Res
.
activeQ
)
<
self
.
capacity
return
len
(
activeObjectQueue
)
<
activeObject
.
capacity
if
len
(
self
.
Res
.
activeQ
)
==
self
.
capacity
:
if
len
(
activeObjectQueue
)
==
activeObject
.
capacity
:
return
False
return
False
thecaller
=
callerObject
thecaller
=
callerObject
#return true only to the predecessor from which the queue will take
#return true only to the predecessor from which the queue will take
flag
=
False
#
flag=False
if
thecaller
is
self
.
previous
[
self
.
predecessorIndex
]:
#
if thecaller is self.previous[self.predecessorIndex]:
flag
=
True
#
flag=True
return
len
(
self
.
Res
.
activeQ
)
<
self
.
capacity
and
flag
return
len
(
activeObjectQueue
)
<
activeObject
.
capacity
and
thecaller
==
giverObject
#checks if the Queue can dispose an entity to the following object
#checks if the Queue can dispose an entity to the following object
#it checks also who called it and returns TRUE only to the successor that will give the entity.
#it checks also who called it and returns TRUE only to the successor that will give the entity.
#this is kind of slow I think got to check
#this is kind of slow I think got to check
def
haveToDispose
(
self
,
callerObject
=
None
):
def
haveToDispose
(
self
,
callerObject
=
None
):
activeObject
=
self
.
getActiveObject
()
activeObjectQueue
=
self
.
getActiveObjectQueue
()
#if we have only one successor just check if the Queue holds one or more entities
#if we have only one successor just check if the Queue holds one or more entities
if
(
len
(
self
.
next
)
==
1
or
callerObject
==
None
):
if
(
len
(
activeObject
.
next
)
==
1
or
callerObject
==
None
):
return
len
(
self
.
Res
.
activeQ
)
>
0
return
len
(
self
.
Res
.
activeQ
)
>
0
#if the Queue is empty it returns false right away
#if the Queue is empty it returns false right away
if
(
len
(
self
.
Res
.
activeQ
)
==
0
):
if
(
len
(
activeObjectQueue
)
==
0
):
return
False
return
False
thecaller
=
callerObject
thecaller
=
callerObject
#give the entity to the successor that is waiting for the most time.
#give the entity to the successor that is waiting for the most time.
#plant does not do this in every occasion!
#plant does not do this in every occasion!
maxTimeWaiting
=
0
maxTimeWaiting
=
0
for
i
in
range
(
len
(
self
.
next
)):
i
=
0
if
(
self
.
next
[
i
].
canAccept
()):
for
object
in
activeObject
.
next
:
timeWaiting
=
now
()
-
self
.
next
[
i
].
timeLastEntityLeft
if
(
object
.
canAccept
()):
timeWaiting
=
now
()
-
object
.
timeLastEntityLeft
if
(
timeWaiting
>
maxTimeWaiting
or
maxTimeWaiting
==
0
):
if
(
timeWaiting
>
maxTimeWaiting
or
maxTimeWaiting
==
0
):
maxTimeWaiting
=
timeWaiting
maxTimeWaiting
=
timeWaiting
self
.
successorIndex
=
i
self
.
successorIndex
=
i
i
+=
1
#return true only to the predecessor from which the queue will take
#return true only to the predecessor from which the queue will take
flag
=
False
receiverObject
=
activeObject
.
getReceiverObject
()
if
thecaller
is
self
.
next
[
self
.
successorIndex
]:
return
len
(
self
.
Res
.
activeQ
)
>
0
and
(
thecaller
is
receiverObject
)
flag
=
True
return
len
(
self
.
Res
.
activeQ
)
>
0
and
flag
#removes an entity from the Object
#removes an entity from the Object
def
removeEntity
(
self
):
def
removeEntity
(
self
):
#self.sortEntities() #sort the Entities
activeObject
=
self
.
getActiveObject
()
self
.
outputTrace
(
self
.
Res
.
activeQ
[
0
].
name
,
"releases "
+
self
.
objName
)
activeObjectQueue
=
self
.
getActiveObjectQueue
()
self
.
Res
.
activeQ
.
pop
(
0
)
activeObject
.
outputTrace
(
activeObjectQueue
[
0
].
name
,
"releases "
+
self
.
objName
)
activeObjectQueue
.
pop
(
0
)
#remove the Entity
#checks if the Queue can accept an entity and there is an entity in some predecessor waiting for it
#checks if the Queue can accept an entity and there is an entity in some predecessor waiting for it
#also updates the predecessorIndex to the one that is to be taken
#also updates the predecessorIndex to the one that is to be taken
def
canAcceptAndIsRequested
(
self
):
def
canAcceptAndIsRequested
(
self
):
activeObject
=
self
.
getActiveObject
()
activeObjectQueue
=
self
.
getActiveObjectQueue
()
giverObject
=
self
.
getGiverObject
()
#if we have only one predecessor just check if there is a place available and the predecessor has an entity to dispose
#if we have only one predecessor just check if there is a place available and the predecessor has an entity to dispose
if
(
len
(
self
.
previous
)
==
1
):
if
(
len
(
activeObject
.
previous
)
==
1
):
return
len
(
self
.
Res
.
activeQ
)
<
self
.
capacity
and
self
.
previous
[
0
].
haveToDispose
(
self
)
return
len
(
activeObjectQueue
)
<
self
.
capacity
and
giverObject
.
haveToDispose
(
activeObject
)
isRequested
=
False
isRequested
=
False
maxTimeWaiting
=
0
maxTimeWaiting
=
0
#loop through the predecessors to see which have to dispose and which is the one blocked for longer
#loop through the predecessors to see which have to dispose and which is the one blocked for longer
for
i
in
range
(
len
(
self
.
previous
)):
i
=
0
if
(
self
.
previous
[
i
].
haveToDispose
(
self
)):
for
object
in
activeObject
.
previous
:
if
(
object
.
haveToDispose
(
activeObject
)):
isRequested
=
True
isRequested
=
True
if
(
self
.
previous
[
i
]
.
downTimeInTryingToReleaseCurrentEntity
>
0
):
if
(
object
.
downTimeInTryingToReleaseCurrentEntity
>
0
):
timeWaiting
=
now
()
-
self
.
previous
[
i
]
.
timeLastFailureEnded
timeWaiting
=
now
()
-
object
.
timeLastFailureEnded
else
:
else
:
timeWaiting
=
now
()
-
self
.
previous
[
i
]
.
timeLastEntityEnded
timeWaiting
=
now
()
-
object
.
timeLastEntityEnded
#if more than one predecessor have to dispose take the part from the one that is blocked longer
#if more than one predecessor have to dispose take the part from the one that is blocked longer
if
(
timeWaiting
>=
maxTimeWaiting
):
if
(
timeWaiting
>=
maxTimeWaiting
):
self
.
predecessorIndex
=
i
activeObject
.
predecessorIndex
=
i
maxTimeWaiting
=
timeWaiting
maxTimeWaiting
=
timeWaiting
return
len
(
self
.
Res
.
activeQ
)
<
self
.
capacity
and
isRequested
i
+=
1
return
len
(
activeObjectQueue
)
<
self
.
capacity
and
isRequested
#gets an entity from the predecessor that the predecessor index points to
#gets an entity from the predecessor that the predecessor index points to
def
getEntity
(
self
):
def
getEntity
(
self
):
CoreObject
.
getEntity
(
self
)
#run the default behavior
activeObject
=
self
.
getActiveObject
()
self
.
outputTrace
(
self
.
Res
.
activeQ
[
-
1
].
name
,
"got into "
+
self
.
objName
)
activeObjectQueue
=
self
.
getActiveObjectQueue
()
CoreObject
.
getEntity
(
activeObject
)
#run the default behavior
self
.
outputTrace
(
activeObjectQueue
[
-
1
].
name
,
"got into "
+
self
.
objName
)
#sorts the Entities of the Queue according to the scheduling rule
#sorts the Entities of the Queue according to the scheduling rule
def
sortEntities
(
self
):
def
sortEntities
(
self
):
...
...
This diff is collapsed.
Click to expand it.
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