Changeset 11513 for branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/VOffspringSelectionGeneticAlgorithmMainOperator.cs

Timestamp:

10/30/14 14:47:32 (9 years ago)

Author:

ascheibe

Message:

#2267 made subscopes offspring comparer configurable

File:

• branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/VOffspringSelectionGeneticAlgorithmMainOperator.cs (modified) (6 diffs)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/VOffspringSelectionGeneticAlgorithmMainOperator.cs

@@ -93 +93 @@
     public ValueLookupParameter<IOffspringSelector> OffspringSelectorParameter {
       get { return (ValueLookupParameter<IOffspringSelector>)Parameters["OffspringSelector"]; }
+    }
+    public ValueLookupParameter<ISubScopesQualityComparatorOperator> SubScopesQualityComparatorParameter {
+      get { return (ValueLookupParameter<ISubScopesQualityComparatorOperator>)Parameters["SubScopesQualityComparator"]; }
     }
     #endregion
@@ -142 +145 @@
       Parameters.Add(new ValueLookupParameter<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."));
       Parameters.Add(new ValueLookupParameter<IOffspringSelector>("OffspringSelector", "The operator used as selection criterea for deciding which individuals are successful and which should be disgarded."));
+      Parameters.Add(new ValueLookupParameter<ISubScopesQualityComparatorOperator>("SubScopesQualityComparator", "The operator used to compare solution candidates."));
       #endregion
 
@@ -154 +158 @@
       Placeholder evaluator1 = new Placeholder();
       SubScopesCounter subScopesCounter1 = new SubScopesCounter();
-      WeightedParentsQualityComparator qualityComparer1 = new WeightedParentsQualityComparator();
+      Placeholder qualityComparer1 = new Placeholder();
       SubScopesRemover subScopesRemover1 = new SubScopesRemover();
       UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
@@ -174 +178 @@
       Placeholder evaluator3 = new Placeholder();
       SubScopesCounter subScopesCounter3 = new SubScopesCounter();
-      WeightedParentsQualityComparator qualityComparer2 = new WeightedParentsQualityComparator();
+      Placeholder qualityComparer2 = new Placeholder();
       SubScopesRemover subScopesRemover2 = new SubScopesRemover();
       Placeholder offspringSelector = new Placeholder();
@@ -208 +212 @@
       subScopesCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
 
-      qualityComparer1.ComparisonFactorParameter.ActualName = ComparisonFactorParameter.Name;
-      qualityComparer1.LeftSideParameter.ActualName = QualityParameter.Name;
-      qualityComparer1.MaximizationParameter.ActualName = MaximizationParameter.Name;
-      qualityComparer1.RightSideParameter.ActualName = QualityParameter.Name;
-      qualityComparer1.ResultParameter.ActualName = "SuccessfulOffspring";
+      qualityComparer1.Name = "Quality Comparator (placeholder)";
+      qualityComparer1.OperatorParameter.ActualName = SubScopesQualityComparatorParameter.ActualName;
 
       subScopesRemover1.RemoveAllSubScopes = true;
@@ -257 +258 @@
       subScopesCounter3.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
 
-      qualityComparer2.ComparisonFactorParameter.ActualName = ComparisonFactorParameter.Name;
-      qualityComparer2.LeftSideParameter.ActualName = QualityParameter.Name;
-      qualityComparer2.MaximizationParameter.ActualName = MaximizationParameter.Name;
-      qualityComparer2.RightSideParameter.ActualName = QualityParameter.Name;
-      qualityComparer2.ResultParameter.ActualName = "SuccessfulOffspring";
+      qualityComparer2.Name = "Quality Comparator (placeholder)";
+      qualityComparer2.OperatorParameter.ActualName = SubScopesQualityComparatorParameter.ActualName;
 
       subScopesRemover2.RemoveAllSubScopes = true;