scheduled maintenance updated

dream/simulation/JSONInputs/Topology36.json

 {
-     "graph": {
-          "node": {
-               "Q1": {
-                    "capacity": -1, 
-                    "name": "Queue1", 
-                    "isDummy": "0", 
-                    "interruptions": {}, 
-                    "_class": "Dream.Queue", 
-                    "id": "Q1"
-               }, 
-               "E1": {
-                    "interruptions": {}, 
-                    "top": 0.10215053763440862, 
-                    "_class": "Dream.Exit", 
-                    "name": "Stock", 
-                    "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
-               }, 
-               "M1": {
+    "graph": {
+        "node": {
+            "Q1": {
+                "capacity": -1,
+                "name": "Queue1",
+                "isDummy": "0",
+                "interruptions": {},
+                "_class": "Dream.Queue",
+                "id": "Q1"
+            },
+            "E1": {
+                "interruptions": {},
+                "top": 0.10215053763440862,
+                "_class": "Dream.Exit",
+                "name": "Stock",
+                "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
+            },
+            "M1": {
+                "name": "Moulding",
+                "top": 0.5,
+                "processingTime": {
+                    "Fixed": {
+                        "mean": 0.25
+                    }
+                },
+                "interruptions": {
                     "scheduledMaintenance": {
-                         "duration": "60", 
-                         "start": "120"
-                    }, 
-                    "name": "Moulding", 
-                    "top": 0.5, 
-                    "processingTime": {
-                         "Fixed": {
-                              "mean": 0.25
-                         }
-                    }, 
-                    "interruptions": {}, 
-                    "_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"
-               }, 
-               "2": {
-                    "source": "M1", 
-                    "destination": "E1", 
-                    "data": {}, 
-                    "_class": "Dream.Edge"
-               }
-          }
-     }, 
-     "_class": "Dream.Simulation", 
-     "general": {
-          "maxSimTime": "240", 
-          "_class": "Dream.Configuration", 
-          "confidenceLevel": "0.95", 
-          "trace": "No", 
-          "numberOfReplications": "1"
-     }
+                        "duration": "60",
+                        "start": "120"
+                    }
+                },
+                "_class": "Dream.Machine",
+                "left": 0.5
+            }
+        },
+        "edge": {
+            "0": {
+                "source": "S1",
+                "destination": "Q1",
+                "data": {},
+                "_class": "Dream.Edge"
+            },
+            "1": {
+                "source": "Q1",
+                "destination": "M1",
+                "data": {},
+                "_class": "Dream.Edge"
+            },
+            "2": {
+                "source": "M1",
+                "destination": "E1",
+                "data": {},
+                "_class": "Dream.Edge"
+            }
+        }
+    },
+    "_class": "Dream.Simulation",
+    "general": {
+        "maxSimTime": "240",
+        "_class": "Dream.Configuration",
+        "confidenceLevel": "0.95",
+        "trace": "No",
+        "numberOfReplications": "1"
+    }
 }
\ No newline at end of file

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):