Commit b2334873 authored by Georgios Dagkakis's avatar Georgios Dagkakis

correction in ACO for batches

parent cfb6dad4
...@@ -27,7 +27,7 @@ class BatchesACO(ACO): ...@@ -27,7 +27,7 @@ class BatchesACO(ACO):
if unitsThroughput: if unitsThroughput:
unitsThroughput=unitsThroughput[0] unitsThroughput=unitsThroughput[0]
if not unitsThroughput: if not unitsThroughput:
unitsThroughput=batchesThroughput unitsThroughput=element['results']['throughput'][0]
# return the negative value since they are ranked this way. XXX discuss this # return the negative value since they are ranked this way. XXX discuss this
return -unitsThroughput return -unitsThroughput
...@@ -69,7 +69,7 @@ class BatchesACO(ACO): ...@@ -69,7 +69,7 @@ class BatchesACO(ACO):
ant_data = copy(data) ant_data = copy(data)
# below provisional values, to be updated (should the user set those?) # below provisional values, to be updated (should the user set those?)
data['general']['numberOfSolutions']=1 data['general']['numberOfSolutions']=1
data["general"]["numberOfGenerations"]=4 data["general"]["numberOfGenerations"]=1
data["general"]["numberOfAntsPerGenerations"]=2 data["general"]["numberOfAntsPerGenerations"]=3
ACO.run(self, data) ACO.run(self, data)
return data return data
\ No newline at end of file
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