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
parent 32c14fc9
......@@ -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']
......
......@@ -266,8 +266,13 @@
"type": "object_view"
}
},
"post_processing_plugin_list": [],
"pre_processing_plugin_list": [
"post_processing": {
"description" : "",
"plugin_list" : []
},
"pre_processing": {
"description" : "",
"plugin_list" : [
{
"_class": "dream.plugins.GatherWIPStat.GatherWIPStat",
"input_id": "WIPStat"
......@@ -288,8 +293,10 @@
"_class": "dream.plugins.ReadShiftFromSpreadsheet.ReadShiftFromSpreadsheet",
"input_id": "ShiftSpreadsheet"
}
],
]
},
"processing_plugin": {
"description" : "",
"_class": "dream.plugins.plugin.DefaultExecutionPlugin"
}
},
......
......@@ -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",
"processing_plugin": {
"description" : "",
"_class": "dream.plugins.plugin.DefaultExecutionPlugin",
"input_id": "Simulation"
}
]
},
"postprocessing": {
"post_processing": {
"description" : "",
"plugin_list": []
},
"general": {
......
......@@ -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" : {
......
......@@ -810,7 +810,9 @@
"gadget": "Output_viewDebugJson"
}
},
"pre_processing_plugin_list": [
"pre_processing": {
"description" : "",
"_plugin_list": [
{
"_class": "dream.plugins.Debug.Debug",
"argument": "Argument Value"
......@@ -819,11 +821,16 @@
"_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": {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment