instance and plugin updated to output 2 lines

dream/plugins/DemandPlanningLine.py

@@ -11,7 +11,8 @@ class DemandPlanningLine(plugin.OutputPreparationPlugin, TimeSupportMixin):
     from dream.simulation.applications.DemandPlanning.Globals import G
     utilisation=G.Utilisation
     # XXX current implementation for one bottleneck
-    bottleNeckUtilization=G.Utilisation['BE_T_BE1S_TEST_EQ_FLEX_T417_3']      
+    for bottleneck in ['BE_A_VF78_DSO_3','BE_A_VK18_DKO_5']:
+        bottleNeckUtilization=G.Utilisation[bottleneck]      
         dateList=[]
         # get the current date from the data
         for record_id,record in bottleNeckUtilization.iteritems():
@@ -34,7 +35,7 @@ class DemandPlanningLine(plugin.OutputPreparationPlugin, TimeSupportMixin):
           }
         }
      
-    result[self.configuration_dict['output_id']] = {
+        result[bottleneck] = {
           "series": series,
           "options": options
         }
@@ -53,4 +54,5 @@ class DemandPlanningLine(plugin.OutputPreparationPlugin, TimeSupportMixin):
                 "label": utilizationType,
                 "data": [((time-datetime(1970, 1, 1)).total_seconds()*1000, value) for (time, value) in utilizationList]
             })
+            
     return data

dream/simulation/Examples/GUI_instances/DemandPlanningAllInOneEmpty.json

@@ -62,6 +62,12 @@
           "name": "Minimum Delta Utilisation", 
           "type": "number"
         },
+        "MAProportionality": {
+          "default": 0.5, 
+          "description": "Mutation Proportionality", 
+          "name": "Mutation Proportionality", 
+          "type": "number"
+        },
         "GA": {
           "default": 1, 
           "description": "GA", 
@@ -142,12 +148,20 @@
         "title": "Download Result Spreadsheet", 
         "type": "object_view"
       },
-      "view_utilization_stats": {
+      "view_utilization_stats1": {
         "configuration": {
-          "output_id": "bottleneck_utilization"
+          "output_id": "BE_A_VF78_DSO_3"
+        }, 
+        "gadget": "Output_viewGraph", 
+        "title": "BE_A_VF78_DSO_3 Utilization", 
+        "type": "object_view"
+      },
+      "view_utilization_stats2": {
+        "configuration": {
+          "output_id": "BE_A_VK18_DKO_5"
         }, 
         "gadget": "Output_viewGraph", 
-        "title": "Bottleneck Utilization", 
+        "title": "BE_A_VK18_DKO_5 Utilization", 
         "type": "object_view"
       }	  
     },