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
000d766c
Commit
000d766c
authored
Sep 15, 2014
by
Ioannis Papagiannopoulos
Committed by
Georgios Dagkakis
Nov 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new method checkInitialOperationTypes to retrieve the operation types defined by the initialWIP
parent
b49885ec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
dream/simulation/Machine.py
dream/simulation/Machine.py
+10
-5
No files found.
dream/simulation/Machine.py
View file @
000d766c
...
@@ -301,6 +301,12 @@ class Machine(CoreObject):
...
@@ -301,6 +301,12 @@ class Machine(CoreObject):
self
.
env
.
process
(
self
.
router
.
run
())
self
.
env
.
process
(
self
.
router
.
run
())
self
.
router
.
isActivated
=
True
self
.
router
.
isActivated
=
True
#===========================================================================
# get the initial operationTypes (setup/processing) : manual or automatic
#===========================================================================
def
checkInitialOperationTypes
(
self
):
pass
#===========================================================================
#===========================================================================
# method controlling if there is a need to yield
# method controlling if there is a need to yield
#===========================================================================
#===========================================================================
...
@@ -532,10 +538,6 @@ class Machine(CoreObject):
...
@@ -532,10 +538,6 @@ class Machine(CoreObject):
else
:
else
:
operationNotFinished
=
False
operationNotFinished
=
False
# =======================================================================
# =======================================================================
# the main process of the machine
# the main process of the machine
# =======================================================================
# =======================================================================
...
@@ -655,6 +657,9 @@ class Machine(CoreObject):
...
@@ -655,6 +657,9 @@ class Machine(CoreObject):
# may fall in failure mode (assignExit()?)
# may fall in failure mode (assignExit()?)
if
not
self
.
isProcessingInitialWIP
:
# if we are in the state of having initial wip no need to take an Entity
if
not
self
.
isProcessingInitialWIP
:
# if we are in the state of having initial wip no need to take an Entity
self
.
currentEntity
=
self
.
getEntity
()
self
.
currentEntity
=
self
.
getEntity
()
else
:
# find out if the initialWIP requires manual operations (manual/setup)
self
.
checkInitialOperationTypes
()
# TODO: the Machine receive the entity after the operator is available
# TODO: the Machine receive the entity after the operator is available
# the canAcceptAndIsRequested method checks only in case of Load type of operation
# the canAcceptAndIsRequested method checks only in case of Load type of operation
...
...
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