Changeset 12411 for branches

Timestamp:

06/01/15 16:47:32 (9 years ago)

Author:

pfleck

Message:

#2027

• Removed MaximumIterationsTerminator and MaximumEvaluatedSolutionsTermimator because they practically do the same.
• Add the possibility for ThresholdTerminators to use a foreign parameter (e.g. MaximumSelectionPressure). This way the terminator can use parameters which are still relevant for the algorithm and still provide consistent management of the terminators.
• Renamed IThresholdTerminator to ISingleValueTerminator.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (10 diffs)
• HeuristicLab.Termination/3.3/ComparisonTerminator.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj (modified) (1 diff)
• HeuristicLab.Termination/3.3/ISingleValueTerminator.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/IThresholdTerminator.cs) (1 diff)
• HeuristicLab.Termination/3.3/MaximumIterationsTerminator.cs (deleted)
• HeuristicLab.Termination/3.3/SingleObjectiveQualityTerminator.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/ThresholdTerminator.cs (modified) (4 diffs)
• HeuristicLab.Termination/3.3/Views/SingleValueTerminatorView.Designer.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs) (1 diff)
• HeuristicLab.Termination/3.3/Views/SingleValueTerminatorView.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs) (1 diff)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -110 +111 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-    private ValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
-      get { return (ValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
+    private IFixedValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
     }
     private IFixedValueParameter<BoolValue> FillPopulationWithParentsParameter {
@@ -194 +195 @@
       set { AnalyzerParameter.Value = value; }
     }
-    public IntValue MaximumEvaluatedSolutions {
-      get { return MaximumEvaluatedSolutionsParameter.Value; }
-      set { MaximumEvaluatedSolutionsParameter.Value = value; }
+    public int MaximumEvaluatedSolutions {
+      get { return MaximumEvaluatedSolutionsParameter.Value.Value; }
+      set { MaximumEvaluatedSolutionsParameter.Value.Value = value; }
     }
     public bool FillPopulationWithParents {
@@ -221 +222 @@
     private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer;
     [Storable]
-    private MaximumIterationsTerminator generationsTerminator;
-    [Storable]
-    private ComparisonTerminator<IntValue> evaluatedSolutionsTerminator;
+    private ComparisonTerminator<IntValue> generationsTerminator;
+    [Storable]
+    private ComparisonTerminator<IntValue> evaluationsTerminator;
     [Storable]
     private ComparisonTerminator<DoubleValue> selectionPressureTerminator;
@@ -255 +256 @@
       successfulOffspringAnalyzer = cloner.Clone(original.successfulOffspringAnalyzer);
       generationsTerminator = cloner.Clone(original.generationsTerminator);
-      evaluatedSolutionsTerminator = cloner.Clone(original.evaluatedSolutionsTerminator);
+      evaluationsTerminator = cloner.Clone(original.evaluationsTerminator);
       selectionPressureTerminator = cloner.Clone(original.selectionPressureTerminator);
       qualityTerminator = cloner.Clone(original.qualityTerminator);
@@ -284 +285 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("SelectedParents", "How much parents should be selected each time the offspring selection step is performed until the population is filled. This parameter should be about the same or twice the size of PopulationSize for smaller problems, and less for large problems.", new IntValue(200)));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
-      Parameters.Add(new ValueParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately).", new IntValue(int.MaxValue)));
+      Parameters.Add(new FixedValueParameter<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>("Termination", "The termination criteria which sould be checked.", new MultiTerminator()));
@@ -344 +345 @@
       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);
@@ -357 +350 @@
       if (linearModifier != null) ComparisonFactorModifierParameter.Value = linearModifier;
       ParameterizeComparisonFactorModifiers();
+
+      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", ComparisonType.Less, MaximumGenerationsParameter) { Name = "Generations" };
+      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, MaximumEvaluatedSolutionsParameter) { Name = "Evaluations" };
+      selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", ComparisonType.Less, MaximumSelectionPressure) { Name = "Selection Pressure" };
+      qualityTerminator = new SingleObjectiveQualityTerminator() { Name = "Quality" };
+      executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5)));
+      ParameterizeTerminators();
+      UpdateTerminators();
 
       Initialize();
@@ -503 +504 @@
     }
     private void ParameterizeTerminators() {
-      generationsTerminator.IterationsParameter.ActualName = "Generations";
-      generationsTerminator.MaximumIterationsParameter = MaximumGenerationsParameter;
-
       qualityTerminator.Parameterize(qualityAnalyzer.CurrentBestQualityParameter, Problem);
     }
@@ -566 +564 @@
     }
     private void UpdateTerminators() {
-      // ToDo restore checked state
-      Terminators.Operators.Clear();
+      var newTerminators = new Dictionary<ITerminator, bool> {
+        {generationsTerminator, !Terminators.Operators.Contains(generationsTerminator) || Terminators.Operators.ItemChecked(generationsTerminator)},
+        {selectionPressureTerminator, !Terminators.Operators.Contains(selectionPressureTerminator) || Terminators.Operators.ItemChecked(selectionPressureTerminator) },
+        {evaluationsTerminator, Terminators.Operators.Contains(evaluationsTerminator) && Terminators.Operators.ItemChecked(evaluationsTerminator)},
+        {qualityTerminator, Terminators.Operators.Contains(qualityTerminator) && Terminators.Operators.ItemChecked(qualityTerminator) },
+        {executionTimeTerminator, Terminators.Operators.Contains(executionTimeTerminator) && Terminators.Operators.ItemChecked(executionTimeTerminator)}
+      };
       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);
+          newTerminators.Add(terminator, !Terminators.Operators.Contains(terminator) || Terminators.Operators.ItemChecked(terminator));
+      }
+
+      Terminators.Operators.Clear();
+      foreach (var newTerminator in newTerminators)
+        Terminators.Operators.Add(newTerminator.Key, newTerminator.Value);
     }
     private OffspringSelectionGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {

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

@@ -71 +71 @@
       Comparison = comparison;
     }
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, IFixedValueParameter<T> thresholdParameter)
+      : this() {
+      ComparisonValueParameter.ActualName = comparisonValueActualName;
+      Comparison = comparison;
+      ThresholdParameter = thresholdParameter;
+    }
 
     private void Initialize() {

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

@@ -145 +145 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IThresholdTerminator.cs" />
-    <Compile Include="MaximumIterationsTerminator.cs" />
+    <Compile Include="ISingleValueTerminator.cs" />
     <Compile Include="SingleObjectiveQualityTerminator.cs" />
     <Compile Include="ThresholdTerminator.cs" />
-    <Compile Include="Views\ThresholdTerminatorView.cs">
+    <Compile Include="Views\SingleValueTerminatorView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Views\ThresholdTerminatorView.Designer.cs">
-      <DependentUpon>ThresholdTerminatorView.cs</DependentUpon>
+    <Compile Include="Views\SingleValueTerminatorView.Designer.cs">
+      <DependentUpon>SingleValueTerminatorView.cs</DependentUpon>
     </Compile>
     <Compile Include="ITerminator.cs" />

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Termination {
-  public interface IThresholdTerminator : ITerminator {
+  public interface ISingleValueTerminator : ITerminator {
     IParameter ThresholdParameter { get; }
   }

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

@@ -27 +27 @@
   [Item("SingleObjectiveQualityTerminator", "")]
   public class SingleObjectiveQualityTerminator : ComparisonTerminator<DoubleValue> {
-    public SingleObjectiveQualityTerminator() {
-      Name = "Quality";
-    }
+    public SingleObjectiveQualityTerminator() { }
 
     public void Parameterize(IParameter qualityParameter, ISingleObjectiveHeuristicOptimizationProblem problem) {

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

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-
 namespace HeuristicLab.Termination {
   [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
   [StorableClass]
-  public abstract class ThresholdTerminator<T> : Terminator, IThresholdTerminator where T : class, IItem, IStringConvertibleValue, new() {
+  public abstract class ThresholdTerminator<T> : Terminator, ISingleValueTerminator where T : class, IItem, IStringConvertibleValue, new() {
+    [Storable]
+    private IFixedValueParameter<T> thresholdParameter;
     public IFixedValueParameter<T> ThresholdParameter {
-      get { return (IFixedValueParameter<T>)Parameters["Threshold"]; }
+      get { return thresholdParameter; }
+      set {
+        if (value == null) throw new ArgumentNullException("Threshold parameter must not be null.");
+        if (value.Value == null) throw new ArgumentNullException("Threshold parameter value must not be null.");
+        if (thresholdParameter == value) return;
+
+        if (thresholdParameter != null) Parameters.Remove(thresholdParameter);
+        thresholdParameter = value;
+        Parameters.Add(thresholdParameter);
+        OnThresholdParameterChanged();
+      }
     }
-    IParameter IThresholdTerminator.ThresholdParameter {
+    IParameter ISingleValueTerminator.ThresholdParameter {
       get { return ThresholdParameter; }
     }
@@ -51 +62 @@
     protected ThresholdTerminator(ThresholdTerminator<T> original, Cloner cloner)
       : base(original, cloner) {
+      thresholdParameter = cloner.Clone(original.thresholdParameter);
       Initialize();
     }
@@ -58 +70 @@
       : base() {
       if (threshold == null) throw new ArgumentNullException("threshold");
-      Parameters.Add(new FixedValueParameter<T>("Threshold", "The limit of the termiation criterion.", threshold));
+      thresholdParameter = new FixedValueParameter<T>("Threshold", "The limit of the termiation criterion.", threshold);
+      Parameters.Add(thresholdParameter);
       Initialize();
     }
 
     private void Initialize() {
-      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
+      RegisterThresholdParameterEvents();
     }
 
@@ -73 +86 @@
     }
 
+    private void OnThresholdParameterChanged() {
+      RegisterThresholdParameterEvents();
+    }
+
+    private void RegisterThresholdParameterEvents() {
+      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
+    }
+
     public override string ToString() {
       if (ThresholdParameter.Value == null) return Name;

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Termination.Views {
-  partial class ThresholdTerminatorView {
+  partial class SingleValueTerminatorView {
     /// <summary> 
     /// Required designer variable.

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

@@ -26 +26 @@
 
   [View("ThresholdTerminator View")]
-  [Content(typeof(IThresholdTerminator), true)]
-  public partial class ThresholdTerminatorView : ItemView {
+  [Content(typeof(ISingleValueTerminator), true)]
+  public partial class SingleValueTerminatorView : ItemView {
 
-    public new IThresholdTerminator Content {
-      get { return (IThresholdTerminator)base.Content; }
+    public new ISingleValueTerminator Content {
+      get { return (ISingleValueTerminator)base.Content; }
       set { base.Content = value; }
     }
 
-    public ThresholdTerminatorView() {
+    public SingleValueTerminatorView() {
       InitializeComponent();
     }