Changeset 4722 for trunk/sources/HeuristicLab.Selection

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Selection/3.3/BestSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/ConditionalSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/GenderSpecificSelector.cs (modified) (4 diffs)
• HeuristicLab.Selection/3.3/LeftReducer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/LeftSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/LinearRankSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/MergingReducer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/OffspringSelector.cs (modified) (3 diffs)
• HeuristicLab.Selection/3.3/ProportionalSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/RandomReplacer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/RandomSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/Reducer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/Replacer.cs (modified) (3 diffs)
• HeuristicLab.Selection/3.3/RightChildReducer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/RightReducer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/RightSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/Selector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/StochasticSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/StochasticSingleObjectiveSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/TournamentSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/WorstReplacer.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/WorstSelector.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -35 +36 @@
   public sealed class BestSelector : SingleObjectiveSelector, ISingleObjectiveSelector {
     public BestSelector() : base() { }
+    [StorableConstructor]
+    private BestSelector(bool deserializing) : base(deserializing) { }
+    private BestSelector(BestSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new BestSelector(this, cloner);
+    }
+
 
     protected override IScope[] Select(List<IScope> scopes) {

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -42 +43 @@
     }
 
+    [StorableConstructor]
+    protected ConditionalSelector(bool deserializing) : base(deserializing) { }
+    protected ConditionalSelector(ConditionalSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ConditionalSelector(this, cloner);
+    }
     public ConditionalSelector()
       : base() {

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

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -80 +81 @@
 
     [StorableConstructor]
-    private GenderSpecificSelector(bool deserializing) : base() { }
+    protected GenderSpecificSelector(bool deserializing) : base(deserializing) { }
+    protected GenderSpecificSelector(GenderSpecificSelector original, Cloner cloner)
+      : base(original, cloner) {
+      Initialize();
+    }
+
     public GenderSpecificSelector()
       : base() {
@@ -120 +126 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new GenderSpecificSelector(this, cloner);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     /// <summary>
     /// Sets how many sub-scopes male and female selectors should select.
@@ -142 +157 @@
 
     #region Helpers
-    [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
       FemaleSelectorParameter.ValueChanged += new EventHandler(SelectorParameter_ValueChanged);

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -32 +33 @@
   [StorableClass]
   public sealed class LeftReducer : Reducer, IReducer {
+    [StorableConstructor]
+    private LeftReducer(bool deserializing) : base(deserializing) { }
+    private LeftReducer(LeftReducer original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new LeftReducer(this, cloner);
+    }
     public LeftReducer() : base() { }
 

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -43 +44 @@
       get { return CopySelectedParameter.Value; }
       set { CopySelectedParameter.Value = value; }
+    }
+
+    [StorableConstructor]
+    private LeftSelector(bool deserializing) : base(deserializing) { }
+    private LeftSelector(LeftSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new LeftSelector(this, cloner);
     }
 

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -34 +35 @@
   [StorableClass]
   public sealed class LinearRankSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
+    [StorableConstructor]
+    private LinearRankSelector(bool deserializing) : base(deserializing) { }
+    private LinearRankSelector(LinearRankSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new LinearRankSelector(this, cloner);
+    }
     public LinearRankSelector() : base() { }
 

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -32 +33 @@
   [StorableClass]
   public sealed class MergingReducer : Reducer, IReducer {
+    [StorableConstructor]
+    private MergingReducer(bool deserializing) : base(deserializing) { }
+    private MergingReducer(MergingReducer original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MergingReducer(this, cloner);
+    }
     public MergingReducer() : base() { }
 

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

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -31 +32 @@
   [StorableClass]
   public class OffspringSelector : SingleSuccessorOperator {
-
     public ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
       get { return (ValueLookupParameter<DoubleValue>)Parameters["MaximumSelectionPressure"]; }
@@ -62 +62 @@
     }
 
+    [StorableConstructor]
+    protected OffspringSelector(bool deserializing) : base(deserializing) { }
+    protected OffspringSelector(OffspringSelector original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OffspringSelector(this, cloner);
+    }
     public OffspringSelector()
       : base() {

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -45 +46 @@
     }
 
+    [StorableConstructor]
+    private ProportionalSelector(bool deserializing) : base(deserializing) { }
+    private ProportionalSelector(ProportionalSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ProportionalSelector(this, cloner);
+    }
     public ProportionalSelector()
       : base() {

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -49 +50 @@
     [StorableConstructor]
     private RandomReplacer(bool deserializing) : base(deserializing) { }
+    private RandomReplacer(RandomReplacer original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RandomReplacer(this, cloner);
+    }
     public RandomReplacer()
       : base() {

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -46 +47 @@
     }
 
+    [StorableConstructor]
+    private RandomSelector(bool deserializing) : base(deserializing) { }
+    private RandomSelector(RandomSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RandomSelector(this, cloner);
+    }
     public RandomSelector()
       : base() {

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
@@ -41 +42 @@
     }
 
+    [StorableConstructor]
+    protected Reducer(bool deserializing) : base(deserializing) { }
+    protected Reducer(Reducer original, Cloner cloner)
+      : base(original, cloner) {
+    }
     protected Reducer()
       : base() {

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

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -40 +41 @@
 
     [StorableConstructor]
-    protected Replacer(bool deserializing) : base() { }
+    protected Replacer(bool deserializing) : base(deserializing) { }
+    protected Replacer(Replacer original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Replacer(this, cloner);
+    }
     public Replacer() {
       Parameters.Add(new ValueLookupParameter<ISelector>("ReplacedSelector", "The selection operator to select those scopes that are to be replaced."));
@@ -74 +79 @@
       int remaining = ExecutionContext.Scope.SubScopes[0].SubScopes.Count;
       int selected = ExecutionContext.Scope.SubScopes[1].SubScopes.Count;
-      
+
       ISelector replacedSelector = ReplacedSelectorParameter.ActualValue;
       ISelector selectedSelector = SelectedSelectorParameter.ActualValue;
-      
+
       if (replacedSelector != null) {
         replacedSelector.CopySelected = new BoolValue(false);

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -42 +43 @@
   [StorableClass]
   public class RightChildReducer : Reducer, IReducer {
+    [StorableConstructor]
+    protected RightChildReducer(bool deserializing) : base(deserializing) { }
+    protected RightChildReducer(RightChildReducer original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RightChildReducer(this, cloner);
+    }
+    public RightChildReducer() : base() { }
     /// <summary>
     ///  Reduces the sub-scopes, so that the selected sub-scope contains all selected leaves

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -32 +33 @@
   [StorableClass]
   public sealed class RightReducer : Reducer, IReducer {
+    [StorableConstructor]
+    private RightReducer(bool deserializing) : base(deserializing) { }
+    private RightReducer(RightReducer original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RightReducer(this, cloner);
+    }
     public RightReducer() : base() { }
 

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -44 +45 @@
       set { CopySelectedParameter.Value = value; }
     }
+    [StorableConstructor]
+    private RightSelector(bool deserializing) : base(deserializing) { }
+    private RightSelector(RightSelector original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RightSelector(this, cloner);
+    }
+
     public RightSelector()
       : base() {

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
@@ -43 +44 @@
       get { return CurrentScopeParameter.ActualValue; }
     }
+
+    [StorableConstructor]
+    protected Selector(bool deserializing) : base(deserializing) { }
+    protected Selector(Selector original, Cloner cloner) : base(original, cloner) { }
 
     protected Selector()

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -50 +51 @@
     }
 
+    [StorableConstructor]
+    protected SingleObjectiveSelector(bool deserializing) : base(deserializing) { }
+    protected SingleObjectiveSelector(SingleObjectiveSelector original, Cloner cloner) : base(original, cloner) { }
+
     protected SingleObjectiveSelector()
       : base() {

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -36 +37 @@
     }
 
+    [StorableConstructor]
+    protected StochasticSelector(bool deserializing) : base(deserializing) { }
+    protected StochasticSelector(StochasticSelector original, Cloner cloner) : base(original, cloner) { }
     protected StochasticSelector()
       : base() {

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -35 +36 @@
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-
+    [StorableConstructor]
+    protected StochasticSingleObjectiveSelector(bool deserializing) : base(deserializing) { }
+    protected StochasticSingleObjectiveSelector(StochasticSingleObjectiveSelector original, Cloner cloner) : base(original, cloner) { }
     protected StochasticSingleObjectiveSelector()
       : base() {

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -37 +38 @@
     public ValueLookupParameter<IntValue> GroupSizeParameter {
       get { return (ValueLookupParameter<IntValue>)Parameters["GroupSize"]; }
+    }
+
+    [StorableConstructor]
+    private TournamentSelector(bool deserializing) : base(deserializing) { }
+    private TournamentSelector(TournamentSelector original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TournamentSelector(this, cloner);
     }
 

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -46 +47 @@
     [StorableConstructor]
     private WorstReplacer(bool deserializing) : base(deserializing) { }
+    private WorstReplacer(WorstReplacer original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new WorstReplacer(this, cloner);
+    }
     public WorstReplacer()
       : base() {

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -34 +35 @@
   [StorableClass]
   public sealed class WorstSelector : SingleObjectiveSelector, ISingleObjectiveSelector {
+    [StorableConstructor]
+    private WorstSelector(bool deserializing) : base(deserializing) { }
+    private WorstSelector(WorstSelector original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new WorstSelector(this, cloner);
+    }
     public WorstSelector() : base() { }