Changeset 11513 for branches/VOSGA

Timestamp:

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

Author:

ascheibe

Message:

#2267 made subscopes offspring comparer configurable

Location:

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm

Files:

• HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (2 diffs)
• VOffspringSelectionGeneticAlgorithm.cs (modified) (6 diffs)
• VOffspringSelectionGeneticAlgorithmMainOperator.cs (modified) (6 diffs)
• WeightedParentsQualityComparator.cs (added)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.csproj

@@ -161 +161 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ISubScopesQualityComparatorOperator.cs" />
     <Compile Include="OffspringCollector.cs" />
     <Compile Include="OffspringSelectors\IOffspringSelector.cs" />
@@ -171 +172 @@
     <Compile Include="VOffspringSelectionGeneticAlgorithmMainLoop.cs" />
     <Compile Include="VOffspringSelectionGeneticAlgorithmMainOperator.cs" />
+    <Compile Include="WeightedParentsQualityComparator.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -118 +118 @@
       get { return (IConstrainedValueParameter<IOffspringSelector>)Parameters["OffspringSelector"]; }
     }
+    public ConstrainedValueParameter<ISubScopesQualityComparatorOperator> SubScopesQualityComparatorParameter {
+      get { return (ConstrainedValueParameter<ISubScopesQualityComparatorOperator>)Parameters["SubScopesQualityComparator"]; }
+    }
     #endregion
 
@@ -205 +208 @@
       set { FillPopulationWithParentsParameter.Value.Value = value; }
     }
+    public ISubScopesQualityComparatorOperator SubScopesQualityComparator {
+      get { return SubScopesQualityComparatorParameter.Value; }
+      set { SubScopesQualityComparatorParameter.Value = value; }
+    }
+
     private RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
@@ -272 +280 @@
       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 ConstrainedValueParameter<IOffspringSelector>("OffspringSelector", "The operator used as selection criterea for deciding which individuals are successful and which should be disgarded."));
-
+      Parameters.Add(new ConstrainedValueParameter<ISubScopesQualityComparatorOperator>("SubScopesQualityComparator", "The operator used to compare solution candidates with."));
 
       RandomCreator randomCreator = new RandomCreator();
@@ -336 +344 @@
       ParameterizeOffspringSelectors();
 
+      foreach (ISubScopesQualityComparatorOperator comparator in ApplicationManager.Manager.GetInstances<ISubScopesQualityComparatorOperator>().OrderBy(x => x.Name))
+        SubScopesQualityComparatorParameter.ValidValues.Add(comparator);
+      ISubScopesQualityComparatorOperator standardComparator = SubScopesQualityComparatorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("WeightedParentsQualityComparator"));
+      if (standardComparator != null) SubScopesQualityComparatorParameter.Value = standardComparator;
+      ParameterizeSubScopesQualityComparators();
+
       qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       selectionPressureAnalyzer = new ValueAnalyzer();
@@ -362 +376 @@
       UpdateMutators();
       UpdateAnalyzers();
+      ParameterizeSubScopesQualityComparators();
+      ParameterizeOffspringSelectors();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -457 +473 @@
         selector.SuccessfulOffspringParameter.ActualName = "SuccessfulOffspring";
         selector.FillPopulationWithParentsParameter.ActualName = FillPopulationWithParentsParameter.Name;
+      }
+    }
+    private void ParameterizeSubScopesQualityComparators() {
+      foreach (var comp in SubScopesQualityComparatorParameter.ValidValues) {
+        comp.ComparisonFactorParameter.ActualName = "ComparisonFactor";
+        if (Problem != null) {
+          comp.LeftSideParameter.ActualName = Problem.Evaluator.QualityParameter.Name;
+          comp.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+          comp.RightSideParameter.ActualName = Problem.Evaluator.QualityParameter.Name;
+        }
+        comp.ResultParameter.ActualName = "SuccessfulOffspring";
       }
     }

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;