Changeset 12410

Timestamp:

06/01/15 14:21:02 (9 years ago)

Author:

pfleck

Message:

#2027

• Added IThresholdTerminator interface for more flexibility. The ThresholdTerminatorView now uses the interface instead of a concrete terminator.
• Added MaximumIterationsTerminator and SingleObjectiveQualityTerminator as common used Terminators.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (10 diffs)
• HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Termination/3.3/IThresholdTerminator.cs (added)
• HeuristicLab.Termination/3.3/MaximumIterationsTerminator.cs (added)
• HeuristicLab.Termination/3.3/SingleObjectiveQualityTerminator.cs (added)
• HeuristicLab.Termination/3.3/TerminationOperator.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/ThresholdTerminator.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs (modified) (3 diffs)

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

@@ -83 +83 @@
       get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     }
-    private ValueParameter<IntValue> MaximumGenerationsParameter {
-      get { return (ValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
+    private IFixedValueParameter<IntValue> MaximumGenerationsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
     }
     private ValueLookupParameter<DoubleValue> SuccessRatioParameter {
@@ -158 +158 @@
       set { ReevaluateElitesParameter.Value.Value = value; }
     }
-    public IntValue MaximumGenerations {
-      get { return MaximumGenerationsParameter.Value; }
-      set { MaximumGenerationsParameter.Value = value; }
+    public int MaximumGenerations {
+      get { return MaximumGenerationsParameter.Value.Value; }
+      set { MaximumGenerationsParameter.Value.Value = value; }
     }
     public DoubleValue SuccessRatio {
@@ -194 +194 @@
       set { AnalyzerParameter.Value = value; }
     }
-
     public IntValue MaximumEvaluatedSolutions {
       get { return MaximumEvaluatedSolutionsParameter.Value; }
@@ -222 +221 @@
     private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer;
     [Storable]
-    private ComparisonTerminator<IntValue> generationsTerminator;
+    private MaximumIterationsTerminator generationsTerminator;
     [Storable]
     private ComparisonTerminator<IntValue> evaluatedSolutionsTerminator;
@@ -228 +227 @@
     private ComparisonTerminator<DoubleValue> selectionPressureTerminator;
     [Storable]
-    private ComparisonTerminator<DoubleValue> qualityTerminator;
+    private SingleObjectiveQualityTerminator qualityTerminator;
     [Storable]
     private ExecutionTimeTerminator executionTimeTerminator;
@@ -276 +275 @@
       Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
       Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
-      Parameters.Add(new ValueParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntValue(1000)));
+      Parameters.Add(new FixedValueParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntValue(1000)));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved.", new DoubleValue(1)));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start).", new DoubleValue(0)));
@@ -339 +338 @@
       ParameterizeSelectors();
 
+      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      selectionPressureAnalyzer = new ValueAnalyzer();
+      successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
+      generationsTerminator = new MaximumIterationsTerminator();
+      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 SingleObjectiveQualityTerminator();
+      executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5))) { Name = "Execution Time" };
+      ParameterizeTerminators();
+      UpdateTerminators();
+
       foreach (IDiscreteDoubleValueModifier modifier in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
         ComparisonFactorModifierParameter.ValidValues.Add(modifier);
@@ -344 +357 @@
       if (linearModifier != null) ComparisonFactorModifierParameter.Value = linearModifier;
       ParameterizeComparisonFactorModifiers();
-
-      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      selectionPressureAnalyzer = new ValueAnalyzer();
-      successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer();
-      ParameterizeAnalyzers();
-      UpdateAnalyzers();
-
-      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();
-      UpdateTerminators();
 
       Initialize();
@@ -504 +503 @@
     }
     private void ParameterizeTerminators() {
-      qualityTerminator.ComparisonValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
-      if (Problem != null) {
-        var maximizationParameter = (IValueParameter<BoolValue>)Problem.MaximizationParameter;
-        if (maximizationParameter != null) {
-          bool maximization = maximizationParameter.Value.Value;
-          qualityTerminator.Comparison = maximization ? ComparisonType.Less : ComparisonType.Greater;
-          qualityTerminator.Threshold.Value = maximization ? double.MaxValue : double.MinValue;
-        }
-      }
+      generationsTerminator.IterationsParameter.ActualName = "Generations";
+      generationsTerminator.MaximumIterationsParameter = MaximumGenerationsParameter;
+
+      qualityTerminator.Parameterize(qualityAnalyzer.CurrentBestQualityParameter, Problem);
     }
     private void ParameterizeComparisonFactorModifiers() {
@@ -572 +566 @@
     }
     private void UpdateTerminators() {
+      // ToDo restore checked state
       Terminators.Operators.Clear();
       if (Problem != null) {

branches/TerminationCriteria/HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj

@@ -73 +73 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -141 +145 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IThresholdTerminator.cs" />
+    <Compile Include="MaximumIterationsTerminator.cs" />
+    <Compile Include="SingleObjectiveQualityTerminator.cs" />
     <Compile Include="ThresholdTerminator.cs" />
     <Compile Include="Views\ThresholdTerminatorView.cs">

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

@@ -82 +82 @@
     public override IOperation InstrumentedApply() {
       var next = new OperationCollection(base.InstrumentedApply());
-      if (TerminateParameter.ActualValue != null && TerminateParameter.ActualValue.Value) {
+      if (TerminateParameter.ActualValue.Value) {
         if (TerminateBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TerminateBranch));
       } else {

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

@@ -31 +31 @@
   [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
   [StorableClass]
-  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem, IStringConvertibleValue, new() {
+  public abstract class ThresholdTerminator<T> : Terminator, IThresholdTerminator where T : class, IItem, IStringConvertibleValue, new() {
     public IFixedValueParameter<T> ThresholdParameter {
       get { return (IFixedValueParameter<T>)Parameters["Threshold"]; }
+    }
+    IParameter IThresholdTerminator.ThresholdParameter {
+      get { return ThresholdParameter; }
     }
 

branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Termination.Views {
-  partial class ThresholdTerminatorView<T> where T : class, IItem, IComparable, IStringConvertibleValue, new() {
+  partial class ThresholdTerminatorView {
     /// <summary> 
     /// Required designer variable.

branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 
@@ -29 +26 @@
 
   [View("ThresholdTerminator View")]
-  [Content(typeof(ThresholdTerminator<>), true)]
-  public partial class ThresholdTerminatorView<T> : ItemView where T : class, IItem, IComparable, IStringConvertibleValue, new() {
+  [Content(typeof(IThresholdTerminator), true)]
+  public partial class ThresholdTerminatorView : ItemView {
 
-    public new ThresholdTerminator<T> Content {
-      get { return (ThresholdTerminator<T>)base.Content; }
+    public new IThresholdTerminator Content {
+      get { return (IThresholdTerminator)base.Content; }
       set { base.Content = value; }
     }
@@ -45 +42 @@
       viewHost.Content = null;
       if (Content != null) {
-        if (Content.ThresholdParameter.Value != null)
-          viewHost.Content = Content.ThresholdParameter.Value;
+        if (Content.ThresholdParameter.ActualValue != null)
+          viewHost.Content = Content.ThresholdParameter.ActualValue;
         else
           viewHost.Content = Content.ThresholdParameter;