Commit b96b3078 authored by Georgios Dagkakis's avatar Georgios Dagkakis

collated scenarios to be created in separated method

parent c36c572d
...@@ -30,6 +30,16 @@ class ACO(plugin.ExecutionPlugin): ...@@ -30,6 +30,16 @@ class ACO(plugin.ExecutionPlugin):
totalDelay += max(delay, 0) totalDelay += max(delay, 0)
return totalDelay return totalDelay
def createCollatedScenarios(self,data):
# the list of options collated into a dictionary for ease of referencing in
# ManPy
collated = dict()
for node_id, node in data['graph']['node'].items():
node_class = getClassFromName(node['_class'])
if issubclass(node_class, Queue) or issubclass(node_class, Operator):
collated[node_id] = list(node_class.getSupportedSchedulingRules())
return collated
def run(self, data): def run(self, data):
"""Preprocess the data. """Preprocess the data.
""" """
...@@ -41,14 +51,8 @@ class ACO(plugin.ExecutionPlugin): ...@@ -41,14 +51,8 @@ class ACO(plugin.ExecutionPlugin):
tested_ants = set() tested_ants = set()
start = time.time() # start counting execution time start = time.time() # start counting execution time
# the list of options collated into a dictionary for ease of referencing in collated=self.createCollatedScenarios(data)
# ManPy assert collated
collated = dict()
for node_id, node in data['graph']['node'].items():
node_class = getClassFromName(node['_class'])
if issubclass(node_class, Queue) or issubclass(node_class, Operator):
collated[node_id] = list(node_class.getSupportedSchedulingRules())
assert collated
max_results = int(data['general'].get('numberOfSolutions',0)) max_results = int(data['general'].get('numberOfSolutions',0))
assert max_results >= 1 assert max_results >= 1
......
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