Changeset 3317 for trunk/sources/HeuristicLab.Optimization

Timestamp:

04/13/10 06:41:56 (15 years ago)

Author:

swagner

Message:

Implemented ReadOnlyView property for items (#969).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• OptimizerList.cs (modified) (1 diff)
• Result.cs (modified) (3 diffs)
• ResultCollection.cs (modified) (1 diff)
• RunCollection.cs (modified) (1 diff)

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

@@ -33 +33 @@
     public OptimizerList(int capacity) : base(capacity) { }
     public OptimizerList(IEnumerable<IOptimizer> collection) : base(collection) { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      OptimizerList clone = new OptimizerList(this.Select(x => (IOptimizer)cloner.Clone(x)));
-      cloner.RegisterClonedObject(this, clone);
-      return clone;
-    }
   }
 }

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

@@ -45 +45 @@
     }
 
+    [Storable]
     private IItem value;
-    [Storable]
     public IItem Value {
       get { return value; }
@@ -84 +84 @@
       this.dataType = value == null ? typeof(IItem) : value.GetType();
       this.value = value;
-      if (this.value != null) this.value.ToStringChanged += new EventHandler(Value_ToStringChanged);
+      Initialize();
     }
     public Result(string name, string description, IItem value)
@@ -90 +90 @@
       this.dataType = value == null ? typeof(IItem) : value.GetType();
       this.value = value;
-      if (this.value != null) this.value.ToStringChanged += new EventHandler(Value_ToStringChanged);
+      Initialize();
+    }
+    [StorableConstructor]
+    private Result(bool deserializing) : base(deserializing) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      if (value != null) value.ToStringChanged += new EventHandler(Value_ToStringChanged);
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Result clone = new Result(Name, Description, (IItem)cloner.Clone(value));
+      Result clone = new Result(Name, Description, DataType);
       cloner.RegisterClonedObject(this, clone);
-      clone.dataType = dataType;
+      clone.ReadOnlyView = ReadOnlyView;
+      clone.value = (IItem)cloner.Clone(value);
+      clone.Initialize();
       return clone;
     }

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

@@ -32 +32 @@
     public ResultCollection(int capacity) : base(capacity) { }
     public ResultCollection(IEnumerable<IResult> collection) : base(collection) { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      ResultCollection clone = new ResultCollection(this.Select(x => (IResult)cloner.Clone(x)));
-      cloner.RegisterClonedObject(this, clone);
-      return clone;
-    }
   }
 }

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

@@ -32 +32 @@
     public RunCollection(int capacity) : base(capacity) { }
     public RunCollection(IEnumerable<IRun> collection) : base(collection) { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      RunCollection clone = new RunCollection(this.Select(x => (IRun)cloner.Clone(x)));
-      cloner.RegisterClonedObject(this, clone);
-      return clone;
-    }
   }
 }