Changeset 4671 for branches/CloningRefactoring/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

Timestamp:

10/29/10 18:28:32 (13 years ago)

Author:

swagner

Message:

Finished cloning refactoring of HeuristicLab.Parameters and simplified cloning code of HeuristicLab.Core (#922)

File:

• branches/CloningRefactoring/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs (modified) (3 diffs)

branches/CloningRefactoring/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

@@ -87 +87 @@
 
     #region Constructors
+    [StorableConstructor]
+    protected OptionalConstrainedValueParameter(bool deserializing) : base(deserializing) { }
+    protected OptionalConstrainedValueParameter(OptionalConstrainedValueParameter<T> original, Cloner cloner)
+      : base(original, cloner) {
+      validValues = cloner.Clone(original.validValues);
+      value = cloner.Clone(original.value);
+      getsCollected = original.getsCollected;
+      Initialize();
+    }
     public OptionalConstrainedValueParameter()
       : base("Anonymous", typeof(T)) {
@@ -169 +178 @@
       Initialize();
     }
-    [StorableConstructor]
-    protected OptionalConstrainedValueParameter(bool deserializing) : base(deserializing) { }
     #endregion
 
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     private void Initialize() {
       RegisterValidValuesEvents();
@@ -180 +191 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      OptionalConstrainedValueParameter<T> clone = (OptionalConstrainedValueParameter<T>)base.Clone(cloner);
-      clone.validValues = (ItemSet<T>)cloner.Clone(validValues);
-      clone.value = (T)cloner.Clone(value);
-      clone.getsCollected = getsCollected;
-      clone.Initialize();
-      return clone;
+      return new OptionalConstrainedValueParameter<T>(this, cloner);
     }