Commit 3162647f authored by Georgios Dagkakis's avatar Georgios Dagkakis

general attributes passed into the algorithm. Not read yet

parent 95a0705f
...@@ -16,6 +16,7 @@ class AddDemandPlannerGenerator(plugin.InputPreparationPlugin): ...@@ -16,6 +16,7 @@ class AddDemandPlannerGenerator(plugin.InputPreparationPlugin):
nodes=data['graph']['node'] nodes=data['graph']['node']
data_uri_encoded_input_data = data['input'].get(self.configuration_dict['input_id'], {}) data_uri_encoded_input_data = data['input'].get(self.configuration_dict['input_id'], {})
algorithmAttributes=copy(data['general'])
nodes['DPG']={ nodes['DPG']={
"name": "DemandPlannerGenerator", "name": "DemandPlannerGenerator",
...@@ -25,7 +26,7 @@ class AddDemandPlannerGenerator(plugin.InputPreparationPlugin): ...@@ -25,7 +26,7 @@ class AddDemandPlannerGenerator(plugin.InputPreparationPlugin):
"stop": 0.5, "stop": 0.5,
"_class": "dream.simulation.EventGenerator.EventGenerator", "_class": "dream.simulation.EventGenerator.EventGenerator",
"method": "dream.simulation.applications.DemandPlanning.executor_ACO.main", "method": "dream.simulation.applications.DemandPlanning.executor_ACO.main",
"argumentDict": {'input':data_uri_encoded_input_data} "argumentDict": {'input':data_uri_encoded_input_data, 'algorithmAttributes':algorithmAttributes}
} }
#print nodes #print nodes
return data return data
......
...@@ -43,7 +43,7 @@ def my_split(s, seps): ...@@ -43,7 +43,7 @@ def my_split(s, seps):
res += seq.split(sep) res += seq.split(sep)
return res return res
def ImportInput(input): def ImportInput(input, algorithmAttributes):
# general simulation input # general simulation input
mime_type, attachement_data = input[len('data:'):].split(';base64,', 1) mime_type, attachement_data = input[len('data:'):].split(';base64,', 1)
......
...@@ -27,8 +27,8 @@ from AllocManagement_Hybrid import AllocManagement_Hybrid2 ...@@ -27,8 +27,8 @@ from AllocManagement_Hybrid import AllocManagement_Hybrid2
from ImportInput import ImportInput from ImportInput import ImportInput
from outputResults import outputResults from outputResults import outputResults
def main(input): def main(input, algorithmAttributes):
assert input, 'no input is provided, the algorithm cannot run' assert input, 'no input is provided, the algorithm cannot run'
ImportInput(input) ImportInput(input, algorithmAttributes)
AllocManagement_Hybrid2() AllocManagement_Hybrid2()
outputResults() outputResults()
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