Changeset 885 for branches/CloningRefactorBranch/HeuristicLab.Constraints/AllSubOperatorsTypeConstraint.cs

Timestamp:

12/02/08 14:13:06 (15 years ago)

Author:

gkronber

Message:

Refactored cloning in HL.Core, HL.Data and HL.Constraints

#285 (Cloning could be improved by creating objects at the bottom of the cloning chain with 'new' instead of the top with Activator.CreateInstance())

File:

• branches/CloningRefactorBranch/HeuristicLab.Constraints/AllSubOperatorsTypeConstraint.cs (modified) (3 diffs)

branches/CloningRefactorBranch/HeuristicLab.Constraints/AllSubOperatorsTypeConstraint.cs

@@ -42 +42 @@
     }
 
-    public AllSubOperatorsTypeConstraint()
-      : base() {
+    /// <summary>
+    /// Default constructor for an empty AllSubOperatorsTypeConstraint.
+    /// </summary>
+    public AllSubOperatorsTypeConstraint() {
       groupConstraint = new SubOperatorTypeConstraint();
+    }
+    /// <summary>
+    /// Copy constructor to create clones (deep).
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public AllSubOperatorsTypeConstraint(AllSubOperatorsTypeConstraint original)
+      : this(original, new Dictionary<Guid, object>()) { }
+    /// <summary>
+    /// Copy constructor to create clones (deep) reusing already cloned object references.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    protected AllSubOperatorsTypeConstraint(AllSubOperatorsTypeConstraint original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.groupConstraint = (SubOperatorTypeConstraint)Auxiliary.Clone(original.groupConstraint, clonedObjects);
     }
 
@@ -59 +76 @@
     public override bool Check(IItem data) {
       IOperator op = data as IOperator;
-      if(data == null) return false;
+      if (data == null) return false;
 
-      for(int i = 0; i < op.SubOperators.Count; i++) {
+      for (int i = 0; i < op.SubOperators.Count; i++) {
         groupConstraint.SubOperatorIndex.Data = i;
-        if(groupConstraint.Check(data) == false) {
+        if (groupConstraint.Check(data) == false) {
           return false;
         }
@@ -75 +92 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      AllSubOperatorsTypeConstraint clone = new AllSubOperatorsTypeConstraint();
-      clonedObjects.Add(Guid, clone);
-      clone.groupConstraint = (SubOperatorTypeConstraint)Auxiliary.Clone(groupConstraint, clonedObjects);
-      return clone;
+      return new AllSubOperatorsTypeConstraint(this);
     }