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
22f7077d
Commit
22f7077d
authored
Oct 09, 2014
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new custom object for synchronisation
parent
b0bfb237
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
1 deletion
+47
-1
dream/simulation/BatchScrapMachineAfterDecompose.py
dream/simulation/BatchScrapMachineAfterDecompose.py
+46
-0
dream/simulation/Globals.py
dream/simulation/Globals.py
+1
-1
No files found.
dream/simulation/BatchScrapMachineAfterDecompose.py
0 → 100644
View file @
22f7077d
# ===========================================================================
# Copyright 2013 University of Limerick
#
# This file is part of DREAM.
#
# DREAM is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# DREAM is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with DREAM. If not, see <http://www.gnu.org/licenses/>.
# ===========================================================================
'''
Created on 09 10 2014
@author: George
'''
'''
Customization of BatchReassembly so that it sends isRequested to the first Queue before
'''
from
BatchScrapMachine
import
BatchScrapMachine
class
BatchScrapMachineAfterDecompose
(
BatchScrapMachine
):
# =======================================================================
# extend behaviour to send canDispose signal to the correct predecessor
# =======================================================================
def
removeEntity
(
self
,
entity
=
None
):
activeEntity
=
BatchScrapMachine
.
removeEntity
(
self
,
entity
)
from
BatchDecompositionBlocking
import
BatchDecompositionBlocking
decomposition
=
self
.
previous
[
0
]
if
decomposition
.
__class__
is
BatchDecompositionBlocking
:
buffer
=
decomposition
.
previous
[
0
]
if
buffer
.
expectedSignals
[
'canDispose'
]:
self
.
sendSignal
(
receiver
=
buffer
,
signal
=
buffer
.
canDispose
,
sender
=
decomposition
)
return
activeEntity
\ No newline at end of file
dream/simulation/Globals.py
View file @
22f7077d
...
...
@@ -290,7 +290,7 @@ def setWIP(entityList):
if
entity
.
currentStation
.
class_name
:
stationClass
=
entity
.
currentStation
.
__class__
.
__name__
if
stationClass
in
[
'Machine'
,
'BatchScrapMachine'
,
'MachineJobShop'
,
'BatchDecomposition'
,
'BatchReassembly'
,
'M3'
,
'BatchReassemblyBlocking'
,
'BatchDecompositionBlocking'
]:
'BatchReassemblyBlocking'
,
'BatchDecompositionBlocking'
,
'BatchScrapMachineAfterDecompose'
]:
entity
.
currentStation
.
currentEntity
=
entity
# trigger initialWIP event only if it has not been triggered. Otherwise
# if we set more than one entities (e.g. in reassembly) it will crash
...
...
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