Changeset 12363 for branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/Comparators/EliteWeightedParentsQualityComparator.cs

Timestamp:

04/29/15 16:00:38 (9 years ago)

Author:

ascheibe

Message:

#2267 added another offspring selector

File:

• branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/Comparators/EliteWeightedParentsQualityComparator.cs (copied) (copied from branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/Comparators/WeightedParentsQualityComparator.cs) (5 diffs)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/Comparators/EliteWeightedParentsQualityComparator.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm {
-  [Item("WeightedParentsQualityComparator", "Compares the quality against that of its parents (assumes the parents are subscopes to the child scope). This operator works with any number of subscopes > 0.")]
+  [Item("EliteWeightedParentsQualityComparator", "M2")]
   [StorableClass]
-  public class WeightedParentsQualityComparator : SingleSuccessorOperator, ISubScopesQualityComparatorOperator {
+  public class EliteWeightedParentsQualityComparator : SingleSuccessorOperator, ISubScopesQualityComparatorOperator {
     public IValueLookupParameter<BoolValue> MaximizationParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
@@ -46 +46 @@
       get { return (ILookupParameter<BoolValue>)Parameters["Result"]; }
     }
+    public ILookupParameter<BoolValue> ResultImprovementParameter {
+      get { return (ILookupParameter<BoolValue>)Parameters["ResultImprovement"]; }
+    }
     public ValueLookupParameter<DoubleValue> ComparisonFactorParameter {
       get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactor"]; }
@@ -51 +54 @@
 
     [StorableConstructor]
-    protected WeightedParentsQualityComparator(bool deserializing) : base(deserializing) { }
-    protected WeightedParentsQualityComparator(WeightedParentsQualityComparator original, Cloner cloner) : base(original, cloner) { }
-    public WeightedParentsQualityComparator()
+    protected EliteWeightedParentsQualityComparator(bool deserializing) : base(deserializing) { }
+    protected EliteWeightedParentsQualityComparator(EliteWeightedParentsQualityComparator original, Cloner cloner) : base(original, cloner) { }
+    public EliteWeightedParentsQualityComparator()
       : base() {
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, false otherwise"));
@@ -59 +62 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("RightSide", "The qualities of the parents."));
       Parameters.Add(new LookupParameter<BoolValue>("Result", "The result of the comparison: True means Quality is better, False means it is worse than parents."));
+      Parameters.Add(new LookupParameter<BoolValue>("ResultImprovement", "A solution has improved if it is better than the worse parent."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactor", "Determines if the quality should be compared to the better parent (1.0), to the worse (0.0) or to any linearly interpolated value between them."));
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new WeightedParentsQualityComparator(this, cloner);
+      return new EliteWeightedParentsQualityComparator(this, cloner);
     }
 
@@ -122 +126 @@
       }
 
+      bool resultImprovement = maximization && leftQuality > rightQualities.Min(x => x.Value) ||
+                              !maximization && leftQuality < rightQualities.Max(x => x.Value);
+      BoolValue resultImprovementValue = ResultImprovementParameter.ActualValue;
+      if (resultImprovementValue == null) {
+        ResultImprovementParameter.ActualValue = new BoolValue(resultImprovement);
+      } else {
+        resultImprovementValue.Value = resultImprovement;
+      }
+
       return base.Apply();
     }