Changeset 7724 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs

Timestamp:

04/12/12 16:42:17 (13 years ago)

Author:

jkarder

Message:

#1331:

• added analyzer
• added parameters and adjusted parameter types
• corrected ReferenceSetUpdateMethod
• changed access levels

File:

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

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

@@ -42 +42 @@
       get { return (ValueLookupParameter<BoolValue>)Parameters["NewSolutions"]; }
     }
+    private ValueLookupParameter<IntValue> ReferenceSetSizeParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["ReferenceSetSize"]; }
+    }
     #endregion
 
     #region Properties
-    public IScope CurrentScope {
+    private IScope CurrentScope {
       get { return CurrentScopeParameter.ActualValue; }
     }
-    public BoolValue NewSolutions {
+    private BoolValue NewSolutions {
       get { return NewSolutionsParameter.ActualValue; }
+    }
+    private IntValue ReferenceSetSize {
+      get { return ReferenceSetSizeParameter.ActualValue; }
+      set { ReferenceSetSizeParameter.ActualValue = value; }
     }
     #endregion
@@ -64 +71 @@
     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<BoolValue>("NewSolutions", "Indicates if new solutions have been found."));
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("ReferenceSetSize", "The size of the reference set."));
       #endregion
 
@@ -86 +94 @@
       if ((offspring.SubScopes.OrderByDescending(o => o.Variables["Quality"].Value).First().Variables["Quality"].Value as DoubleValue).Value
           > (parents.SubScopes.OrderByDescending(o => o.Variables["Quality"].Value).First().Variables["Quality"].Value as DoubleValue).Value) {
-        CurrentScope.SubScopes.Replace(CurrentScope.SubScopes.Union(offspring.SubScopes).OrderByDescending(o => o.Variables["Quality"].Value).Take(10));
+        CurrentScope.SubScopes.Replace(CurrentScope.SubScopes.Union(offspring.SubScopes).OrderByDescending(o => o.Variables["Quality"].Value).Take(ReferenceSetSize.Value));
         NewSolutions.Value = true;
       }