Преглед на файлове

remove unused variables and rename a parameter

Sven Czarnian преди 3 години
родител
ревизия
83acbdc3b5
променени са 2 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 2 2
      aman/sys/aco/Ant.py
  2. 1 2
      aman/sys/aco/Configuration.py

+ 2 - 2
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

+ 1 - 2
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