Changeset 12402 for branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

Timestamp:

05/26/15 16:15:54 (9 years ago)

Author:

pfleck

Message:

#2027 Renamed TerminationCriterion to Terminator.

File:

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

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

@@ -116 +116 @@
       get { return (IFixedValueParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
     }
-    private IValueParameter<MultiTerminationCriterion> TerminationCriteriaParameter {
-      get { return (IValueParameter<MultiTerminationCriterion>)Parameters["TerminationCriteria"]; }
+    private IValueParameter<MultiTerminator> TerminatorsParameter {
+      get { return (IValueParameter<MultiTerminator>)Parameters["Terminators"]; }
     }
     #endregion
@@ -203 +203 @@
       set { FillPopulationWithParentsParameter.Value.Value = value; }
     }
-    private MultiTerminationCriterion TerminationCriteria {
-      get { return TerminationCriteriaParameter.Value; }
+    private MultiTerminator Terminators {
+      get { return TerminatorsParameter.Value; }
     }
     private RandomCreator RandomCreator {
@@ -222 +222 @@
     private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer;
     [Storable]
-    private ComparisonTerminationCriterion<IntValue> maximumGenerationsTerminationCriterion;
-    [Storable]
-    private ComparisonTerminationCriterion<IntValue> maximumEvaluatedSolutionsTerminationCriterion;
-    [Storable]
-    private ComparisonTerminationCriterion<DoubleValue> maximumSelectionPressureTerminationCriterion;
-    [Storable]
-    private ComparisonTerminationCriterion<DoubleValue> qualityTerminationCriterion;
-    [Storable]
-    private ExecutionTimeTerminationCriterion executionTimeTerminationCriterion;
+    private ComparisonTerminator<IntValue> generationsTerminator;
+    [Storable]
+    private ComparisonTerminator<IntValue> evaluatedSolutionsTerminator;
+    [Storable]
+    private ComparisonTerminator<DoubleValue> selectionPressureTerminator;
+    [Storable]
+    private ComparisonTerminator<DoubleValue> qualityTerminator;
+    [Storable]
+    private ExecutionTimeTerminator executionTimeTerminator;
     #endregion
 
@@ -255 +255 @@
       selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer);
       successfulOffspringAnalyzer = cloner.Clone(original.successfulOffspringAnalyzer);
-      maximumGenerationsTerminationCriterion = cloner.Clone(original.maximumGenerationsTerminationCriterion);
-      maximumEvaluatedSolutionsTerminationCriterion = cloner.Clone(original.maximumEvaluatedSolutionsTerminationCriterion);
-      maximumSelectionPressureTerminationCriterion = cloner.Clone(original.maximumSelectionPressureTerminationCriterion);
-      qualityTerminationCriterion = cloner.Clone(original.qualityTerminationCriterion);
-      executionTimeTerminationCriterion = cloner.Clone(original.executionTimeTerminationCriterion);
+      generationsTerminator = cloner.Clone(original.generationsTerminator);
+      evaluatedSolutionsTerminator = cloner.Clone(original.evaluatedSolutionsTerminator);
+      selectionPressureTerminator = cloner.Clone(original.selectionPressureTerminator);
+      qualityTerminator = cloner.Clone(original.qualityTerminator);
+      executionTimeTerminator = cloner.Clone(original.executionTimeTerminator);
       Initialize();
     }
@@ -287 +287 @@
       Parameters.Add(new ValueParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately).", new IntValue(int.MaxValue)));
       Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded.", new BoolValue(false)) { Hidden = true });
-      Parameters.Add(new ValueParameter<MultiTerminationCriterion>("TerminationCriteria", "The termination criteria which sould be checked.", new MultiTerminationCriterion()));
+      Parameters.Add(new ValueParameter<MultiTerminator>("Terminators", "The termination criteria which sould be checked.", new MultiTerminator()));
 
       RandomCreator randomCreator = new RandomCreator();
@@ -351 +351 @@
       UpdateAnalyzers();
 
-      maximumGenerationsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("Generations", new IntValue(50), ComparisonType.GreaterOrEqual) { Name = "Maximum Generations" };
-      maximumEvaluatedSolutionsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("EvaluatedSolutions", "MaximumEvaluatedSolutions", ComparisonType.GreaterOrEqual) { Name = "Maximum Evaluations" };
-      maximumSelectionPressureTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>("SelectionPressure", "MaximumSelectionPressure", ComparisonType.GreaterOrEqual) { Name = "Maximum Selection Pressure" };
-      qualityTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>() { Name = "Maximum/Minimum Quality" };
-      executionTimeTerminationCriterion = new ExecutionTimeTerminationCriterion(this, TimeSpan.FromMinutes(5)) { Name = "Maximum Execution Time" };
-      ParameterizeTerminationCriteria();
-      UpdateTerminationCriteria();
+      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", new IntValue(50), ComparisonType.GreaterOrEqual) { Name = "Generations" };
+      evaluatedSolutionsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", "MaximumEvaluatedSolutions", ComparisonType.GreaterOrEqual) { Name = "Evaluations" };
+      selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", "MaximumSelectionPressure", ComparisonType.GreaterOrEqual) { Name = "Selection Pressure" };
+      qualityTerminator = new ComparisonTerminator<DoubleValue>() { Name = "Quality" };
+      executionTimeTerminator = new ExecutionTimeTerminator(this, TimeSpan.FromMinutes(5)) { Name = "Execution Time" };
+      ParameterizeTerminators();
+      UpdateTerminators();
 
       Initialize();
@@ -377 +377 @@
       ParameterizeSelectors();
       ParameterizeAnalyzers();
-      ParameterizeTerminationCriteria();
+      ParameterizeTerminators();
       ParameterizeIterationBasedOperators();
       UpdateCrossovers();
       UpdateMutators();
       UpdateAnalyzers();
-      UpdateTerminationCriteria();
+      UpdateTerminators();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -407 +407 @@
       UpdateMutators();
       UpdateAnalyzers();
-      UpdateTerminationCriteria();
+      UpdateTerminators();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -485 +485 @@
       }
     }
-    private void ParameterizeTerminationCriteria() {
+    private void ParameterizeTerminators() {
       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.ValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
-        qualityTerminationCriterion.ThresholdParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
+        qualityTerminator.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
+        qualityTerminator.ValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
+        qualityTerminator.ThresholdParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
       }
     }
@@ -551 +550 @@
       Analyzer.Operators.Add(successfulOffspringAnalyzer, successfulOffspringAnalyzer.EnabledByDefault);
     }
-    private void UpdateTerminationCriteria() {
-      TerminationCriteria.Operators.Clear();
-      if (Problem != null) {
-        foreach (var terminationCriterion in Problem.Operators.OfType<ITerminationCriterion>())
-          TerminationCriteria.Operators.Add(terminationCriterion);
-      }
-      TerminationCriteria.Operators.Add(maximumGenerationsTerminationCriterion);
-      TerminationCriteria.Operators.Add(maximumEvaluatedSolutionsTerminationCriterion);
-      TerminationCriteria.Operators.Add(maximumSelectionPressureTerminationCriterion);
-      TerminationCriteria.Operators.Add(qualityTerminationCriterion, checkedState: false);
-      TerminationCriteria.Operators.Add(executionTimeTerminationCriterion, checkedState: false);
+    private void UpdateTerminators() {
+      Terminators.Operators.Clear();
+      if (Problem != null) {
+        foreach (var terminator in Problem.Operators.OfType<ITerminator>())
+          Terminators.Operators.Add(terminator);
+      }
+      Terminators.Operators.Add(generationsTerminator);
+      Terminators.Operators.Add(evaluatedSolutionsTerminator);
+      Terminators.Operators.Add(selectionPressureTerminator);
+      Terminators.Operators.Add(qualityTerminator, checkedState: false);
+      Terminators.Operators.Add(executionTimeTerminator, checkedState: false);
     }
     private OffspringSelectionGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {