Shifts to be read in the new way

dream/simulation/JSONInputs/ShiftThreshold1.json

@@ -3,6 +3,13 @@
         "node": {
             "M1": {
                 "name": "Moulding",
+                "top": 0.5,
+                "processingTime": {
+                    "Fixed": {
+                        "mean": 0.25
+                    }
+                },
+                "interruptions": {
                     "shift": {
                         "endUnfinished": 0,
                         "receiveBeforeEndThreshold": 2,
@@ -16,14 +23,8 @@
                                 15
                             ]
                         ]
-                    }, 
-                    "top": 0.5, 
-                    "processingTime": {
-                         "Fixed": {
-                              "mean": 0.25
                     }
                 },
-                    "interruptions": {}, 
                 "_class": "Dream.Machine",
                 "left": 0.5
             },
@@ -50,17 +51,17 @@
             }
         },
         "edge": {
-               "1": {
-                    "source": "M1", 
-                    "destination": "E1", 
-                    "data": {}, 
-                    "_class": "Dream.Edge"
-               }, 
             "0": {
                 "source": "S1",
                 "destination": "M1",
                 "data": {},
                 "_class": "Dream.Edge"
+            },
+            "1": {
+                "source": "M1",
+                "destination": "E1",
+                "data": {},
+                "_class": "Dream.Edge"
             }
         }
     },

dream/simulation/LineGenerationJSON.py

@@ -313,7 +313,7 @@ def createObjectInterruptions():
             G.PeriodicMaintenanceList.append(PM)
         # if there is a shift pattern defined 
         # initiate them             
-        shift=element.get('shift', {})
+        shift=element.get('interruptions',{}).get('shift', {})
         if len(shift):
             victim=Globals.findObjectById(element['id'])
             shiftPattern=list(shift.get('shiftPattern', []))