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
18ff43de
Commit
18ff43de
authored
Oct 01, 2014
by
Ioannis Papagiannopoulos
Committed by
Jérome Perrin
Feb 04, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remainingSetupUp time introduced to Entity
parent
274d5da0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
dream/simulation/Entity.py
dream/simulation/Entity.py
+3
-2
dream/simulation/Job.py
dream/simulation/Job.py
+3
-2
dream/simulation/LineGenerationJSON.py
dream/simulation/LineGenerationJSON.py
+2
-0
No files found.
dream/simulation/Entity.py
View file @
18ff43de
...
@@ -36,7 +36,7 @@ class Entity(ManPyObject):
...
@@ -36,7 +36,7 @@ class Entity(ManPyObject):
type
=
"Entity"
type
=
"Entity"
def
__init__
(
self
,
id
=
None
,
name
=
None
,
priority
=
0
,
dueDate
=
0
,
orderDate
=
0
,
def
__init__
(
self
,
id
=
None
,
name
=
None
,
priority
=
0
,
dueDate
=
0
,
orderDate
=
0
,
isCritical
=
False
,
remainingProcessingTime
=
0
,
currentStation
=
None
,
**
kw
):
isCritical
=
False
,
remainingProcessingTime
=
0
,
remainingSetupTime
=
0
,
currentStation
=
None
,
**
kw
):
ManPyObject
.
__init__
(
self
,
id
,
name
)
ManPyObject
.
__init__
(
self
,
id
,
name
)
# information on the object holding the entity
# information on the object holding the entity
# initialized as None and updated every time an entity enters a new object
# initialized as None and updated every time an entity enters a new object
...
@@ -54,6 +54,7 @@ class Entity(ManPyObject):
...
@@ -54,6 +54,7 @@ class Entity(ManPyObject):
# a list that holds information about the schedule
# a list that holds information about the schedule
# of the entity (when it enters and exits every station)
# of the entity (when it enters and exits every station)
self
.
schedule
=
[]
self
.
schedule
=
[]
# the current station of the entity
self
.
currentStation
=
currentStation
self
.
currentStation
=
currentStation
# values to be used in the internal processing of compoundObjects
# values to be used in the internal processing of compoundObjects
self
.
internal
=
False
# informs if the entity is being processed internally
self
.
internal
=
False
# informs if the entity is being processed internally
...
@@ -75,7 +76,7 @@ class Entity(ManPyObject):
...
@@ -75,7 +76,7 @@ class Entity(ManPyObject):
# alias used for printing the Route
# alias used for printing the Route
self
.
alias
=
None
self
.
alias
=
None
self
.
remainingProcessingTime
=
remainingProcessingTime
self
.
remainingProcessingTime
=
remainingProcessingTime
# the current station of the entity
self
.
remainingSetupTime
=
remainingSetupTime
#===========================================================================
#===========================================================================
# return the responsible operator for the current step, not implemented for entities
# return the responsible operator for the current step, not implemented for entities
...
...
dream/simulation/Job.py
View file @
18ff43de
...
@@ -37,8 +37,9 @@ class Job(Entity): # inherits from the Entity c
...
@@ -37,8 +37,9 @@ class Job(Entity): # inherits from the Entity c
family
=
'Job'
family
=
'Job'
def
__init__
(
self
,
id
=
None
,
name
=
None
,
route
=
[],
priority
=
0
,
dueDate
=
0
,
orderDate
=
0
,
def
__init__
(
self
,
id
=
None
,
name
=
None
,
route
=
[],
priority
=
0
,
dueDate
=
0
,
orderDate
=
0
,
extraPropertyDict
=
None
,
currentStation
=
None
,
isCritical
=
False
,
**
kw
):
extraPropertyDict
=
None
,
remainingProcessingTime
=
{},
remainingSetupTime
=
{},
currentStation
=
None
,
isCritical
=
False
,
**
kw
):
Entity
.
__init__
(
self
,
id
=
id
,
name
=
name
,
priority
=
priority
,
dueDate
=
dueDate
,
Entity
.
__init__
(
self
,
id
=
id
,
name
=
name
,
priority
=
priority
,
dueDate
=
dueDate
,
remainingProcessingTime
=
remainingProcessingTime
,
remainingSetupTime
=
remainingSetupTime
,
currentStation
=
currentStation
,
orderDate
=
orderDate
,
isCritical
=
isCritical
)
currentStation
=
currentStation
,
orderDate
=
orderDate
,
isCritical
=
isCritical
)
# instance specific attributes
# instance specific attributes
# information on the routing and the stops of the entity
# information on the routing and the stops of the entity
...
...
dream/simulation/LineGenerationJSON.py
View file @
18ff43de
...
@@ -391,6 +391,7 @@ def createWIP():
...
@@ -391,6 +391,7 @@ def createWIP():
if
entity
[
'id'
]
==
componentDict
[
'id'
]:
if
entity
[
'id'
]
==
componentDict
[
'id'
]:
entityCurrentSeq
=
int
(
entity
[
'sequence'
])
# the current seq number of the entity's route
entityCurrentSeq
=
int
(
entity
[
'sequence'
])
# the current seq number of the entity's route
entityRemainingProcessingTime
=
entity
.
get
(
'remainingProcessingTime'
,{})
entityRemainingProcessingTime
=
entity
.
get
(
'remainingProcessingTime'
,{})
entityRemainingSetupTime
=
entity
.
get
(
'remainingSetupTime'
,{})
ind
=
0
# holder of the route index corresponding to the entityCurrentSeq
ind
=
0
# holder of the route index corresponding to the entityCurrentSeq
solution
=
False
# flag to signal that the route step is found
solution
=
False
# flag to signal that the route step is found
# find the step that corresponds to the entityCurrentSeq
# find the step that corresponds to the entityCurrentSeq
...
@@ -412,6 +413,7 @@ def createWIP():
...
@@ -412,6 +413,7 @@ def createWIP():
entity
[
'route'
]
=
entityRoute
# and hold the new one without the previous steps
entity
[
'route'
]
=
entityRoute
# and hold the new one without the previous steps
entity
[
'order'
]
=
order
.
id
entity
[
'order'
]
=
order
.
id
entity
[
'remainingProcessingTime'
]
=
entityRemainingProcessingTime
entity
[
'remainingProcessingTime'
]
=
entityRemainingProcessingTime
entity
[
'remainingSetupTime'
]
=
entityRemainingSetupTime
break
break
entityClass
=
entity
.
get
(
'_class'
,
None
)
entityClass
=
entity
.
get
(
'_class'
,
None
)
...
...
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