post/pre-plugins lists defined within processing objects which may have other...

post/pre-plugins lists defined within processing objects which may have other properties (description). Plugin registry modified to read in that way the configuration file

dream/plugins/plugin.py

@@ -55,11 +55,11 @@ class PluginRegistry(object):
   def __init__(self, logger, data):
 
     self.input_preparation_list = []
-    for plugin_data in data['application_configuration']['pre_processing_plugin_list']:
+    for plugin_data in data['application_configuration']['pre_processing']['plugin_list']:
       self.input_preparation_list.append(resolve(plugin_data['_class'])(logger, plugin_data))
 
     self.output_preparation_list = []
-    for plugin_data in data['application_configuration']['post_processing_plugin_list']:
+    for plugin_data in data['application_configuration']['post_processing']['plugin_list']:
       self.output_preparation_list.append(resolve(plugin_data['_class'])(logger, plugin_data))
 
     plugin_data = data['application_configuration']['processing_plugin']

dream/simulation/Examples/BatchAllInOneEmpty.json

@@ -266,30 +266,37 @@
         "type": "object_view"
       }
     },
-    "post_processing_plugin_list": [],
-    "pre_processing_plugin_list": [
-      {
-        "_class": "dream.plugins.GatherWIPStat.GatherWIPStat",
-        "input_id": "WIPStat"
-      },
-      {
-        "_class": "dream.plugins.ReadEntryData.ReadEntryData",
-        "input_id": "EntryData"
-      },
-      {
-        "_class": "dream.plugins.BatchesWIPSpreadsheet.BatchesWIPSpreadsheet",
-        "input_id": "WipSpreadsheet"
-      },
-      {
-        "_class": "dream.plugins.ReadSkilledOperators.ReadSkilledOperators",
-        "input_id": "SkilledOperatorsSpreadsheet"
-      },
-      {
-        "_class": "dream.plugins.ReadShiftFromSpreadsheet.ReadShiftFromSpreadsheet",
-        "input_id": "ShiftSpreadsheet"
-      }
-    ],
+    "post_processing": {
+      "description" : "",
+      "plugin_list" : []
+    },
+    "pre_processing": {
+      "description" : "",
+      "plugin_list" : [
+        {
+          "_class": "dream.plugins.GatherWIPStat.GatherWIPStat",
+          "input_id": "WIPStat"
+        },
+        {
+          "_class": "dream.plugins.ReadEntryData.ReadEntryData",
+          "input_id": "EntryData"
+        },
+        {
+          "_class": "dream.plugins.BatchesWIPSpreadsheet.BatchesWIPSpreadsheet",
+          "input_id": "WipSpreadsheet"
+        },
+        {
+          "_class": "dream.plugins.ReadSkilledOperators.ReadSkilledOperators",
+          "input_id": "SkilledOperatorsSpreadsheet"
+        },
+        {
+          "_class": "dream.plugins.ReadShiftFromSpreadsheet.ReadShiftFromSpreadsheet",
+          "input_id": "ShiftSpreadsheet"
+        }
+      ]
+    },
     "processing_plugin": {
+      "description" : "",
       "_class": "dream.plugins.plugin.DefaultExecutionPlugin"
     }
   },

dream/simulation/Examples/DefaultAllInOneEmpty2.json

@@ -772,27 +772,26 @@
         "gadget": "Output_viewDebugJson"
       }
     },
-    "preprocessing": {
+    "pre_processing": {
+      "description" : "",
       "plugin_list": [
         {
-          "plugin": "GatherWIPStat.GatherWIPStat",
+          "_class": "dream.plugins.GatherWIPStat.GatherWIPStat",
           "input_id": "WIPStat"
         },
         {
-          "plugin": "WIPSpreadsheet.WIPSpreadsheet",
+          "_class": "dream.plugins.WIPSpreadsheet.WIPSpreadsheet",
           "input_id": "WIPdata"
         }
       ]
     },
-    "processing": {
-      "plugin_list": [
-        {
-          "plugin": "plugin.DefaultExecutionPlugin",
-          "input_id": "Simulation"
-        }
-      ]
+    "processing_plugin": {
+      "description" : "",
+      "_class": "dream.plugins.plugin.DefaultExecutionPlugin",
+      "input_id": "Simulation"
     },
-    "postprocessing": {
+    "post_processing": {
+      "description" : "",
       "plugin_list": []
     },
     "general": {

dream/simulation/Examples/JobShopAllInOneEmpty.json

@@ -843,25 +843,32 @@
 				"gadget" : "Output_viewDebugJson"
 			}
 		},
-		"preprocessing" : {
+		"pre_processing" : {
+			"description" : "",
 			"plugin_list" : [{
-					"plugin" : "PartJobShop",
+					"_class" : "dream.plugins.PartJobShop.PartJobShop",
 					"input_id" : "Simulation"
 				}, {
-					"plugin" : "ReadShiftFromSpreadsheet",
+					"_class" : "dream.plugins.ReadShiftFromSpreadsheet.ReadShiftFromSpreadsheet",
 					"input_id" : "ShiftSpreadsheet"
 				}, {
-					"plugin" : "ReadWipFromSpreadsheet",
+					"_class" : "dream.plugins.ReadWipFromSpreadsheet.ReadWipFromSpreadsheet",
 					"input_id" : "WipSpreadsheet"
 				}, {
-					"plugin" : "ReadRouteFromSpreadsheet",
+					"_class" : "dream.plugins.ReadRouteFromSpreadsheet.ReadRouteFromSpreadsheet",
 					"input_id" : "RouteSpreadsheet"
 				}
 			]
 		},
-		"postprocessing" : {
+		"processing_plugin" : {
+			"description" : "",
+			"_class" : "",
+			"input_id" : ""
+		}
+		"post_processing" : {
+			"description" : "",
 			"plugin_list" : [{
-				"plugin" : "CalculateConfidenceIntervals"
+				"_class" : "dream.plugins.CalculateConfidenceIntervals.CalculateConfidenceIntervals"
 			}]
 		},
 		"general" : {

dream/simulation/Examples/PartJobShopAllInOneEmpty.json

@@ -810,20 +810,27 @@
         "gadget": "Output_viewDebugJson"
       }
     },
-    "pre_processing_plugin_list": [
-      {
-        "_class": "dream.plugins.Debug.Debug",
-        "argument": "Argument Value"
-      },
-      {
-        "_class": "dream.plugins.OldStylePartJobShopWIP.OldStylePartJobShopWIP",
-        "input_id": "old_style_part_jobshop_spreadsheet"
-      }
-    ],
+    "pre_processing": {
+      "description" : "",
+      "_plugin_list": [
+        {
+          "_class": "dream.plugins.Debug.Debug",
+          "argument": "Argument Value"
+        },
+        {
+          "_class": "dream.plugins.OldStylePartJobShopWIP.OldStylePartJobShopWIP",
+          "input_id": "old_style_part_jobshop_spreadsheet"
+        }
+      ]
+    },
     "processing_plugin": {
+      "description": "",
       "_class": "dream.plugins.ACO.ACO"
     },
-    "post_processing_plugin_list": [],
+    "post_processing": {
+      "description": "",
+	  "plugin_list": []
+    },
     "general": {
       "properties": {
         "numberOfReplications": {