Skip to content

dream
dream
Commit 3c511b38 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Jérome Perrin
Browse files
Options

ConditionalBuffer rename

parent d11cf3b8
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
dream/simulation/ConditionalBuffer.py → dream/simulation/ConditionalBufferManaged.py
View file @ 3c511b38
...@@ -37,7 +37,7 @@ class NoCallerError(Exception): ...@@ -37,7 +37,7 @@ class NoCallerError(Exception):
# =========================================================================== # ===========================================================================
# the ConditionalBuffer object # the ConditionalBuffer object
# =========================================================================== # ===========================================================================
class ConditionalBuffer(QueueManagedJob): class ConditionalBufferManaged(QueueManagedJob):
# ======================================================================= # =======================================================================
# the default __init__ method of the QueueManagedJob class # the default __init__ method of the QueueManagedJob class
# whereas the default capacity is set to infinity # whereas the default capacity is set to infinity
......
dream/simulation/JSONInputs/Topology40.json
View file @ 3c511b38
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"name": "Assembly Buffer" "name": "Assembly Buffer"
}, },
"CB1": { "CB1": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"isDummy": "0", "isDummy": "0",
"name": "Conditional Buffer" "name": "Conditional Buffer"
}, },
......
dream/simulation/JSONInputs/Topology41.json
View file @ 3c511b38
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"name": "Assembly Buffer" "name": "Assembly Buffer"
}, },
"CB1": { "CB1": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"isDummy": "0", "isDummy": "0",
"name": "Conditional Buffer" "name": "Conditional Buffer"
}, },
......
dream/simulation/JSONInputs/Topology57.json
View file @ 3c511b38
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
] ]
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"capacity": -1, "capacity": -1,
"isDummy": "0", "isDummy": "0",
"name": "Queue CAM" "name": "Queue CAM"
......
dream/simulation/JSONInputs/Topology58.json
View file @ 3c511b38
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
] ]
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"capacity": -1, "capacity": -1,
"isDummy": "0", "isDummy": "0",
"name": "Queue CAM" "name": "Queue CAM"
......
dream/simulation/JSONInputs/Topology59.json
View file @ 3c511b38
...@@ -560,7 +560,7 @@ ...@@ -560,7 +560,7 @@
] ]
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"capacity": -1, "capacity": -1,
"isDummy": "0", "isDummy": "0",
"name": "Queue CAM" "name": "Queue CAM"
......
dream/simulation/JSONInputs/Topology61.json
View file @ 3c511b38
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
] ]
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"capacity": "-1", "capacity": "-1",
"isDummy": "0", "isDummy": "0",
"name": "Queue CAM" "name": "Queue CAM"
......
dream/simulation/JSONInputs/Topology62.json
View file @ 3c511b38
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
] ]
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"capacity": "-1", "capacity": "-1",
"isDummy": "0", "isDummy": "0",
"name": "Queue CAM" "name": "Queue CAM"
......
dream/simulation/JSONInputs/Topology66.json
View file @ 3c511b38
...@@ -856,7 +856,7 @@ ...@@ -856,7 +856,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"capacity": "-1" "capacity": "-1"
......
dream/simulation/JSONInputs/Topology67.json
View file @ 3c511b38
...@@ -1103,7 +1103,7 @@ ...@@ -1103,7 +1103,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"schedulingRule": "Priority", "schedulingRule": "Priority",
......
dream/simulation/JSONInputs/Topology68.json
View file @ 3c511b38
...@@ -1102,7 +1102,7 @@ ...@@ -1102,7 +1102,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"capacity": "-1" "capacity": "-1"
......
dream/simulation/JSONInputs/Topology70.json
View file @ 3c511b38
...@@ -816,7 +816,7 @@ ...@@ -816,7 +816,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"capacity": "-1" "capacity": "-1"
......
dream/simulation/JSONInputs/Topology71.json
View file @ 3c511b38
...@@ -816,7 +816,7 @@ ...@@ -816,7 +816,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"capacity": "-1" "capacity": "-1"
......
dream/simulation/JSONInputs/Topology72.json
View file @ 3c511b38
...@@ -788,7 +788,7 @@ ...@@ -788,7 +788,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"capacity": "-1" "capacity": "-1"
......
dream/simulation/JSONInputs/Topology73.json
View file @ 3c511b38
...@@ -1103,7 +1103,7 @@ ...@@ -1103,7 +1103,7 @@
"name": "Order Decomposition" "name": "Order Decomposition"
}, },
"QCAM": { "QCAM": {
"_class": "Dream.ConditionalBuffer", "_class": "Dream.ConditionalBufferManaged",
"name": "Queue CAM", "name": "Queue CAM",
"isDummy": "0", "isDummy": "0",
"schedulingRule": "Priority", "schedulingRule": "Priority",
......
dream/simulation/MouldAssemblyBuffer.py
View file @ 3c511b38
...@@ -108,7 +108,7 @@ class MouldAssemblyBuffer(QueueManagedJob): ...@@ -108,7 +108,7 @@ class MouldAssemblyBuffer(QueueManagedJob):
activeEntity.order.basicsEnded = 1 activeEntity.order.basicsEnded = 1
# TODO: has to signal ConditionalBuffer to start sending entities again # TODO: has to signal ConditionalBuffer to start sending entities again
for secondary in [x for x in activeEntity.order.secondaryComponentsList if activeEntity.order.basicsEnded]: for secondary in [x for x in activeEntity.order.secondaryComponentsList if activeEntity.order.basicsEnded]:
if secondary.currentStation.__class__.__name__=='ConditionalBuffer': if secondary.currentStation.__class__.__name__=='ConditionalBufferManaged':
# print now(), self.id, ' signalling conditional buffer' # print now(), self.id, ' signalling conditional buffer'
if secondary.currentStation.expectedSignals['canDispose']: if secondary.currentStation.expectedSignals['canDispose']:
self.sendSignal(receiver=secondary.currentStation,signal=secondary.currentStation.canDispose) self.sendSignal(receiver=secondary.currentStation,signal=secondary.currentStation.canDispose)
......
dream/simulation/imports.py
View file @ 3c511b38
...@@ -49,7 +49,7 @@ from dream.simulation.BatchSource import BatchSource ...@@ -49,7 +49,7 @@ from dream.simulation.BatchSource import BatchSource
from dream.simulation.BatchDecomposition import BatchDecomposition from dream.simulation.BatchDecomposition import BatchDecomposition
from dream.simulation.BatchReassembly import BatchReassembly from dream.simulation.BatchReassembly import BatchReassembly
from dream.simulation.BatchScrapMachine import BatchScrapMachine from dream.simulation.BatchScrapMachine import BatchScrapMachine
from dream.simulation.ConditionalBuffer import ConditionalBuffer from dream.simulation.ConditionalBufferManaged import ConditionalBufferManaged
from dream.simulation.LineClearance import LineClearance from dream.simulation.LineClearance import LineClearance
from dream.simulation.MachineManagedJob import MachineManagedJob from dream.simulation.MachineManagedJob import MachineManagedJob
from dream.simulation.QueueManagedJob import QueueManagedJob from dream.simulation.QueueManagedJob import QueueManagedJob
......
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