Context Navigation

Changeset 4153

Timestamp:

08/04/10 17:11:42 (14 years ago)

Author:

mkommend

Message:

chained storable ctors for constraints (ticket #1129)

Location:

trunk/sources/HeuristicLab.Core/3.3/Constraints

Files:

-                      r4068
+                      r4153
   [Item("ComparisonConstraint", "A constraint which checks for specified compare operation.")]
   public class ComparisonConstraint : Constraint {
-    public ComparisonConstraint()
-      : base() {
+    }
     [StorableConstructor]
+    protected ComparisonConstraint(bool deserializing) {
+    }
+    protected ComparisonConstraint(bool deserializing) : base(deserializing) { }
+    public ComparisonConstraint() : base() { }
     public ComparisonConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue)
       : base(constrainedValue, comparisonOperation, comparisonValue) {

-                      r4068
+                      r4153
   [StorableClass]
   public abstract class Constraint : Item, IConstraint {
+    [StorableConstructor]
+    protected Constraint(bool deserializing) : base(deserializing) { }
     protected Constraint() {
       this.Active = false;
       if (AllowedConstraintOperations != null && AllowedConstraintOperations.Count() != 0)
         this.ConstraintOperation = AllowedConstraintOperations.ElementAt(0);
+    }
-    [StorableConstructor]
-    protected Constraint(bool deserializing) {
+    }
     protected Constraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData)
 …
       return this.constrainedValue;
+    }
+    protected abstract bool Check(object constrainedMember);
+    protected abstract bool Check(object constrainedMember, out string errorMessage);
     public bool Check() {
       if (!Active)
 …
       return this.Check(constrainedMember);
+    }
-    protected abstract bool Check(object constrainedMember);
     public bool Check(out string errorMessage) {
       errorMessage = string.Empty;
 …
       return this.Check(constrainedMember, out errorMessage);
+    }
-    protected abstract bool Check(object constrainedMember, out string errorMessage);
     #region events

-                      r4068
+                      r4153
     [StorableConstructor]
+    protected ConstraintOperation(bool deserializing) {
+    }
+    protected ConstraintOperation(bool deserializing) { }
     protected ConstraintOperation(int value, string name) {
       this.value = value;

-                      r4068
+                      r4153
   [Item("EqualityConstraint", "A constraint which checks for equality.")]
   public class EqualityConstraint : Constraint {
-    public EqualityConstraint()
-      : base() {
+    }
     [StorableConstructor]
+    protected EqualityConstraint(bool deserializing) {
+    }
+    protected EqualityConstraint(bool deserializing) : base(deserializing) { }
+    public EqualityConstraint() : base() { }
     public EqualityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData)
       : base(constrainedValue, constraintOperation, constraintData) {

-                      r4068
+                      r4153
+    }
     [StorableConstructor]
+    protected TypeCompatibilityConstraint(bool deserializing)
+      : base() {
+    }
+    protected TypeCompatibilityConstraint(bool deserializing) : base(deserializing) { }
     public TypeCompatibilityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, Type constraintData)
       : base(constrainedValue, constraintOperation, constraintData) {

Note: See TracChangeset for help on using the changeset viewer.