Changeset 3659 for trunk/sources/HeuristicLab.Selection

Timestamp:

05/06/10 00:47:32 (15 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• removed SubScopesSubScopesLookupParameter
• adapted SubScopesLookupParameter and renamed it into ScopeTreeLookupParameter

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• ConditionalSelector.cs (modified) (2 diffs)
• GenderSpecificSelector.cs (modified) (1 diff)
• RandomReplacer.cs (modified) (1 diff)
• SingleObjectiveSelector.cs (modified) (1 diff)
• WorstReplacer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Selection/3.3/ConditionalSelector.cs

@@ -32 +32 @@
   [StorableClass]
   public class ConditionalSelector : Selector {
-    public SubScopesLookupParameter<BoolValue> ConditionParameter {
-      get { return (SubScopesLookupParameter<BoolValue>)Parameters["Condition"]; }
+    public ScopeTreeLookupParameter<BoolValue> ConditionParameter {
+      get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["Condition"]; }
     }
     public ValueParameter<BoolValue> CopySelectedParameter {
@@ -46 +46 @@
     public ConditionalSelector()
       : base() {
-      Parameters.Add(new SubScopesLookupParameter<BoolValue>("Condition", "The boolean variable based on which the scopes are selected into a true scope-branch and a false scope-branch."));
+      Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("Condition", "The boolean variable based on which the scopes are selected into a true scope-branch and a false scope-branch."));
       Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "The parameter that decides whether the selected scopes should be copied or moved.", new BoolValue(true)));
     }

trunk/sources/HeuristicLab.Selection/3.3/GenderSpecificSelector.cs

@@ -89 +89 @@
       #region Create parameters
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality of the solutions."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality of the solutions."));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of scopes that should be selected."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("CopySelected", "True if the scopes should be copied, false if they should be moved.", new BoolValue(true)));

trunk/sources/HeuristicLab.Selection/3.3/RandomReplacer.cs

@@ -53 +53 @@
     public RandomReplacer()
       : base() {
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality of a solution."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality of a solution."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator to use."));

trunk/sources/HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs

@@ -56 +56 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality value contained in each sub-scope which is used for selection."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality value contained in each sub-scope which is used for selection."));
     }
   }

trunk/sources/HeuristicLab.Selection/3.3/WorstReplacer.cs

@@ -50 +50 @@
     public WorstReplacer()
       : base() {
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality of a solution."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality of a solution."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));