Changeset 12271 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

Timestamp:

03/31/15 13:18:59 (9 years ago)

Author:

pfleck

Message:

#2269 Added AgeInheritance as own type and value for consistent configuration.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs (modified) (12 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/Alps.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -36 +35 @@
 
 namespace HeuristicLab.Algorithms.ALPS {
-  [Item("ALPS", "A base class for all ALPS-based algorithms.")]
+  [Item("ALPS", "Base class for all ALPS-based algorithms.")]
   [StorableClass]
   public abstract class Alps : HeuristicOptimizationEngineAlgorithm, IStorableContent {
@@ -76 +75 @@
       get { return (IValueParameter<IntArray>)Parameters["AgeLimits"]; }
     }
-    private IValueParameter<ReductionOperation> AgeInheritanceParameter {
-      get { return (IValueParameter<ReductionOperation>)Parameters["AgeInheritance"]; }
+    private IValueParameter<EnumValue<AgeInheritance>> AgeInheritanceParameter {
+      get { return (IValueParameter<EnumValue<AgeInheritance>>)Parameters["AgeInheritance"]; }
+    }
+    private IValueParameter<ReductionOperation> AgeInheritanceReductionParameter {
+      get { return (IValueParameter<ReductionOperation>)Parameters["AgeInheritanceReduction"]; }
     }
     private IValueParameter<IntValue> MatingPoolRangeParameter {
@@ -118 +120 @@
       set { AgeLimitsParameter.Value = value; }
     }
-    public ReductionOperation AgeInheritance {
+    public EnumValue<AgeInheritance> AgeInheritance {
       get { return AgeInheritanceParameter.Value; }
       set { AgeInheritanceParameter.Value = value; }
+    }
+    private ReductionOperation AgeInheritanceReduction {
+      get { return AgeInheritanceReductionParameter.Value; }
+      set { AgeInheritanceReductionParameter.Value = value; }
     }
     public IntValue MatingPoolRange {
@@ -168 +174 @@
       Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers", new IntValue(20)));
       Parameters.Add(new ValueParameter<IntArray>("AgeLimits", new IntArray(new int[0])) { Hidden = true });
-      Parameters.Add(new ValueParameter<ReductionOperation>("AgeInheritance", "The operator for determining the age of an offspring based the parents' age.", new ReductionOperation(ReductionOperations.Max)) { Hidden = true });
+      Parameters.Add(new ValueParameter<EnumValue<AgeInheritance>>("AgeInheritance", "The operator for determining the age of an offspring based the parents' age.", new EnumValue<AgeInheritance>(ALPS.AgeInheritance.Older)));
+      Parameters.Add(new ValueParameter<ReductionOperation>("AgeInheritanceReduction") { Hidden = true });
       Parameters.Add(new ValueParameter<IntValue>("MatingPoolRange", "The range of layers used for creating a mating pool. (1 = current + previous layer)", new IntValue(1)) { Hidden = true });
       Parameters.Add(new ValueParameter<PercentValue>("MatingPoolSelectionPercentage", "Percentage of the previous layers used for creating a mating pool.", new PercentValue(1.0, restrictToUnitInterval: true)) { Hidden = true });
@@ -175 +182 @@
       layerQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
 
-      // Create Operator Graph
-
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
+      ParameterizeAgeInheritanceReduction();
 
       ParameterizeAnalyzers();
@@ -185 +191 @@
     }
 
+
+    #region Events
     public override void Prepare() {
       if (Problem != null)
@@ -190 +198 @@
     }
 
-    #region Events
     protected override void OnProblemChanged() {
       base.OnProblemChanged();
@@ -227 +234 @@
     private void AgeGapParameter_ValueChanged(object sender, EventArgs e) {
       AgeGap.ValueChanged += AgeGap_ValueChanged;
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
     }
     private void AgeGap_ValueChanged(object sender, EventArgs e) {
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
     }
     private void AgingSchemeParameter_ValueChanged(object sender, EventArgs e) {
       AgingScheme.ValueChanged += AgingScheme_ValueChanged;
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
     }
     private void AgingScheme_ValueChanged(object sender, EventArgs e) {
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
     }
     private void NumberOfLayersParameter_ValueChanged(object sender, EventArgs e) {
       NumberOfLayers.ValueChanged += NumberOfLayers_ValueChanged;
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
     }
     private void NumberOfLayers_ValueChanged(object sender, EventArgs e) {
-      RecalculateAgeLimits();
+      ParameterizeAgeLimits();
+    }
+    private void AgeInheritanceParameter_ValueChanged(object sender, EventArgs e) {
+      AgeInheritance.ValueChanged += AgeInheritance_ValueChanged;
+      ParameterizeAgeInheritanceReduction();
+    }
+    private void AgeInheritance_ValueChanged(object sender, EventArgs e) {
+      ParameterizeAgeInheritanceReduction();
     }
     private void AnalyzerOperators_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IAnalyzer>> e) {
@@ -278 +292 @@
       NumberOfLayersParameter.ValueChanged += NumberOfLayersParameter_ValueChanged;
       NumberOfLayers.ValueChanged += NumberOfLayers_ValueChanged;
+      AgeInheritanceParameter.ValueChanged += AgeInheritanceParameter_ValueChanged;
+      AgeInheritance.ValueChanged += AgeInheritance_ValueChanged;
       Analyzer.Operators.ItemsAdded += AnalyzerOperators_ItemsAdded;
       LayerAnalyzer.Operators.ItemsAdded += LayerAnalyzerOperators_ItemsAdded;
@@ -307 +323 @@
       }
     }
+
+    private void ParameterizeAgeInheritanceReduction() {
+      AgeInheritanceReduction.Value = GetAgeInheritanceReduction(AgeInheritance.Value);
+    }
+    protected abstract ReductionOperations GetAgeInheritanceReduction(AgeInheritance ageInheritance);
+    private void ParameterizeAgeLimits() {
+      var scheme = AgingScheme.Value;
+      int ageGap = AgeGap.Value;
+      int numberOfLayers = NumberOfLayers.Value;
+      AgeLimits = scheme.CalculateAgeLimits(ageGap, numberOfLayers);
+    }
     protected virtual void ParameterizeStochasticOperator(IOperator @operator) {
       var stochasticOperator = @operator as IStochasticOperator;
@@ -338 +365 @@
     }
     #endregion
-
-    private void RecalculateAgeLimits() {
-      var scheme = AgingScheme.Value;
-      int ageGap = AgeGap.Value;
-      int numberOfLayers = NumberOfLayers.Value;
-      AgeLimits = AgingSchemeCalculator.CalculateAgeLimits(scheme, ageGap, numberOfLayers);
-    }
   }
 }