Changeset 7740 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.cs

Timestamp:

04/18/12 19:01:21 (12 years ago)

Author:

jkarder

Message:

#1331:

• added custom crossover operator (NChildCrossover)
• added parameters and adjusted types
• replaced SolutionCombinationMethod with a placeholder
• adjusted event handling
• changed access levels
• minor code improvements

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.cs (modified) (3 diffs)

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.cs

@@ -30 +30 @@
 namespace HeuristicLab.Algorithms.ScatterSearch {
   /// <summary>
-  /// An operator that updates a population.
+  /// An operator that updates the reference set and rebuilds the population.
   /// </summary>
-  [Item("PopulationRebuildMethod", "An operator that rebuilds the population.")]
+  [Item("PopulationRebuildMethod", "An operator that updates the reference set and rebuilds the population.")]
   [StorableClass]
   public sealed class PopulationRebuildMethod : SingleSuccessorOperator {
     #region Parameter properties
-    private ScopeParameter CurrentScopeParameter {
+    public ScopeParameter CurrentScopeParameter {
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
     }
-    private ValueLookupParameter<IntValue> NumberOfHighQualitySolutionsParameter {
-      get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfHighQualitySolutions"]; }
+    public IValueLookupParameter<IntValue> NumberOfHighQualitySolutionsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfHighQualitySolutions"]; }
     }
-    private ValueLookupParameter<IntValue> ReferenceSetSizeParameter {
-      get { return (ValueLookupParameter<IntValue>)Parameters["ReferenceSetSize"]; }
+    public IValueLookupParameter<IntValue> ReferenceSetSizeParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["ReferenceSetSize"]; }
+    }
+    public IValueLookupParameter<IItem> QualityParameter {
+      get { return (IValueLookupParameter<IItem>)Parameters["Quality"]; }
     }
     #endregion
@@ -59 +62 @@
       set { ReferenceSetSizeParameter.ActualValue = value; }
     }
+    private IItem Quality {
+      get { return QualityParameter.ActualValue; }
+    }
     #endregion
 
@@ -72 +78 @@
     private void Initialize() {
       #region Create parameters
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfHighQualitySolutions", "The number of high quality solutions that should be added to the reference set."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("ReferenceSetSize", "The size of the reference set."));
-      #endregion
-
-      #region Create operators
-      #endregion
-
-      #region Create operator graph
+      Parameters.Add(new ScopeParameter("CurrentScope"));
+      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfHighQualitySolutions"));
+      Parameters.Add(new ValueLookupParameter<IntValue>("ReferenceSetSize"));
+      Parameters.Add(new ValueLookupParameter<IItem>("Quality"));
       #endregion
     }
 
     public override IOperation Apply() {
-      IScope population = CurrentScope.SubScopes[0];
-      IScope refSet = CurrentScope.SubScopes[1];
-      refSet.SubScopes.Replace(refSet.SubScopes.OrderByDescending(r => r.Variables["Quality"].Value)
+      var population = CurrentScope.SubScopes[0];
+      var refSet = CurrentScope.SubScopes[1];
+      refSet.SubScopes.Replace(refSet.SubScopes.OrderByDescending(r => r.Variables[QualityParameter.ActualName].Value)
                                                .Take(NumberOfHighQualitySolutions.Value).ToList());
       population.SubScopes.Clear();