Changeset 12548

Timestamp:

06/30/15 12:40:20 (9 years ago)

Author:

pfleck

Message:

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

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• Alps.cs (modified) (6 diffs)
• AlpsGeneticAlgorithm.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

@@ -162 +162 @@
     #region Preconfigured Terminators
     [Storable]
-    private ComparisonTerminator<IntValue> evaluationsTerminator;
+    protected ComparisonTerminator<IntValue> evaluationsTerminator;
     [Storable]
-    private SingleObjectiveQualityTerminator qualityTerminator;
+    protected SingleObjectiveQualityTerminator qualityTerminator;
     [Storable]
-    private ExecutionTimeTerminator executionTimeTerminator;
+    protected ExecutionTimeTerminator executionTimeTerminator;
     #endregion
 
@@ -201 +201 @@
       layerQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
 
+      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, new IntValue(int.MaxValue)) { Name = "Evaluations" };
+      qualityTerminator = new SingleObjectiveQualityTerminator() { Name = "Quality" };
+      executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5)));
+
       ParameterizeAgeLimits();
       ParameterizeAgeInheritanceReduction();
@@ -207 +211 @@
       UpdateAnalyzers();
 
-      CreateTerminators();
       ParameterizeTerminators();
-      UpdateTerminators();
 
       Initialize();
@@ -231 +233 @@
       ParameterizeTerminators();
       UpdateAnalyzers();
-      UpdateTerminators();
       Problem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
     }
@@ -262 +263 @@
         ParameterizeStochasticOperator(@operator);
       UpdateAnalyzers();
-      UpdateTerminators();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -410 +410 @@
       }
     }
-    protected virtual void UpdateTerminators() {
-      var newTerminators = new Dictionary<ITerminator, bool> {
-        {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)}
-      };
-      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.Add(newTerminator.Key, newTerminator.Value);
-    }
-    protected virtual void CreateTerminators() {
-      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, new IntValue(int.MaxValue)) { Name = "Evaluations" };
-      qualityTerminator = new SingleObjectiveQualityTerminator() { Name = "Quality" };
-      executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5)));
-    }
     #endregion
   }

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

@@ -200 +200 @@
       }
 
+      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.Less, new IntValue(1000)) { Name = "Generations" };
+
       ParameterizeSelectors();
+
+      UpdateTerminators();
+
       Initialize();
     }
@@ -213 +218 @@
       UpdateCrossovers();
       UpdateMutators();
+      UpdateTerminators();
     }
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
@@ -229 +235 @@
       UpdateCrossovers();
       UpdateMutators();
+      UpdateTerminators();
     }
     protected override void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -291 +298 @@
 
     #region Updates
-    protected override void UpdateTerminators() {
+    private void UpdateTerminators() {
       var newTerminators = new Dictionary<ITerminator, bool> {
         {generationsTerminator, !Terminators.Operators.Contains(generationsTerminator) || Terminators.Operators.ItemChecked(generationsTerminator)},
+        {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() {
-      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.Less, new IntValue(1000)) { Name = "Generations" };
-      base.CreateTerminators();
+        Terminators.Operators.Add(newTerminator.Key, newTerminator.Value);
     }
     private void UpdateCrossovers() {