Changeset 12549 for branches/ALPS

Timestamp:

06/30/15 12:41:43 (9 years ago)

Author:

pfleck

Message:

#2350 Moved updating of terminators to concrete ALPS implementation instead of abstract base class.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -209 +209 @@
       }
 
+      iterationsTerminator = new ComparisonTerminator<IntValue>("Iterations", ComparisonType.Less, new IntValue(1000)) { Name = "Iterations" };
+
       ParameterizeSelectors();
+      UpdateTerminators();
+
       Initialize();
     }
@@ -222 +226 @@
       UpdateCrossovers();
       UpdateMutators();
+      UpdateTerminators();
     }
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
@@ -238 +243 @@
       UpdateCrossovers();
       UpdateMutators();
+      UpdateTerminators();
     }
     protected override void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -308 +314 @@
 
     #region Updates
-    protected override void UpdateTerminators() {
+
+    private void UpdateTerminators() {
       var newTerminators = new Dictionary<ITerminator, bool> {
         {iterationsTerminator, !Terminators.Operators.Contains(iterationsTerminator) || Terminators.Operators.ItemChecked(iterationsTerminator)},
+        {evaluationsTerminator, Terminators.Operators.Contains(evaluationsTerminator) && Terminators.Operators.ItemChecked(evaluationsTerminator)},
+        {qualityTerminator, Terminators.Operators.Contains(qualityTerminator) && Terminators.Operators.ItemChecked(qualityTerminator) },
+        {executionTimeTerminator, Terminators.Operators.Contains(executionTimeTerminator) && Terminators.Operators.ItemChecked(executionTimeTerminator)}
       };
-
-      base.UpdateTerminators();
+      if (Problem != null) {
+        foreach (var terminator in Problem.Operators.OfType<ITerminator>())
+          newTerminators.Add(terminator, !Terminators.Operators.Contains(terminator) || Terminators.Operators.ItemChecked(terminator));
+      }
+
+      Terminators.Operators.Clear();
 
       foreach (var newTerminator in newTerminators)
-        Terminators.Operators.Insert(0, newTerminator.Key, newTerminator.Value);
-    }
-    protected override void CreateTerminators() {
-      iterationsTerminator = new ComparisonTerminator<IntValue>("Iterations", ComparisonType.Less, new IntValue(1000)) { Name = "Iterations" };
-      base.CreateTerminators();
+        Terminators.Operators.Add(newTerminator.Key, newTerminator.Value);
     }
     private void UpdateCrossovers() {