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
04e1b32d
Commit
04e1b32d
authored
Jan 16, 2014
by
Ioannis Papagiannopoulos
Committed by
Jérome Perrin
Jan 20, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor change to MouldAssembly
parent
8b91f25b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
dream/simulation/MouldAssembly.py
dream/simulation/MouldAssembly.py
+3
-5
No files found.
dream/simulation/MouldAssembly.py
View file @
04e1b32d
...
...
@@ -59,13 +59,12 @@ class MouldAssemble(MachinePreemptive):
# we need the new entity's route, priority, isCritical flag, etc.
mouldToBeAssembled
=
activeObjectQueue
[
0
].
order
del
activeObjectQueue
[:]
# after assembling reset the capacity
activeObject
.
updateCapacity
(
1
)
# append the mould entity to the internal Queue
activeObjectQueue
.
append
(
mouldToBeAssembled
)
mouldToBeAssembled
.
currentStation
=
self
self
.
timeLastEntityEnded
=
now
()
# after assembling reset the capacity
activeObject
.
updateCapacity
(
1
)
# =======================================================================
# getEntity method that gets the entity from the giver
# it should run in a loop till it get's all the entities from the same order
...
...
@@ -136,7 +135,6 @@ class MouldAssemble(MachinePreemptive):
return
giverObject
.
haveToDispose
(
activeObject
)
\
and
len
(
activeObjectQueue
)
==
0
\
# dummy variables that help prioritise the objects requesting to give objects to the Machine (activeObject)
isRequested
=
False
# isRequested is dummyVariable checking if it is requested to accept an item
maxTimeWaiting
=
0
# dummy variable counting the time a predecessor is blocked
...
...
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