Changeset 12405 for branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm

Timestamp:

05/27/15 14:30:56 (10 years ago)

Author:

pfleck

Message:

#2027

• Uses FixedValueParameters and added some properties.
• Added the comparison-symbol in the string-representation of Terminators.
• Renamed Terminator parameter to Termination to use a more neutral term.
• Used Red-Flag as Termination-Icon.

File:

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

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

@@ -116 +116 @@
       get { return (IFixedValueParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
     }
-    private IValueParameter<MultiTerminator> TerminatorsParameter {
-      get { return (IValueParameter<MultiTerminator>)Parameters["Terminator"]; }
+    private IValueParameter<MultiTerminator> TerminationParameter {
+      get { return (IValueParameter<MultiTerminator>)Parameters["Termination"]; }
     }
     #endregion
@@ -204 +204 @@
     }
     private MultiTerminator Terminators {
-      get { return TerminatorsParameter.Value; }
+      get { return TerminationParameter.Value; }
     }
     private RandomCreator RandomCreator {
@@ -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<MultiTerminator>("Terminator", "The termination criteria which sould be checked.", new MultiTerminator()));
+      Parameters.Add(new ValueParameter<MultiTerminator>("Termination", "The termination criteria which sould be checked.", new MultiTerminator()));
 
       RandomCreator randomCreator = new RandomCreator();
@@ -351 +351 @@
       UpdateAnalyzers();
 
-      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" };
+      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.GreaterOrEqual, new IntValue(50)) { Name = "Generations" };
+      evaluatedSolutionsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.GreaterOrEqual, new IntValue(int.MaxValue)) { Name = "Evaluations" };
+      selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", ComparisonType.GreaterOrEqual, new DoubleValue(200)) { Name = "Selection Pressure" };
+      qualityTerminator = new ComparisonTerminator<DoubleValue>(threshold: new DoubleValue()) { Name = "Quality" };
+      executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5))) { Name = "Execution Time" };
       ParameterizeTerminators();
       UpdateTerminators();
@@ -508 +508 @@
         if (maximizationParameter != null) {
           bool maximization = maximizationParameter.Value.Value;
-          qualityTerminator.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
-          qualityTerminator.ThresholdParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
+          qualityTerminator.Comparison = maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual;
+          qualityTerminator.Threshold.Value = maximization ? double.MaxValue : double.MinValue;
         }
       }
-      qualityTerminator.ValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
+      qualityTerminator.ComparisonValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
     }
     private void ParameterizeComparisonFactorModifiers() {