Changeset 3598

Timestamp:

05/03/10 17:43:58 (14 years ago)

Author:

mkommend

Message:

changed ctors of constraints (ticket #996)

Location:

trunk/sources/HeuristicLab.Data/3.3/Constraints

Files:

• ComparisonConstraint.cs (modified) (2 diffs)
• ComparisonOperation.cs (modified) (1 diff)
• Constraint.cs (modified) (2 diffs)
• EqualityConstraint.cs (modified) (2 diffs)
• IConstraint.cs (modified) (1 diff)
• TypeConstraint.cs (modified) (2 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Data.Constraints {
+namespace HeuristicLab.Data {
   [StorableClass]
   [Item("ComparisonConstraint", "A constraint which checks for specified compare operation.")]
@@ -39 +39 @@
     }
 
-    public ComparisonConstraint(IItem constrainedValue)
-      : base(constrainedValue) {
+    public ComparisonConstraint(IItem constrainedValue, ComparisonOperation comparisonOperation, object comparisonValue)
+      : base() {
+      this.ConstrainedValue = constrainedValue;
+      this.ComparisonOperation = comparisonOperation;
+      this.ComparisonValue = comparisonValue;
     }
 

trunk/sources/HeuristicLab.Data/3.3/Constraints/ComparisonOperation.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-[StorableClass]
-public sealed class ComparisonOperation {
-  public static readonly ComparisonOperation Equal = new ComparisonOperation(0, "Equal");
-  public static readonly ComparisonOperation NotEqual = new ComparisonOperation(1, "Not equal");
-  public static readonly ComparisonOperation Lesser = new ComparisonOperation(2, "Lesser");
-  public static readonly ComparisonOperation LesserOrEqual = new ComparisonOperation(3, "Lesser or equal");
-  public static readonly ComparisonOperation Greater = new ComparisonOperation(4, "Greater");
-  public static readonly ComparisonOperation GreaterOrEqual = new ComparisonOperation(5, "Greater or equal");
-  public static readonly ComparisonOperation IsTypeOf = new ComparisonOperation(6, "Is type of");
-  public static readonly ComparisonOperation IsNotTypeOf = new ComparisonOperation(7, "Is not type of");
+namespace HeuristicLab.Data {
+  [StorableClass]
+  public sealed class ComparisonOperation {
+    public static readonly ComparisonOperation Equal = new ComparisonOperation(0, "Equal");
+    public static readonly ComparisonOperation NotEqual = new ComparisonOperation(1, "Not equal");
+    public static readonly ComparisonOperation Lesser = new ComparisonOperation(2, "Lesser");
+    public static readonly ComparisonOperation LesserOrEqual = new ComparisonOperation(3, "Lesser or equal");
+    public static readonly ComparisonOperation Greater = new ComparisonOperation(4, "Greater");
+    public static readonly ComparisonOperation GreaterOrEqual = new ComparisonOperation(5, "Greater or equal");
+    public static readonly ComparisonOperation IsTypeOf = new ComparisonOperation(6, "Is type of");
+    public static readonly ComparisonOperation IsNotTypeOf = new ComparisonOperation(7, "Is not type of");
 
-  [Storable]
-  private int value;
-  [Storable]
-  private string name;
-  [StorableConstructor]
-  private ComparisonOperation() {
-    value = -1;
-    name = "empty";
-  }
-  private ComparisonOperation(int value, string name) {
-    this.value = value;
-    this.name = name;
-  }
+    [Storable]
+    private int value;
+    [Storable]
+    private string name;
+    [StorableConstructor]
+    private ComparisonOperation() {
+      value = -1;
+      name = "empty";
+    }
+    private ComparisonOperation(int value, string name) {
+      this.value = value;
+      this.name = name;
+    }
 
-  public override string ToString() {
-    return name;
-  }
+    public override string ToString() {
+      return name;
+    }
 
-  public override bool Equals(object obj) {
-    if (obj is ComparisonOperation)
-      return this == (ComparisonOperation)obj;
+    public override bool Equals(object obj) {
+      if (obj is ComparisonOperation)
+        return this == (ComparisonOperation)obj;
 
-    return false;
-  }
-  public override int GetHashCode() {
-    return value;
-  }
-  public static bool operator ==(ComparisonOperation co1, ComparisonOperation co2) {
-    return co1.value == co2.value;
-  }
-  public static bool operator !=(ComparisonOperation co1, ComparisonOperation co2) {
-    return !(co1 == co2);
+      return false;
+    }
+    public override int GetHashCode() {
+      return value;
+    }
+    public static bool operator ==(ComparisonOperation co1, ComparisonOperation co2) {
+      return co1.value == co2.value;
+    }
+    public static bool operator !=(ComparisonOperation co1, ComparisonOperation co2) {
+      return !(co1 == co2);
+    }
   }
 }

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

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Data.Constraints {
+namespace HeuristicLab.Data {
   [StorableClass]
   public abstract class Constraint : Item, IConstraint {
@@ -39 +39 @@
     }
 
-    public Constraint(IItem constrainedValue)
+    public Constraint(IItem constrainedValue,ComparisonOperation comparisonOperation, object comparisonValue)
       : this() {
       this.ConstrainedValue = constrainedValue;
+      this.ComparisonOperation = comparisonOperation;
+      this.ComparisonValue = comparisonValue;
     }
 

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

@@ -28 +28 @@
 using HeuristicLab.Common;
 
-namespace HeuristicLab.Data.Constraints {
+namespace HeuristicLab.Data {
   [StorableClass]
   [Item("EqualityConstraint", "A constraint which checks for equality")]
@@ -40 +40 @@
     }
 
-    public EqualityConstraint(IItem constrainedValue)
-      : base(constrainedValue) {
+    public EqualityConstraint(IItem constrainedValue, ComparisonOperation comparisonOperation, object compareValue)
+      : base() {
+      this.ConstrainedValue = constrainedValue;
+      this.ComparisonOperation = comparisonOperation;
+      this.ComparisonValue = ComparisonValue;
     }
 

trunk/sources/HeuristicLab.Data/3.3/Constraints/IConstraint.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Data.Constraints {
+namespace HeuristicLab.Data {
   public interface IConstraint: IItem{
     bool Active { get; set; }

trunk/sources/HeuristicLab.Data/3.3/Constraints/TypeConstraint.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 
-namespace HeuristicLab.Data.Constraints {
+namespace HeuristicLab.Data {
   [StorableClass]
   [Item("TypeConstraint", "A constraint which checks the types for specified compare operation.")]
@@ -39 +39 @@
     }
 
-    public TypeConstraint(IItem constrainedValue)
-      : base(constrainedValue) {
+    public TypeConstraint(IItem constrainedValue, ComparisonOperation comparisonOperation, Type comparisonValue)
+      : base() {
+      this.ConstrainedValue = constrainedValue;
+      this.ComparisonOperation = comparisonOperation;
+      this.ComparisonValue = comparisonValue;
     }