Changeset 4722 for trunk/sources/HeuristicLab.Optimization/3.3/UserDefinedProblem.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.Optimization/3.3/UserDefinedProblem.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/UserDefinedProblem.cs

@@ -117 +117 @@
     [StorableConstructor]
     private UserDefinedProblem(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      AttachEventHandlers();
+    }
     public UserDefinedProblem()
       : base() {
@@ -129 +133 @@
     }
 
+    private UserDefinedProblem(UserDefinedProblem original, Cloner cloner)
+      : base(original, cloner) {
+      AttachEventHandlers();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
-      UserDefinedProblem clone = (UserDefinedProblem)base.Clone(cloner);
-      clone.AttachEventHandlers();
-      return clone;
+      return new UserDefinedProblem(this, cloner);
     }
 
@@ -186 +192 @@
 
     #region Helpers
-    [StorableHook(HookType.AfterDeserialization)]
     private void AttachEventHandlers() {
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
@@ -216 +221 @@
     [Item("EmptyUserDefinedProblemEvaluator", "A dummy evaluator that will throw an exception when executed.")]
     [StorableClass]
-    private class EmptyUserDefinedProblemEvaluator : ParameterizedNamedItem, ISingleObjectiveEvaluator {
+    private sealed class EmptyUserDefinedProblemEvaluator : ParameterizedNamedItem, ISingleObjectiveEvaluator {
+
+      [StorableConstructor]
+      private EmptyUserDefinedProblemEvaluator(bool deserializing) : base(deserializing) { }
+      private EmptyUserDefinedProblemEvaluator(EmptyUserDefinedProblemEvaluator original, Cloner cloner)
+        : base(original, cloner) {
+      }
+      public override IDeepCloneable Clone(Cloner cloner) {
+        return new EmptyUserDefinedProblemEvaluator(this, cloner);
+      }
+
       #region ISingleObjectiveEvaluator Members
 
@@ -231 +246 @@
       #region IOperator Members
 
-      public bool Breakpoint {
-        get;
-        set;
-      }
+      public bool Breakpoint { get; set; }
 
       public IOperation Execute(IExecutionContext context) {
@@ -244 +256 @@
       }
 
-      #pragma warning disable 67
+#pragma warning disable 67
       public event EventHandler BreakpointChanged;
 
       public event EventHandler Executed;
-      #pragma warning restore 67
+#pragma warning restore 67
 
       #endregion
@@ -255 +267 @@
         get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method; }
       }
-    } 
+    }
   }
 }