From 83acbdc3b501d64dc72178207fc8b882ec280993 Mon Sep 17 00:00:00 2001 From: Sven Czarnian Date: Mon, 20 Dec 2021 14:24:27 +0100 Subject: [PATCH] remove unused variables and rename a parameter --- aman/sys/aco/Ant.py | 4 ++-- aman/sys/aco/Configuration.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aman/sys/aco/Ant.py b/aman/sys/aco/Ant.py index fd2d1f5..4b71474 100644 --- a/aman/sys/aco/Ant.py +++ b/aman/sys/aco/Ant.py @@ -112,8 +112,8 @@ class Ant: self.Sequence.append(index) # update the local pheromone - update = (1.0 - self.Configuration.propagationRatio) * self.PheromoneMatrix[self.Sequence[-2], self.Sequence[-1]] - update += self.Configuration.propagationRatio * self.Configuration.ThetaZero + update = (1.0 - self.Configuration.PropagationRatio) * self.PheromoneMatrix[self.Sequence[-2], self.Sequence[-1]] + update += self.Configuration.PropagationRatio * self.Configuration.ThetaZero self.PheromoneMatrix[self.Sequence[-2], self.Sequence[-1]] = max(self.Configuration.ThetaZero, update) # validate that nothing went wrong diff --git a/aman/sys/aco/Configuration.py b/aman/sys/aco/Configuration.py index 6a2080e..07d6d48 100644 --- a/aman/sys/aco/Configuration.py +++ b/aman/sys/aco/Configuration.py @@ -16,8 +16,7 @@ class Configuration: self.ExplorationRuns = kwargs.get('generations', 20) self.PheromoneEvaporationRate = 0.9 self.PseudoRandomSelectionRate = 0.9 - self.propagationRatio = 0.9 + self.PropagationRatio = 0.9 self.Epsilon = 0.1 - self.RunwayOccupasionRatio = 0.7 self.Beta = 2.0 self.ThetaZero = None \ No newline at end of file