Changeset 3048 for trunk/sources/HeuristicLab.Selection

Timestamp:

03/15/10 23:49:54 (14 years ago)

Author:

swagner

Message:

Renamed classes of HeuristicLab.Data (#909)

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• LinearRankSelector.cs (modified) (1 diff)
• ProportionalSelector.cs (modified) (2 diffs)
• Selector.cs (modified) (3 diffs)
• StochasticSingleObjectiveSelector.cs (modified) (1 diff)
• TournamentSelector.cs (modified) (1 diff)

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

@@ -44 +44 @@
       IRandom random = RandomParameter.ActualValue;
       bool maximization = MaximizationParameter.ActualValue.Value;
-      ItemArray<DoubleData> qualities = QualityParameter.ActualValue;
+      ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
       IScope[] selected = new IScope[count];
 

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

@@ -36 +36 @@
   [Creatable("Test")]
   public sealed class ProportionalSelector : StochasticSingleObjectiveSelector {
-    private ValueParameter<BoolData> WindowingParameter {
-      get { return (ValueParameter<BoolData>)Parameters["Windowing"]; }
+    private ValueParameter<BoolValue> WindowingParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["Windowing"]; }
     }
 
-    public BoolData Windowing {
+    public BoolValue Windowing {
       get { return WindowingParameter.Value; }
       set { WindowingParameter.Value = value; }
@@ -47 +47 @@
     public ProportionalSelector()
       : base() {
-      Parameters.Add(new ValueParameter<BoolData>("Windowing", "Apply windowing strategy (selection probability is proportional to the quality differences and not to the total quality).", new BoolData(true)));
+      Parameters.Add(new ValueParameter<BoolValue>("Windowing", "Apply windowing strategy (selection probability is proportional to the quality differences and not to the total quality).", new BoolValue(true)));
       CopySelected.Value = true;
     }

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

@@ -39 +39 @@
     }
 
-    protected ValueParameter<BoolData> CopySelectedParameter {
-      get { return (ValueParameter<BoolData>)Parameters["CopySelected"]; }
+    protected ValueParameter<BoolValue> CopySelectedParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
-    public IValueLookupParameter<IntData> NumberOfSelectedSubScopesParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["NumberOfSelectedSubScopes"]; }
+    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
     }
     protected ScopeParameter CurrentScopeParameter {
@@ -49 +49 @@
     }
 
-    public BoolData CopySelected {
+    public BoolValue CopySelected {
       get { return CopySelectedParameter.Value; }
       set { CopySelectedParameter.Value = value; }
@@ -59 +59 @@
     protected Selector()
       : base() {
-      Parameters.Add(new ValueParameter<BoolData>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolData(false)));
-      Parameters.Add(new ValueLookupParameter<IntData>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
+      Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(false)));
+      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which sub-scopes should be selected."));
     }

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

@@ -33 +33 @@
   [StorableClass]
   public abstract class StochasticSingleObjectiveSelector : StochasticSelector, ISingleObjectiveSelector {
-    public IValueLookupParameter<BoolData> MaximizationParameter {
-      get { return (IValueLookupParameter<BoolData>)Parameters["Maximization"]; }
+    public IValueLookupParameter<BoolValue> MaximizationParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    public ILookupParameter<ItemArray<DoubleData>> QualityParameter {
-      get { return (ILookupParameter<ItemArray<DoubleData>>)Parameters["Quality"]; }
+    public ILookupParameter<ItemArray<DoubleValue>> QualityParameter {
+      get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["Quality"]; }
     }
 
     protected StochasticSingleObjectiveSelector()
       : base() {
-      Parameters.Add(new ValueLookupParameter<BoolData>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleData>("Quality", "The quality value contained in each sub-scope which is used for selection."));
+      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."));
     }
   }

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

@@ -35 +35 @@
   [Creatable("Test")]
   public sealed class TournamentSelector : StochasticSingleObjectiveSelector {
-    public ValueLookupParameter<IntData> GroupSizeParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["GroupSize"]; }
+    public ValueLookupParameter<IntValue> GroupSizeParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["GroupSize"]; }
     }
 
     public TournamentSelector() : base() {
-      Parameters.Add(new ValueLookupParameter<IntData>("GroupSize", "The size of the tournament group.", new IntData(2)));
+      Parameters.Add(new ValueLookupParameter<IntValue>("GroupSize", "The size of the tournament group.", new IntValue(2)));
       CopySelected.Value = true;
     }