after OperatedMachine collapse, Topology31 is updated. Error in Topology31...

after OperatedMachine collapse, Topology31 is updated. Error in Topology31 fixed - Now identical to Topology01

dream/simulation/JSONInputs/Topology31.json

 {"_class": "Dream.Simulation",
  "edges": {
    "0": [
+   		"W1",
+   		"M1",
+   		{}
+   		],
+   "1": [
+   		"W1",
+   		"M2",
+   		{}
+   		],
+   "2": [
         "S1",
         "DummyQ",
         {}
         ],
-   "1": [
+   "3": [
         "M1",
         "Q1",
         {}
         ],
-   "2": [
+   "4": [
         "M2",
         "E1",
         {}
         ],
-   "3": [
+   "5": [
         "DummyQ",
         "M1",
         {}
         ],
-   "4": [
+   "6": [
         "Q1",
         "M2",
         {}
@@ -44,7 +54,7 @@
          },
       "entity": "Part"
       },
-     "M1": {"_class": "Dream.OperatedMachine",
+     "M1": {"_class": "Dream.Machine",
       "id": "M1",
       "name": "Machine1",
       "processingTime": {
@@ -57,7 +67,7 @@
 		   "MTTR": "5"
         }
       },
-     "M2": {"_class": "Dream.OperatedMachine",
+     "M2": {"_class": "Dream.Machine",
       "id": "M2",
       "name": "Machine2",
       "processingTime": {
@@ -85,6 +95,12 @@
      "E1": {"_class": "Dream.Exit",
       "id": "E1",
       "name": "Stock"
-     }
+      },
+     "W1": {"_class": "Dream.Repairman",
+     "capacity": "1",
+     "left": 0.14893617021276595,
+     "name": "W1",
+     "top": 0.7727272727272727
+      }
   }
 }

dream/tests/dump/Topology31.json.result

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