Changeset 12356

Timestamp:

04/29/15 10:42:04 (9 years ago)

Author:

pfleck

Message:

#2027 Split update and parameterization of TerminationCriteria similar to other operators.

File:

• branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (5 diffs)

branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -356 +356 @@
       qualityTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>() { Name = "Maximum/Minimum Quality" };
       executionTimeTerminationCriterion = new ExecutionTimeTimeTerminationCriterion(this, TimeSpan.FromMinutes(5)) { Name = "Maximum Execution Time" };
+      ParameterizeTerminationCriteria();
       UpdateTerminationCriteria();
 
@@ -376 +377 @@
       ParameterizeSelectors();
       ParameterizeAnalyzers();
+      ParameterizeTerminationCriteria();
       ParameterizeIterationBasedOperators();
       UpdateCrossovers();
@@ -405 +407 @@
       UpdateMutators();
       UpdateAnalyzers();
+      UpdateTerminationCriteria();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -482 +485 @@
       }
     }
+    private void ParameterizeTerminationCriteria() {
+      if (Problem != null) {
+        bool maximization = ((BoolValue)Problem.MaximizationParameter.ActualValue).Value;
+        qualityTerminationCriterion.Name = maximization ? "Maximum Quality" : "Minimum Quality";
+        qualityTerminationCriterion.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
+        qualityTerminationCriterion.LeftSideParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
+        qualityTerminationCriterion.RightSideParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
+      }
+    }
     private void ParameterizeComparisonFactorModifiers() {
       foreach (IDiscreteDoubleValueModifier modifier in ComparisonFactorModifierParameter.ValidValues) {
@@ -541 +553 @@
     private void UpdateTerminationCriteria() {
       TerminationCriteria.Operators.Clear();
-
       if (Problem != null) {
         foreach (var terminationCriterion in Problem.Operators.OfType<ITerminationCriterion>())
           TerminationCriteria.Operators.Add(terminationCriterion);
-        bool maximization = ((BoolValue)Problem.MaximizationParameter.ActualValue).Value;
-        qualityTerminationCriterion.Name = maximization ? "Maximum Quality" : "Minimum Quality";
-        qualityTerminationCriterion.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
-        qualityTerminationCriterion.LeftSideParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
-        qualityTerminationCriterion.RightSideParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
       }
       TerminationCriteria.Operators.Add(maximumGenerationsTerminationCriterion);