Commit 60c595a4 authored by Georgios Dagkakis's avatar Georgios Dagkakis

if we have only deterministic evaluation in generations do not set score to zero

parent 6ea4f45b
...@@ -210,10 +210,12 @@ class BatchesStochasticACO(BatchesACO): ...@@ -210,10 +210,12 @@ class BatchesStochasticACO(BatchesACO):
self.outputSheet.write(self.rowIndex,3,-ant['score']) self.outputSheet.write(self.rowIndex,3,-ant['score'])
self.rowIndex+=1 self.rowIndex+=1
# for the ants that were not evaluated stochastically set score = 0 # if we had stochastic evaluation of ants at the end of the generation
for ant in antsInCurrentGeneration: if numberOfAntsForStochasticEvaluationInGeneration:
if ant['evaluationType']=='deterministic': # for the ants that were not evaluated stochastically set score = 0
ant['score']=0 for ant in antsInCurrentGeneration:
if ant['evaluationType']=='deterministic':
ant['score']=0
# if we had stochastic evaluation keep only those ants in sorting # if we had stochastic evaluation keep only those ants in sorting
if numberOfAntsForStochasticEvaluationInGeneration: if numberOfAntsForStochasticEvaluationInGeneration:
...@@ -263,7 +265,7 @@ class BatchesStochasticACO(BatchesACO): ...@@ -263,7 +265,7 @@ class BatchesStochasticACO(BatchesACO):
self.outputSheet.write(self.rowIndex,2,ant['key']) self.outputSheet.write(self.rowIndex,2,ant['key'])
self.rowIndex+=1 self.rowIndex+=1
ant['result'] = self.runOneScenario(ant['input'])['result'] ant['result'] = self.runOneScenario(ant['input'])['result']
ant['score'] = self.calculateStochasticAntScore(ant) ant['score'] = self.calculateStochasticAntScore(ant)
self.outputSheet.write(self.rowIndex,2,'Average Units Throughput') self.outputSheet.write(self.rowIndex,2,'Average Units Throughput')
self.outputSheet.write(self.rowIndex,3,-ant['score']) self.outputSheet.write(self.rowIndex,3,-ant['score'])
self.rowIndex+=1 self.rowIndex+=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