Changeset 12407

Timestamp:

05/28/15 09:47:23 (10 years ago)

Author:

pfleck

Message:

#2027
Inverted the conditions to check the continue criteria instead of termination criteria.
Conditions are then specified more naturally: "while generations < max" instead of "break if generations > min".
If any Continue-Check returns false, the algorithm will be terminated.

The naming "Terminator" has to be discussed because it suggest to specify the criteria when the algorithm should stop, instead of continue.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Termination/3.3/ComparisonTerminator.cs (modified) (3 diffs)
• HeuristicLab.Termination/3.3/ExecutionTimeTerminator.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/Terminator.cs (modified) (2 diffs)

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

@@ -351 +351 @@
       UpdateAnalyzers();
 
-      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" };
+      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.Less, new IntValue(50)) { Name = "Generations" };
+      evaluatedSolutionsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, new IntValue(int.MaxValue)) { Name = "Evaluations" };
+      selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", ComparisonType.Less, new DoubleValue(200)) { Name = "Selection Pressure" };
+      qualityTerminator = new ComparisonTerminator<DoubleValue>(new DoubleValue()) { Name = "Quality" };
       executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5))) { Name = "Execution Time" };
       ParameterizeTerminators();
@@ -508 +508 @@
         if (maximizationParameter != null) {
           bool maximization = maximizationParameter.Value.Value;
-          qualityTerminator.Comparison = maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual;
-          qualityTerminator.Threshold.Value = maximization ? double.MaxValue : double.MinValue;
+          qualityTerminator.Comparison = maximization ? ComparisonType.Less : ComparisonType.Greater;
+          qualityTerminator.Threshold.Value = maximization ? double.MinValue : double.MaxValue;
         }
       }

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminator.cs

@@ -57 +57 @@
       return new ComparisonTerminator<T>(this, cloner);
     }
-    public ComparisonTerminator(T threshold = default(T))
+    public ComparisonTerminator(T threshold)
       : base(threshold) {
       Parameters.Add(new LookupParameter<T>("ComparisonValue", "The left side value of the comparison.") { Hidden = false });
@@ -63 +63 @@
       Initialize();
     }
-    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison = default(ComparisonType), T threshold = default(T))
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, T threshold)
       : this(threshold) {
       ComparisonValueParameter.ActualName = comparisonValueActualName;
@@ -73 +73 @@
     }
 
-    protected override bool CheckTermination() {
+    protected override bool CheckContinueCriterion() {
       IComparable lhs = ComparisonValueParameter.ActualValue;
       IComparable rhs = ThresholdParameter.Value;

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTerminator.cs

@@ -51 +51 @@
     }
 
-    protected override bool CheckTermination() {
+    protected override bool CheckContinueCriterion() {
       var max = ThresholdParameter.Value.Value;
 
-      return executable.ExecutionTime > max;
+      return executable.ExecutionTime < max;
     }
 
     public override string ToString() {
       if (Threshold == null) return Name;
-      else return string.Format("{0} {1} {2}", Name, ">", ThresholdParameter.Value);
+      else return string.Format("{0} {1} {2}", Name, "<", ThresholdParameter.Value);
     }
   }

branches/TerminationCriteria/HeuristicLab.Termination/3.3/Terminator.cs

@@ -51 +51 @@
     public sealed override IOperation InstrumentedApply() {
       if (!TerminateParameter.ActualValue.Value) { // If terminate flag is already set, no need to check further termination criteria.
-        bool terminate = CheckTermination();
+        bool terminate = !CheckContinueCriterion();
         TerminateParameter.ActualValue = new BoolValue(terminate);
       }
@@ -57 +57 @@
     }
 
-    protected abstract bool CheckTermination();
+    protected abstract bool CheckContinueCriterion();
   }
 }