Changeset 4722 for trunk/sources/HeuristicLab.Selection/3.3/GenderSpecificSelector.cs

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Selection/3.3/GenderSpecificSelector.cs (modified) (4 diffs)

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);