ConditionalBuffer rename

dream/simulation/ConditionalBuffer.py → dream/simulation/ConditionalBufferManaged.py

@@ -37,7 +37,7 @@ class NoCallerError(Exception):
 # ===========================================================================
 # the ConditionalBuffer object
 # ===========================================================================
-class ConditionalBuffer(QueueManagedJob):
+class ConditionalBufferManaged(QueueManagedJob):
     # =======================================================================                
     # the default __init__ method of the QueueManagedJob class
     # whereas the default capacity is set to infinity

dream/simulation/JSONInputs/Topology40.json

@@ -17,7 +17,7 @@
             "name": "Assembly Buffer"
         },
         "CB1": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "isDummy": "0",
             "name": "Conditional Buffer"
         },

dream/simulation/JSONInputs/Topology41.json

@@ -17,7 +17,7 @@
             "name": "Assembly Buffer"
         },
         "CB1": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "isDummy": "0",
             "name": "Conditional Buffer"
         },

dream/simulation/JSONInputs/Topology57.json

@@ -328,7 +328,7 @@
             ]
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "capacity": -1,
             "isDummy": "0",
             "name": "Queue CAM"

dream/simulation/JSONInputs/Topology58.json

@@ -565,7 +565,7 @@
             ]
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "capacity": -1,
             "isDummy": "0",
             "name": "Queue CAM"

dream/simulation/JSONInputs/Topology59.json

@@ -560,7 +560,7 @@
             ]
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "capacity": -1,
             "isDummy": "0",
             "name": "Queue CAM"

dream/simulation/JSONInputs/Topology61.json

@@ -563,7 +563,7 @@
             ]
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "capacity": "-1",
             "isDummy": "0",
             "name": "Queue CAM"

dream/simulation/JSONInputs/Topology62.json

@@ -563,7 +563,7 @@
             ]
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "capacity": "-1",
             "isDummy": "0",
             "name": "Queue CAM"

dream/simulation/JSONInputs/Topology66.json

@@ -856,7 +856,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
             "capacity": "-1"

dream/simulation/JSONInputs/Topology67.json

@@ -1103,7 +1103,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
 			"schedulingRule": "Priority",

dream/simulation/JSONInputs/Topology68.json

@@ -1102,7 +1102,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
             "capacity": "-1"

dream/simulation/JSONInputs/Topology70.json

@@ -816,7 +816,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
             "capacity": "-1"

dream/simulation/JSONInputs/Topology71.json

@@ -816,7 +816,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
             "capacity": "-1"

dream/simulation/JSONInputs/Topology72.json

@@ -788,7 +788,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
             "capacity": "-1"

dream/simulation/JSONInputs/Topology73.json

@@ -1103,7 +1103,7 @@
             "name": "Order Decomposition"
         },
         "QCAM": {
-            "_class": "Dream.ConditionalBuffer",
+            "_class": "Dream.ConditionalBufferManaged",
             "name": "Queue CAM",
             "isDummy": "0",
 			"schedulingRule": "Priority",

dream/simulation/MouldAssemblyBuffer.py

@@ -108,7 +108,7 @@ class MouldAssemblyBuffer(QueueManagedJob):
                     activeEntity.order.basicsEnded = 1
                 # TODO: has to signal ConditionalBuffer to start sending entities again
                 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'
                         if secondary.currentStation.expectedSignals['canDispose']:
                             self.sendSignal(receiver=secondary.currentStation,signal=secondary.currentStation.canDispose)

dream/simulation/imports.py

@@ -49,7 +49,7 @@ from dream.simulation.BatchSource import BatchSource
 from dream.simulation.BatchDecomposition import BatchDecomposition
 from dream.simulation.BatchReassembly import BatchReassembly
 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.MachineManagedJob import MachineManagedJob
 from dream.simulation.QueueManagedJob import QueueManagedJob