Changeset 4671 for branches/CloningRefactoring/HeuristicLab.Parameters/3.3/ValueLookupParameter.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/ValueLookupParameter.cs (modified) (6 diffs)

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

@@ -79 +79 @@
 
     #region Constructors
+    [StorableConstructor]
+    protected ValueLookupParameter(bool deserializing) : base(deserializing) { }
+    protected ValueLookupParameter(ValueLookupParameter<T> original, Cloner cloner)
+      : base(original, cloner) {
+      value = cloner.Clone(original.value);
+      getsCollected = original.getsCollected;
+      RegisterValueEvents();
+    }
     public ValueLookupParameter()
       : base() {
@@ -95 +103 @@
       this.value = value;
       this.getsCollected = true;
-      Initialize();
+      RegisterValueEvents();
     }
     public ValueLookupParameter(string name, T value, bool getsCollected)
@@ -101 +109 @@
       this.value = value;
       this.getsCollected = getsCollected;
-      Initialize();
+      RegisterValueEvents();
     }
     public ValueLookupParameter(string name, string description)
@@ -115 +123 @@
       this.value = value;
       this.getsCollected = true;
-      Initialize();
+      RegisterValueEvents();
     }
     public ValueLookupParameter(string name, string description, T value, bool getsCollected)
@@ -121 +129 @@
       this.value = value;
       this.getsCollected = getsCollected;
-      Initialize();
+      RegisterValueEvents();
     }
     public ValueLookupParameter(string name, string description, string actualName)
@@ -131 +139 @@
       this.getsCollected = getsCollected;
     }
-    [StorableConstructor]
-    protected ValueLookupParameter(bool deserializing) : base(deserializing) { }
     #endregion
 
     [StorableHook(HookType.AfterDeserialization)]
-    private void Initialize() {
+    private void AfterDeserialization() {
       RegisterValueEvents();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ValueLookupParameter<T> clone = (ValueLookupParameter<T>)base.Clone(cloner);
-      clone.value = (T)cloner.Clone(value);
-      clone.getsCollected = getsCollected;
-      clone.Initialize();
-      return clone;
+      return new ValueLookupParameter<T>(this, cloner);
     }