Topology32 is updated. Error in Topology31 fixed - Now identical to Topology17

dream/simulation/JSONInputs/Topology32.json

@@ -2,36 +2,26 @@
     "_class": "Dream.Simulation",
     "edges": {
         "0": [
-            "W1",
-            "M1",
-            {}
-        ],
-        "1": [
-            "W1",
-            "M2",
-            {}
-        ],
-        "2": [
             "S1",
             "DummyQ",
             {}
         ],
-        "3": [
+        "1": [
             "M1",
             "Q1",
             {}
         ],
-        "4": [
+        "2": [
             "M2",
             "E1",
             {}
         ],
-        "5": [
+        "3": [
             "DummyQ",
             "M1",
             {}
         ],
-        "6": [
+        "4": [
             "Q1",
             "M2",
             {}
@@ -60,7 +50,7 @@
             "top": 0.045454545454545414
         },
         "M1": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "failures": {
                 "MTTF": "60",
                 "MTTR": "5",
@@ -75,7 +65,7 @@
             "top": 0.5909090909090908
         },
         "M2": {
-            "_class": "Dream.OperatedMachine",
+            "_class": "Dream.Machine",
             "failures": {
                 "MTTF": "40",
                 "MTTR": "10",
@@ -110,13 +100,6 @@
             "left": 0.6968085106382979,
             "name": "Raw Material",
             "top": 0.9545454545454546
-        },
-        "W1": {
-            "_class": "Dream.Repairman",
-            "capacity": "1",
-            "left": 0.14893617021276595,
-            "name": "W1",
-            "top": 0.7727272727272727
         }
     }
 }

dream/tests/dump/Topology32.json.result

 {
- "_class": "Dream.Simulation", 
  "elementList": [
   {
    "_class": "Dream.Queue", 
-   "id": "DummyQ"
+   "id": "DummyQ", 
+   "schedulingRule": "FIFO"
   }, 
   {
    "_class": "Dream.Exit", 
    "id": "E1", 
    "results": {
-    "lifespan": 7.646516393442623, 
-    "takt_time": 1.965846994535519, 
-    "throughput": 732
+    "throughput": 742, 
+    "takt_time": 1.9393530997304582, 
+    "lifespan": 7.5488544474393535
    }
   }, 
   {
    "_class": "Dream.Machine", 
    "id": "M1", 
    "results": {
-    "blockage_ratio": 86.51041666666667, 
-    "failure_ratio": 9.027777777777779, 
-    "waiting_ratio": -8.29861111111111, 
-    "working_ratio": 12.760416666666666
+    "working_ratio": 12.934027777777779, 
+    "blockage_ratio": 79.39236111111111, 
+    "failure_ratio": 7.638888888888889, 
+    "waiting_ratio": 0.034722222222222224
    }
   }, 
   {
    "_class": "Dream.Machine", 
    "id": "M2", 
    "results": {
+    "working_ratio": 77.36111111111111, 
     "blockage_ratio": 0.0, 
-    "failure_ratio": 19.791666666666668, 
-    "waiting_ratio": 3.888888888888889, 
-    "working_ratio": 76.31944444444444
+    "failure_ratio": 19.444444444444443, 
+    "waiting_ratio": 3.1944444444444446
    }
   }, 
   {
    "_class": "Dream.Queue", 
-   "id": "Q1"
-  }, 
-  {
-   "_class": "Dream.Repairman", 
-   "id": "W1", 
-   "results": {
-    "waiting_ratio": 73.26388888888889, 
-    "working_ratio": 26.73611111111111
-   }
+   "id": "Q1", 
+   "schedulingRule": "FIFO"
   }
  ], 
+ "_class": "Dream.Simulation", 
  "general": {
   "_class": "Dream.Configuration"
  }