Skip to content

dream
dream
Commit 0ea97f8f authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis
Browse files
Options

MouldAssembly and MouldAssemblyBuffer rename

parent 845ab84b
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 64 deletions
dream/simulation/JSONInputs/Topology39.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -29,7 +29,7 @@
"name": "Machine1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly"
},
......
dream/simulation/JSONInputs/Topology40.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -34,7 +34,7 @@
"name": "Machine1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly"
},
......
dream/simulation/JSONInputs/Topology41.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -38,7 +38,7 @@
"name": "Machine2"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly"
},
......
dream/simulation/JSONInputs/Topology56.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -51,19 +51,19 @@
"operationType": "MT-Load-Setup-Processing"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology57.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -51,19 +51,19 @@
"operationType": "MT-Load-Setup-Processing"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology58.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -51,19 +51,19 @@
"operationType": "MT-Load-Setup-Processing"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology59.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": -1,
"id": "AB1",
"isDummy": "0",
......@@ -51,19 +51,19 @@
"operationType": "MT-Load-Setup-Processing"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology61.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": "-1",
"id": "AB1",
"isDummy": "0",
......@@ -51,19 +51,19 @@
"operationType": "MT-Load-Setup-Processing"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology62.json
View file @ 0ea97f8f
......@@ -10,7 +10,7 @@
},
"nodes": {
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"capacity": "-1",
"id": "AB1",
"isDummy": "0",
......@@ -51,19 +51,19 @@
"operationType": "MT-Load-Setup-Processing"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology66.json
View file @ 0ea97f8f
......@@ -899,26 +899,26 @@
"operationType": "MT-Load-Setup-Processing"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"isDummy": "0",
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology67.json
View file @ 0ea97f8f
......@@ -1149,7 +1149,7 @@
"operationType": "MT-Load-Setup-Processing"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"schedulingRule": "Priority",
......@@ -1157,19 +1157,19 @@
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology68.json
View file @ 0ea97f8f
......@@ -1145,26 +1145,26 @@
"operationType": "MT-Load-Setup-Processing"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"isDummy": "0",
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology70.json
View file @ 0ea97f8f
......@@ -859,26 +859,26 @@
"operationType": "MT-Load-Setup-Processing"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"isDummy": "0",
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/JSONInputs/Topology71.json
View file @ 0ea97f8f
......@@ -859,26 +859,26 @@
"operationType": "MT-Load-Setup"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"isDummy": "0",
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Processing"
......
dream/simulation/JSONInputs/Topology72.json
View file @ 0ea97f8f
......@@ -831,26 +831,26 @@
"operationType": "MT-Load-Setup"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"isDummy": "0",
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Processing"
......
dream/simulation/JSONInputs/Topology73.json
View file @ 0ea97f8f
......@@ -1148,7 +1148,7 @@
"operationType": "MT-Load-Setup-Processing"
},
"AB1": {
"_class": "Dream.MouldAssemblyBuffer",
"_class": "Dream.MouldAssemblyBufferManaged",
"id": "AB1",
"name": "Assembly Buffer",
"schedulingRule": "Priority",
......@@ -1156,19 +1156,19 @@
"capacity": "-1"
},
"MA1": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA1",
"name": "Assembly 1",
"operationType": "MT-Load-Setup-Processing"
},
"MA2": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA2",
"name": "Assembly 2",
"operationType": "MT-Load-Setup-Processing"
},
"MA3": {
"_class": "Dream.MouldAssembly",
"_class": "Dream.MouldAssemblyManaged",
"id": "MA3",
"name": "Assembly 3",
"operationType": "MT-Load-Setup-Processing"
......
dream/simulation/MouldAssemblyBuffer.py → dream/simulation/MouldAssemblyBufferManaged.py
View file @ 0ea97f8f
......@@ -40,7 +40,7 @@ class NoCallerError(Exception):
# ===========================================================================
# the MouldAssemblyBuffer object
# ===========================================================================
class MouldAssemblyBuffer(QueueManagedJob):
class MouldAssemblyBufferManaged(QueueManagedJob):
# =======================================================================
# the default __init__ method of the QueueManagedJob class
# whereas the default capacity is set to infinity
......
dream/simulation/MouldAssembly.py → dream/simulation/MouldAssemblyManaged.py
View file @ 0ea97f8f
......@@ -76,7 +76,7 @@ class AssembleMouldError(Exception):
# ===========================================================================
# the MachineManagedJob object
# ===========================================================================
class MouldAssembly(MachineManagedJob):
class MouldAssemblyManaged(MachineManagedJob):
# =======================================================================
# the initialize method
......
dream/simulation/OrderDecomposition.py
View file @ 0ea97f8f
......@@ -254,7 +254,7 @@ class OrderDecomposition(CoreObject):
for obj in G.ObjList:
for elementId in elementIds:
type=obj.__class__.__name__
if obj.id==elementId and (obj.type=='Exit' or type=='MouldAssembly' or type=='MouldAssemblyBuffer'):
if obj.id==elementId and (obj.type=='Exit' or type=='MouldAssemblyManaged' or type=='MouldAssemblyBufferManaged'):
exitAssigned=True
# Below it is to assign assemblers if there are any in the corresponding Global list
if not exitAssigned:
......
dream/simulation/Queue.py
View file @ 0ea97f8f
......@@ -176,7 +176,7 @@ class Queue(CoreObject):
if self.canAccept():
self.signalGiver()
# TODO: disable that for the mouldAssemblyBuffer
if not self.__class__.__name__=='MouldAssemblyBuffer':
if not self.__class__.__name__=='MouldAssemblyBufferManaged':
if self.haveToDispose():
# self.printTrace(self.id, attemptSignalReceiver='(removeEntity)')
self.signalReceiver()
......
dream/simulation/imports.py
View file @ 0ea97f8f
......@@ -53,8 +53,8 @@ from dream.simulation.ConditionalBufferManaged import ConditionalBufferManaged
from dream.simulation.LineClearance import LineClearance
from dream.simulation.MachineManagedJob import MachineManagedJob
from dream.simulation.QueueManagedJob import QueueManagedJob
from dream.simulation.MouldAssembly import MouldAssembly
from dream.simulation.MouldAssemblyBuffer import MouldAssemblyBuffer
from dream.simulation.MouldAssemblyManaged import MouldAssemblyManaged
from dream.simulation.MouldAssemblyBufferManaged import MouldAssemblyBufferManaged
from dream.simulation.OrderDecomposition import OrderDecomposition
from dream.simulation.NonStarvingEntry import NonStarvingEntry
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7