topologies that had same id in two objects corrected, dump updated

dream/simulation/JSONInputs/Topology39.json

@@ -152,7 +152,7 @@
                         },
                         {
                             "_class": "Dream.Mould",
-                            "id": "M1",
+                            "id": "Mo1",
                             "name": "Mould1",
                             "route": [
                                 {

dream/simulation/JSONInputs/Topology40.json

@@ -159,7 +159,7 @@
                         },
                         {
                             "_class": "Dream.Mould",
-                            "id": "M1",
+                            "id": "Mo1",
                             "name": "Mould1",
                             "route": [
                                 {

dream/simulation/JSONInputs/Topology41.json

@@ -219,7 +219,7 @@
                         },
                         {
                             "_class": "Dream.Mould",
-                            "id": "M1",
+                            "id": "Mo1",
                             "name": "Mould1",
                             "route": [
                                 {

dream/tests/dump/Topology39.json.result

@@ -100,9 +100,18 @@
    }
   }, 
   {
-   "_class": "Dream.Mould", 
-   "family": "Job", 
-   "id": "M1", 
+   "_class": "Dream.Machine", 
+   "id": "MA1", 
+   "results": {
+    "blockage_ratio": 0.0, 
+    "failure_ratio": 0.0, 
+    "waiting_ratio": 80.0, 
+    "working_ratio": 20.0
+   }
+  }, 
+  {
+   "_class": "Dream.Job", 
+   "id": "Mo1", 
    "results": {
     "completionTime": 5.0, 
     "schedule": [
@@ -118,17 +127,7 @@
    }
   }, 
   {
-   "_class": "Dream.MouldAssembly", 
    "family": "Server", 
-   "id": "MA1", 
-   "results": {
-    "blockage_ratio": 0.0, 
-    "failure_ratio": 0.0, 
-    "waiting_ratio": 80.0, 
-    "working_ratio": 20.0
-   }
-  }, 
-  {
    "_class": "Dream.Order", 
    "family": "Job", 
    "id": "O1", 

dream/tests/dump/Topology40.json.result

@@ -106,9 +106,17 @@
    }
   }, 
   {
-   "_class": "Dream.Mould", 
-   "family": "Job", 
-   "id": "M1", 
+   "_class": "Dream.Machine", 
+   "id": "MA1", 
+   "results": {
+    "blockage_ratio": 0.0, 
+    "failure_ratio": 0.0, 
+    "waiting_ratio": 80.0, 
+    "working_ratio": 20.0
+   }
+  }, 
+  {
+   "id": "Mo1", 
    "results": {
     "completionTime": 5.0, 
     "schedule": [
@@ -124,17 +132,7 @@
    }
   }, 
   {
-   "_class": "Dream.MouldAssembly", 
    "family": "Server", 
-   "id": "MA1", 
-   "results": {
-    "blockage_ratio": 0.0, 
-    "failure_ratio": 0.0, 
-    "waiting_ratio": 80.0, 
-    "working_ratio": 20.0
-   }
-  }, 
-  {
    "_class": "Dream.Order", 
    "family": "Job", 
    "id": "O1", 

dream/tests/dump/Topology41.json.result

@@ -136,24 +136,7 @@
    }
   }, 
   {
-   "_class": "Dream.Mould", 
    "family": "Job", 
-   "id": "M1", 
-   "results": {
-    "completionTime": 7.0, 
-    "schedule": [
-     {
-      "entranceTime": 6.0, 
-      "stationId": "MA1"
-     }, 
-     {
-      "entranceTime": 7.0, 
-      "stationId": "E1"
-     }
-    ]
-   }
-  }, 
-  {
    "_class": "Dream.MachineJobShop", 
    "family": "Server", 
    "id": "M2", 
@@ -175,6 +158,23 @@
     "working_ratio": 14.285714285714286
    }
   }, 
+  {
+   "_class": "Dream.Job", 
+   "id": "Mo1", 
+   "results": {
+    "completionTime": 7.0, 
+    "schedule": [
+     {
+      "entranceTime": 6.0, 
+      "stationId": "MA1"
+     }, 
+     {
+      "entranceTime": 7.0, 
+      "stationId": "E1"
+     }
+    ]
+   }
+  }, 
   {
    "_class": "Dream.Order", 
    "family": "Job",