topologies moved to new format. Many fail

dream/simulation/JSONInputs/BatchBlocking01.json

 {
-    "edges": {
-        "1": [
-            "Q1",
-            "BD",
-            {}
-        ],
-        "2": [
-            "BD",
-            "M1",
-            {}
-        ],
-        "3": [
-            "M1",
-            "BR",
-            {}
-        ],
-        "4": [
-            "BR",
-            "Q2",
-            {}
-        ],
-        "5": [
-            "Q2",
-            "M2",
-            {}
-        ],
-        "6": [
-            "M2",
-            "E",
-            {}
-        ]		
-    },
-    "general": {
-        "numberOfReplications": 1,
-        "maxSimTime": -1,
-        "trace" : "No",
-        "console": "No"
-    },
-    "nodes": {
-        "Q1": {
-            "_class": "Dream.Queue",
-            "name": "Q1",
-            "element_id": "DreamNode_30",
-            "capacity": 4,
-            "schedulingRule": "FIFO",
-            "wip": [
-                {
-                    "numberOfUnits": 10,
-                    "_class": "Dream.Batch",
-                    "name": "Batch0",
-                    "id": "0"
-                },
-                {
-                    "numberOfUnits": 10,
-                    "_class": "Dream.Batch",
-                    "name": "Batch1",
-                    "id": "1"
-                }
-            ]
-        },
-        "Q2": {
-            "_class": "Dream.Queue",
-            "name": "Q2",
-            "element_id": "DreamNode_30",
-            "capacity": 4,
-            "schedulingRule": "FIFO"
-		},
-        "BD": {
-            "_class": "Dream.BatchDecompositionBlocking",
-            "name": "Deco",
-            "numberOfSubBatches": 2,
-            "processingTime": {
-                "distributionType": "Fixed",
-                "mean": 0
-            },
-            "id": "BD"
-        },
-        "M1": {
-            "_class": "Dream.BatchScrapMachine",
-            "name": "M1",
-            "element_id": "DreamNode_8",
-            "processingTime": {
-                "distributionType": "Fixed",
-                "mean": 0.1
-            },
-            "id": "M1"
-        },
-        "BR": {
-            "_class": "Dream.BatchReassemblyBlocking",
-            "name": "Reassembly",
-            "numberOfSubBatches": 2,
-            "processingTime": {
-                "distributionType": "Fixed",
-                "mean": 0
-            },
-            "id": "BR"
-        },
-        "M2": {
-            "_class": "Dream.BatchScrapMachine",
-            "name": "M2",
-            "element_id": "DreamNode_8",
-            "processingTime": {
-                "distributionType": "Fixed",
-                "mean": 1
-            },
-            "id": "M2"
-        },
-        "E": {
-            "_class": "Dream.Exit",
-            "name": "Stock",
-            "id": "E1"
-        }
-    }
+     "graph": {
+          "node": {
+               "Q1": {
+                    "capacity": 4, 
+                    "name": "Q1", 
+                    "wip": [
+                         {
+                              "_class": "Dream.Batch", 
+                              "numberOfUnits": 10, 
+                              "name": "Batch0", 
+                              "id": "0"
+                         }, 
+                         {
+                              "_class": "Dream.Batch", 
+                              "numberOfUnits": 10, 
+                              "name": "Batch1", 
+                              "id": "1"
+                         }
+                    ], 
+                    "interruptions": {}, 
+                    "element_id": "DreamNode_30", 
+                    "_class": "Dream.Queue", 
+                    "schedulingRule": "FIFO"
+               }, 
+               "BD": {
+                    "name": "Deco", 
+                    "processingTime": {
+                         "Fixed": {
+                              "mean": 0
+                         }
+                    }, 
+                    "numberOfSubBatches": 2, 
+                    "interruptions": {}, 
+                    "_class": "Dream.BatchDecompositionBlocking", 
+                    "id": "BD"
+               }, 
+               "Q2": {
+                    "capacity": 4, 
+                    "name": "Q2", 
+                    "interruptions": {}, 
+                    "element_id": "DreamNode_30", 
+                    "_class": "Dream.Queue", 
+                    "schedulingRule": "FIFO"
+               }, 
+               "E": {
+                    "interruptions": {}, 
+                    "_class": "Dream.Exit", 
+                    "name": "Stock", 
+                    "id": "E1"
+               }, 
+               "M1": {
+                    "name": "M1", 
+                    "processingTime": {
+                         "Fixed": {
+                              "mean": 0.1
+                         }
+                    }, 
+                    "interruptions": {}, 
+                    "element_id": "DreamNode_8", 
+                    "_class": "Dream.BatchScrapMachine", 
+                    "id": "M1"
+               }, 
+               "BR": {
+                    "name": "Reassembly", 
+                    "processingTime": {
+                         "Fixed": {
+                              "mean": 0
+                         }
+                    }, 
+                    "numberOfSubBatches": 2, 
+                    "interruptions": {}, 
+                    "_class": "Dream.BatchReassemblyBlocking", 
+                    "id": "BR"
+               }, 
+               "M2": {
+                    "name": "M2", 
+                    "processingTime": {
+                         "Fixed": {
+                              "mean": 1
+                         }
+                    }, 
+                    "interruptions": {}, 
+                    "element_id": "DreamNode_8", 
+                    "_class": "Dream.BatchScrapMachine", 
+                    "id": "M2"
+               }
+          }, 
+          "edge": {
+               "1": {
+                    "source": "Q1", 
+                    "destination": "BD", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }, 
+               "3": {
+                    "source": "M1", 
+                    "destination": "BR", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }, 
+               "2": {
+                    "source": "BD", 
+                    "destination": "M1", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }, 
+               "5": {
+                    "source": "Q2", 
+                    "destination": "M2", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }, 
+               "4": {
+                    "source": "BR", 
+                    "destination": "Q2", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }, 
+               "6": {
+                    "source": "M2", 
+                    "destination": "E", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }
+          }
+     }, 
+     "general": {
+          "trace": "No", 
+          "console": "No", 
+          "numberOfReplications": 1, 
+          "maxSimTime": -1
+     }
 }
\ No newline at end of file

dream/simulation/JSONInputs/FailureAndShift1.json

 {
-    "_class": "Dream.Simulation",
-    "edges": {
-        "0": [
-            "S1",
-            "M1",
-            {}
-        ],
-        "1": [
-            "M1",
-            "E1",
-            {}
-        ]
-    },
-    "general": {
-        "_class": "Dream.Configuration",
-        "confidenceLevel": "0.95",
-        "maxSimTime": "20",
-        "numberOfReplications": "1",
-        "trace": "No"
-    },
-    "nodes": {
-        "E1": {
-            "_class": "Dream.Exit",
-            "left": 0.5,
-            "name": "Stock",
-            "top": 0.10215053763440862
-        },
-        "M1": {
-            "_class": "Dream.Machine",
-            "left": 0.5,
-            "name": "Moulding",
-            "processingTime": {
-                "distributionType": "Fixed",
-                "mean": 0.25
-            },
-            "shift": {
-                "shiftPattern": [
-                    [
-                        0,
-                        5
-                    ],
-                    [
-                        10,
-                        15
-                    ]
-                ],
-                "endUnfinished": 0
-            },
-            "failures": {
-                "MTTF": 7,
-                "MTTR": 1,
-                "distributionType": "Fixed"
-            },
-            "top": 0.5
-        },
-        "S1": {
-            "_class": "Dream.Source",
-            "entity": "Dream.Part",
-            "interArrivalTime": {
-                "distributionType": "Fixed",
-                "mean": 0.5
-            },
-            "left": 0.5,
-            "name": "Raw Material",
-            "top": 0.8978494623655914
-        }
-    }
+     "graph": {
+          "node": {
+               "M1": {
+                    "name": "Moulding", 
+                    "shift": {
+                         "endUnfinished": 0, 
+                         "shiftPattern": [
+                              [
+                                   0, 
+                                   5
+                              ], 
+                              [
+                                   10, 
+                                   15
+                              ]
+                         ]
+                    }, 
+                    "top": 0.5, 
+                    "processingTime": {
+                         "Fixed": {
+                              "mean": 0.25
+                         }
+                    }, 
+                    "interruptions": {
+                         "failure": {
+                              "TTR": {
+                                   "Fixed": {
+                                        "mean": 1
+                                   }
+                              }, 
+                              "TTF": {
+                                   "Fixed": {
+                                        "mean": 7
+                                   }
+                              }
+                         }
+                    }, 
+                    "_class": "Dream.Machine", 
+                    "left": 0.5
+               }, 
+               "S1": {
+                    "name": "Raw Material", 
+                    "top": 0.8978494623655914, 
+                    "entity": "Dream.Part", 
+                    "interArrivalTime": {
+                         "Fixed": {
+                              "distributionType": "Fixed", 
+                              "mean": 0.5
+                         }
+                    }, 
+                    "interruptions": {}, 
+                    "_class": "Dream.Source", 
+                    "left": 0.5
+               }, 
+               "E1": {
+                    "interruptions": {}, 
+                    "top": 0.10215053763440862, 
+                    "_class": "Dream.Exit", 
+                    "name": "Stock", 
+                    "left": 0.5
+               }
+          }, 
+          "edge": {
+               "1": {
+                    "source": "M1", 
+                    "destination": "E1", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }, 
+               "0": {
+                    "source": "S1", 
+                    "destination": "M1", 
+                    "data": {}, 
+                    "_class": "Dream.Edge"
+               }
+          }
+     }, 
+     "_class": "Dream.Simulation", 
+     "general": {
+          "trace": "No", 
+          "_class": "Dream.Configuration", 
+          "confidenceLevel": "0.95", 
+          "maxSimTime": "20", 
+          "numberOfReplications": "1"
+     }
 }
\ No newline at end of file