Commit 893371a8 authored by Jérome Perrin's avatar Jérome Perrin

do not prepend dream.plugins to plugin names.

What we could imagine is a name registry mapping short friendly names to
full dotted names.
parent a0ea159f
......@@ -139,23 +139,13 @@ def _runSimulation(parameter_dict):
app.logger.error(tb)
return dict(error=tb)
def getPluginNames(list):
plugin_name_list = []
plugins = list["plugin_list"]
for i in xrange(len(plugins)):
klass_name = plugins[i]["plugin"]
klass_name = "dream.plugins.%s" % klass_name
plugin_name_list.append(klass_name)
return plugin_name_list
def getPluginRestistry(data):
# input plugins
input_plugin_list = getPluginNames(data["application_configuration"]["preprocessing"])
input_plugin_list = data["application_configuration"]["preprocessing_plugin_list"]
# output plugins
output_plugin_list = getPluginNames(data["application_configuration"]["postprocessing"])
output_plugin_list = data["application_configuration"]["postprocessing_plugin_list"]
# executor plugin
executor_name = data["application_configuration"]["processing"]["plugin_list"][0]["plugin"]
executor_name = "dream.plugins.%s" % executor_name
executor_name = data["application_configuration"]["processing_plugin"] # XXX default value ?
# remove the executor plugin from the input plugins list
registry = PluginRegistry(logger=app.logger,
input_preparation_class_list=input_plugin_list,
......
......@@ -785,28 +785,24 @@
"gadget": "Output_viewDebugJson"
}
},
"preprocessing": {
"plugin_list": [
"preprocessing_plugin_list": [
{
"plugin": "PartJobShop",
"input_id": "Simulation"
}
]
},
"processing": {
"plugin_list": [
{
"plugin": "ACO"
}
]
},
"postprocessing": {
"plugin_list": [
"plugin": "dream.plugins.Debug.Debug",
"argument": "Argument Value"
},
{
"plugin": "CalculateConfidenceIntervals"
"plugin": "dream.plugins.OldStylePartJobShopWIP.OldStylePartJobShopWIP",
"input_id": "Simulation"
}
]
],
"processing_plugin": {
"plugin": "ACO"
},
"postprocessing_plugin_list": [
{
"plugin": "CalculateConfidenceIntervals"
}
],
"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