Changeset 12997 for branches

Timestamp:

10/09/15 16:54:53 (9 years ago)

Author:

pfleck

Message:

#2269

• Removed AgeInheritance enum and used a double [0-1] instead.
• Added a WeightingReducer that uses the new double-weight for weighting between the lower and higher value.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AgeInheritance.cs (deleted)
• AlpsGeneticAlgorithm.cs (modified) (9 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• WeightingReducer.cs (added)

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

@@ -104 +104 @@
       get { return (IValueParameter<IntValue>)Parameters["AgeGap"]; }
     }
-    private IValueParameter<EnumValue<AgeInheritance>> AgeInheritanceParameter {
-      get { return (IValueParameter<EnumValue<AgeInheritance>>)Parameters["AgeInheritance"]; }
-    }
-    private IValueParameter<ReductionOperation> AgeInheritanceReductionParameter {
-      get { return (IValueParameter<ReductionOperation>)Parameters["AgeInheritanceReduction"]; }
+    private IValueParameter<DoubleValue> AgeInheritanceParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["AgeInheritance"]; }
     }
     private IValueParameter<IntArray> AgeLimitsParameter {
@@ -189 +186 @@
       set { AgeGapParameter.Value = value; }
     }
-    public EnumValue<AgeInheritance> AgeInheritance {
+    public DoubleValue AgeInheritance {
       get { return AgeInheritanceParameter.Value; }
       set { AgeInheritanceParameter.Value = value; }
-    }
-    private ReductionOperation AgeInheritanceReduction {
-      get { return AgeInheritanceReductionParameter.Value; }
-      set { AgeInheritanceReductionParameter.Value = value; }
     }
     public IntArray AgeLimits {
@@ -306 +299 @@
       Parameters.Add(new ValueParameter<EnumValue<AgingScheme>>("AgingScheme", "The aging scheme for setting the age-limits for the layers.", new EnumValue<AgingScheme>(ALPS.AgingScheme.Polynomial)));
       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<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<DoubleValue>("AgeInheritance", "A weight that determines the age of a child after crossover based on the older (1.0) and younger (0.0) parent.", new DoubleValue(1.0)) { Hidden = true });
       Parameters.Add(new ValueParameter<IntArray>("AgeLimits", new IntArray(new int[0])) { Hidden = true });
 
@@ -404 +396 @@
 
       #region Parameterize
+      UpdateAnalyzers();
       ParameterizeAnalyzers();
-      UpdateAnalyzers();
 
       ParameterizeSelectors();
@@ -412 +404 @@
 
       ParameterizeAgeLimits();
-      ParameterizeAgeInheritanceReduction();
       #endregion
 
@@ -518 +509 @@
     private void NumberOfLayers_ValueChanged(object sender, EventArgs e) {
       ParameterizeAgeLimits();
-    }
-    private void AgeInheritanceParameter_ValueChanged(object sender, EventArgs e) {
-      AgeInheritance.ValueChanged += AgeInheritance_ValueChanged;
-      ParameterizeAgeInheritanceReduction();
-    }
-    private void AgeInheritance_ValueChanged(object sender, EventArgs e) {
-      ParameterizeAgeInheritanceReduction();
     }
 
@@ -564 +548 @@
       AgingSchemeParameter.ValueChanged += AgingSchemeParameter_ValueChanged;
       AgingScheme.ValueChanged += AgingScheme_ValueChanged;
-      AgeInheritanceParameter.ValueChanged += AgeInheritanceParameter_ValueChanged;
-      AgeInheritance.ValueChanged += AgeInheritance_ValueChanged;
 
       qualityAnalyzer.CurrentBestQualityParameter.NameChanged += new EventHandler(QualityAnalyzer_CurrentBestQualityParameter_NameChanged);
@@ -635 +617 @@
       }
     }
-    private void ParameterizeAgeInheritanceReduction() {
-      AgeInheritanceReduction.Value = GetAgeInheritanceReduction(AgeInheritance.Value);
-    }
     private void ParameterizeAgeLimits() {
       var scheme = AgingScheme.Value;
@@ -661 +640 @@
     }
 
-    private ReductionOperations GetAgeInheritanceReduction(AgeInheritance ageInheritance) {
-      switch (ageInheritance) {
-        case ALPS.AgeInheritance.Older: return ReductionOperations.Max;
-        case ALPS.AgeInheritance.Agerage: return ReductionOperations.Avg;
-        case ALPS.AgeInheritance.Younger: return ReductionOperations.Min;
-        default: throw new NotSupportedException("AgeInheritance " + ageInheritance + " is not supported.");
-      }
-    }
     #endregion
 

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

@@ -75 +75 @@
     public AlpsGeneticAlgorithmMainLoop()
       : base() {
-      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false.") { Hidden = true });
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new LookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations that the algorithm should process."));
@@ -232 +232 @@
       // Insert AgeCalculator between crossover and its successor
       var crossoverSuccessor = crossover.Successor;
-      var ageCalculator = new DataReducer() { Name = "Calculate Age" };
+      var ageCalculator = new WeightingReducer() { Name = "Calculate Age" };
       crossover.Successor = ageCalculator;
 
       ageCalculator.ParameterToReduce.ActualName = "Age";
       ageCalculator.TargetParameter.ActualName = "Age";
-      ageCalculator.ReductionOperation.Value = null;
-      ageCalculator.ReductionOperation.ActualName = "AgeInheritanceReduction";
-      ageCalculator.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
+      ageCalculator.WeightParameter.ActualName = "AgeInheritance";
       ageCalculator.Successor = crossoverSuccessor;
 

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

@@ -132 +132 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgeInheritance.cs" />
+    <Compile Include="WeightingReducer.cs" />
     <Compile Include="Analyzers\OldestAverageYoungestAgeAnalyzer.cs" />
     <Compile Include="Analyzers\AgeDistributionAnalyzer.cs" />