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
ae360855
Commit
ae360855
authored
Sep 25, 2014
by
Ioannis Papagiannopoulos
Committed by
Georgios Dagkakis
Nov 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minro clean-up
parent
dda1f9bf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
16 deletions
+0
-16
dream/simulation/BatchReassembly.py
dream/simulation/BatchReassembly.py
+0
-2
dream/simulation/Globals.py
dream/simulation/Globals.py
+0
-10
dream/simulation/Mould.py
dream/simulation/Mould.py
+0
-4
No files found.
dream/simulation/BatchReassembly.py
View file @
ae360855
...
@@ -236,8 +236,6 @@ class BatchReassembly(CoreObject):
...
@@ -236,8 +236,6 @@ class BatchReassembly(CoreObject):
numberOfUnits
+=
subBatch
.
numberOfUnits
numberOfUnits
+=
subBatch
.
numberOfUnits
# the batch to be reassembled
# the batch to be reassembled
batchToBeReassembled
=
activeObjectQueue
[
0
].
parentBatch
batchToBeReassembled
=
activeObjectQueue
[
0
].
parentBatch
# # if the activeEntity is hot then the subBatches should be also hot
# batchToBeReassembled.hot=activeObjectQueue[0].hot
# if the activeEntity is in the pendingEntities list then place the subBatches there
# if the activeEntity is in the pendingEntities list then place the subBatches there
if
activeObjectQueue
[
0
]
in
G
.
pendingEntities
:
if
activeObjectQueue
[
0
]
in
G
.
pendingEntities
:
G
.
pendingEntities
.
append
(
batchToBeReassembled
)
G
.
pendingEntities
.
append
(
batchToBeReassembled
)
...
...
dream/simulation/Globals.py
View file @
ae360855
...
@@ -263,16 +263,6 @@ def setWIP(entityList):
...
@@ -263,16 +263,6 @@ def setWIP(entityList):
# the following to be performed only if there is a current station. Orders, Projects e.t.c do not have
# the following to be performed only if there is a current station. Orders, Projects e.t.c do not have
# TODO, maybe we should loop in wiplist here
# TODO, maybe we should loop in wiplist here
if
(
not
(
entity
.
currentStation
in
G
.
MachineList
))
and
entity
.
currentStation
:
if
(
not
(
entity
.
currentStation
in
G
.
MachineList
))
and
entity
.
currentStation
:
# variable to inform whether the successors are machines or not
successorsAreMachines
=
True
for
nextObject
in
entity
.
currentStation
.
next
:
if
not
nextObject
in
G
.
MachineList
:
successorsAreMachines
=
False
break
if
not
successorsAreMachines
:
entity
.
hot
=
False
else
:
entity
.
hot
=
True
# add the entity to the pendingEntities list
# add the entity to the pendingEntities list
G
.
pendingEntities
.
append
(
entity
)
G
.
pendingEntities
.
append
(
entity
)
...
...
dream/simulation/Mould.py
View file @
ae360855
...
@@ -53,10 +53,6 @@ class Mould(Job): # inherits from the Job class
...
@@ -53,10 +53,6 @@ class Mould(Job): # inherits from the Job class
# if the order is not None, and the order.manager is given
# if the order is not None, and the order.manager is given
if
self
.
order
.
manager
:
if
self
.
order
.
manager
:
self
.
manager
=
self
.
order
.
manager
self
.
manager
=
self
.
order
.
manager
#=======================================================================
# variable to be used by OperatorRouter
self
.
hot
=
False
#=======================================================================
# used by printRoute
# used by printRoute
if
self
.
order
:
if
self
.
order
:
self
.
alias
=
self
.
order
.
alias
+
'C'
+
str
(
len
(
G
.
OrderComponentList
))
self
.
alias
=
self
.
order
.
alias
+
'C'
+
str
(
len
(
G
.
OrderComponentList
))
\ No newline at end of file
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