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
49f94abd
Commit
49f94abd
authored
Apr 16, 2015
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
machine to be able to have technology attr. This is good for grouping machines
parent
dc2c9978
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
dream/simulation/BatchScrapMachine.py
dream/simulation/BatchScrapMachine.py
+3
-1
dream/simulation/Machine.py
dream/simulation/Machine.py
+4
-2
No files found.
dream/simulation/BatchScrapMachine.py
View file @
49f94abd
...
...
@@ -49,6 +49,7 @@ class BatchScrapMachine(Machine):
operatorPool
=
'None'
,
operationType
=
'None'
,
\
setupTime
=
None
,
loadTime
=
None
,
canDeliverOnInterruption
=
False
,
technology
=
None
,
**
kw
):
if
not
processingTime
:
processingTime
=
{
'distributionType'
:
'Fixed'
,
...
...
@@ -61,6 +62,7 @@ class BatchScrapMachine(Machine):
canDeliverOnInterruption
=
canDeliverOnInterruption
,
operatorPool
=
operatorPool
,
operationType
=
operationType
,
\
setupTime
=
setupTime
,
loadTime
=
loadTime
,
technology
=
technology
)
# set the attributes of the scrap quantity distribution
...
...
dream/simulation/Machine.py
View file @
49f94abd
...
...
@@ -54,7 +54,7 @@ class Machine(CoreObject):
operatorPool
=
'None'
,
operationType
=
'None'
,
\
setupTime
=
None
,
loadTime
=
None
,
preemption
=
{},
canDeliverOnInterruption
=
False
,
**
kw
):
canDeliverOnInterruption
=
False
,
technology
=
None
,
**
kw
):
self
.
type
=
"Machine"
#String that shows the type of object
CoreObject
.
__init__
(
self
,
id
,
name
)
from
Globals
import
G
...
...
@@ -120,6 +120,8 @@ class Machine(CoreObject):
self
.
multOperationTypeList
=
OTlist
else
:
self
.
multOperationTypeList
.
append
(
self
.
operationType
)
# technology is used to group machines that perform the same operation when needed
self
.
technology
=
technology
# flags used for preemption purposes
self
.
isPreemptive
=
False
...
...
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