Topopologies 28 and 33 updated as OperatedMachine is deprecated. Topology33...

Topopologies 28 and 33 updated as OperatedMachine is deprecated. Topology33 now identical to Topology22

dream/simulation/JSONInputs/Topology28.json

@@ -52,7 +52,7 @@
             "top": 0.9431137724550899
         },
         "M1": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "name": "Machine1",
             "processingTime": {
                 "distributionType": "Fixed",
@@ -63,7 +63,7 @@
             "top": 0.5
         },
         "M2": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "name": "Machine2",
             "failures": {
             },

dream/simulation/JSONInputs/Topology33.json

@@ -85,7 +85,7 @@
             "top": 0.04656862745098034
         },
         "M1": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "failures": {
                 "MTTF": "60",
                 "MTTR": "5",
@@ -100,7 +100,7 @@
             "top": 0.40931372549019607
         },
         "M2": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "failures": {
                 "MTTF": "40",
                 "MTTR": "10",
@@ -115,7 +115,7 @@
             "top": 0.40931372549019607
         },
         "M3": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "failures": {
                 "failureDistribution": "No"
             },
@@ -128,7 +128,7 @@
             "top": 0.2279411764705882
         },
         "M4": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "failures": {
                 "failureDistribution": "No"
             },