Changeset 4696 for branches/CloningRefactoring/HeuristicLab.Selection

Timestamp:

10/31/10 11:36:07 (14 years ago)

Author:

abeham

Message:

#922

• Fixed most of the errors that surfaced in the test cases
• Removed storable attribute from SymbolicExpressionTreeStringFormatter
• Modified StorableConstructorTest that the StorableConstructor may also be public (such as in BoolValue)

Location:

branches/CloningRefactoring/HeuristicLab.Selection/3.3

Files:

• GenderSpecificSelector.cs (modified) (2 diffs)
• OffspringSelector.cs (modified) (1 diff)

branches/CloningRefactoring/HeuristicLab.Selection/3.3/GenderSpecificSelector.cs

@@ -81 +81 @@
 
     [StorableConstructor]
-    private GenderSpecificSelector(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      Initialize();
-    }
-
+    protected GenderSpecificSelector(bool deserializing) : base(deserializing) { }
     protected GenderSpecificSelector(GenderSpecificSelector original, Cloner cloner)
       : base(original, cloner) {
       Initialize();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new GenderSpecificSelector(this, cloner);
     }
 
@@ -131 +123 @@
       #endregion
 
+      Initialize();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new GenderSpecificSelector(this, cloner);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
       Initialize();
     }

branches/CloningRefactoring/HeuristicLab.Selection/3.3/OffspringSelector.cs

@@ -63 +63 @@
 
     [StorableConstructor]
-    private OffspringSelector(bool deserializing) : base(deserializing) { }
-    private OffspringSelector(OffspringSelector original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    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);