Changeset 4722 for trunk/sources/HeuristicLab.Core/3.3/Constraints

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Constraints/Constraint.cs (modified) (6 diffs)
• HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +31 @@
     [StorableConstructor]
     protected ComparisonConstraint(bool deserializing) : base(deserializing) { }
-
+    protected ComparisonConstraint(ComparisonConstraint original, Cloner cloner) : base(original, cloner) { }
     public ComparisonConstraint() : base() { }
     public ComparisonConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue)
@@ -41 +42 @@
     public override IEnumerable<ConstraintOperation> AllowedConstraintOperations {
       get { return new ConstraintOperation[6] { ConstraintOperation.Less, ConstraintOperation.LessOrEqual, ConstraintOperation.Equal, ConstraintOperation.GreaterOrEqual, ConstraintOperation.Greater, ConstraintOperation.NotEqual }; }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ComparisonConstraint(this, cloner);
     }
 

trunk/sources/HeuristicLab.Core/3.3/Constraints/Constraint.cs

@@ -31 +31 @@
     [StorableConstructor]
     protected Constraint(bool deserializing) : base(deserializing) { }
+    protected Constraint(Constraint original, Cloner cloner)
+      : base(original, cloner) {
+      constrainedValue = null;  //mkommend: intentionally set to null;
 
+      IDeepCloneable constraintDataDeepCloneable = original.constraintData as IDeepCloneable;
+      ICloneable constraintDataCloneable = original.constraintData as ICloneable;
+      if (constraintDataDeepCloneable != null)
+        constraintData = cloner.Clone(constraintDataDeepCloneable);
+      else if (constraintDataCloneable != null)
+        constraintData = constraintDataCloneable.Clone();
+      else
+        constraintData = original.constraintData;
+
+      constraintOperation = original.constraintOperation;
+    }
     protected Constraint() {
       this.Active = false;
@@ -138 +152 @@
     protected virtual void OnActiveChanged() {
       EventHandler handler = ActiveChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -145 +158 @@
     protected virtual void OnConstrainedValueChanged() {
       EventHandler handler = ConstrainedValueChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -152 +164 @@
     protected virtual void OnConstraintDataChanged() {
       EventHandler handler = ConstraintDataChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -159 +170 @@
     protected virtual void OnConstraintOperationChanged() {
       EventHandler handler = ConstraintOperationChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
     #endregion
@@ -182 +192 @@
       return s;
     }
-
-    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      Constraint clone = (Constraint)base.Clone(cloner);
-      clone.constrainedValue = null;  //mkommend: intentionally set to null;
-
-      IItem constraintDataItem = this.constraintData as IItem;
-      ICloneable constraintDataCloneable = this.constraintData as ICloneable;
-      if (constraintDataItem != null)
-        clone.constraintData = cloner.Clone(constraintDataItem);
-      else if (constraintDataCloneable != null)
-        clone.constraintData = constraintDataCloneable.Clone();
-      else
-        clone.constraintData = constraintData;
-
-      clone.constraintOperation = this.constraintOperation;
-
-      return clone;
-    }
     #endregion
   }

trunk/sources/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +31 @@
     [StorableConstructor]
     protected EqualityConstraint(bool deserializing) : base(deserializing) { }
-
+    protected EqualityConstraint(EqualityConstraint original, Cloner cloner) : base(original, cloner) { }
     public EqualityConstraint() : base() { }
     public EqualityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData)
@@ -41 +42 @@
     public override IEnumerable<ConstraintOperation> AllowedConstraintOperations {
       get { return new ConstraintOperation[2] { ConstraintOperation.Equal, ConstraintOperation.NotEqual }; }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EqualityConstraint(this, cloner);
     }
 

trunk/sources/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -28 +29 @@
   [Item("TypeCompatibilityConstraint", "A constraint that checks for compatible types.")]
   public class TypeCompatibilityConstraint : Constraint {
-    public TypeCompatibilityConstraint() {
-    }
     [StorableConstructor]
     protected TypeCompatibilityConstraint(bool deserializing) : base(deserializing) { }
+    protected TypeCompatibilityConstraint(TypeCompatibilityConstraint original, Cloner cloner) : base(original, cloner) { }
+    public TypeCompatibilityConstraint() : base() { }
     public TypeCompatibilityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, Type constraintData)
       : base(constrainedValue, constraintOperation, constraintData) {
@@ -46 +47 @@
     public override IEnumerable<ConstraintOperation> AllowedConstraintOperations {
       get { return new ConstraintOperation[2] { ConstraintOperation.IsTypeCompatible, ConstraintOperation.IsTypeNotCompatible }; }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TypeCompatibilityConstraint(this, cloner);
     }