scheduled maintenance updated

dream/simulation/JSONInputs/Topology36.json

@@ -31,10 +31,6 @@
                 "left": 0.5
             },
             "M1": {
-                    "scheduledMaintenance": {
-                         "duration": "60", 
-                         "start": "120"
-                    }, 
                 "name": "Moulding",
                 "top": 0.5,
                 "processingTime": {
@@ -42,24 +38,29 @@
                         "mean": 0.25
                     }
                 },
-                    "interruptions": {}, 
+                "interruptions": {
+                    "scheduledMaintenance": {
+                        "duration": "60",
+                        "start": "120"
+                    }
+                },
                 "_class": "Dream.Machine",
                 "left": 0.5
             }
         },
         "edge": {
-               "1": {
-                    "source": "Q1", 
-                    "destination": "M1", 
-                    "data": {}, 
-                    "_class": "Dream.Edge"
-               }, 
             "0": {
                 "source": "S1",
                 "destination": "Q1",
                 "data": {},
                 "_class": "Dream.Edge"
             },
+            "1": {
+                "source": "Q1",
+                "destination": "M1",
+                "data": {},
+                "_class": "Dream.Edge"
+            },
             "2": {
                 "source": "M1",
                 "destination": "E1",

dream/simulation/LineGenerationJSON.py

@@ -281,7 +281,7 @@ def createObjectInterruptions():
     from dream.simulation.ShiftScheduler import ShiftScheduler
     for (element_id, element) in nodes.iteritems():
         element['id'] = element_id
-        scheduledMaintenance=element.get('scheduledMaintenance', {})
+        scheduledMaintenance=element.get('interruptions',{}).get('scheduledMaintenance', {})
         # if there is a scheduled maintenance initiate it and append it
         # to the interruptions- and scheduled maintenances- list
         if len(scheduledMaintenance):