Changeset 3613

Timestamp:

05/05/10 00:09:10 (15 years ago)

Author:

mkommend

Message:

updated Constraints (ticket #996)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ConstraintCollectionView.Designer.cs (deleted)
• HeuristicLab.Core.Views/3.3/ConstraintCollectionView.cs (deleted)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Constraints/Constraint.cs (modified) (7 diffs)
• HeuristicLab.Core/3.3/Constraints/IConstraint.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -105 +105 @@
       <DependentUpon>CheckedItemListView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ConstraintCollectionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ConstraintCollectionView.Designer.cs">
-      <DependentUpon>ConstraintCollectionView.cs</DependentUpon>
-    </Compile>
     <Compile Include="LogView.cs">
       <SubType>UserControl</SubType>

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

@@ -44 +44 @@
 
     public override IEnumerable<ConstraintOperation> AllowedConstraintOperations {
-      get { return new ConstraintOperation[6] { ConstraintOperation.Equal, ConstraintOperation.NotEqual, ConstraintOperation.Lesser, ConstraintOperation.LesserOrEqual, ConstraintOperation.Greater, ConstraintOperation.GreaterOrEqual }; }
+      get { return new ConstraintOperation[6] { ConstraintOperation.Lesser, ConstraintOperation.LesserOrEqual, ConstraintOperation.Equal, ConstraintOperation.GreaterOrEqual, ConstraintOperation.Greater, ConstraintOperation.NotEqual }; }
     }
 

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

@@ -32 +32 @@
     protected Constraint() {
       this.Active = false;
+      if (AllowedConstraintOperations != null && AllowedConstraintOperations.Count() != 0)
+        this.ConstraintOperation = AllowedConstraintOperations.ElementAt(0);
     }
     [StorableConstructor]
@@ -65 +67 @@
     public IItem ConstrainedValue {
       get { return this.constrainedValue; }
-      protected set {
+      set {
         if (value == null)
           throw new ArgumentNullException("Constraint value cannot be null.");
         if (this.constrainedValue != value) {
           this.constrainedValue = value;
+          this.OnConstrainedValueChanged();
           this.OnToStringChanged();
         }
@@ -138 +141 @@
       EventHandler handler = ActiveChanged;
       if (handler != null)
-        ActiveChanged(this, EventArgs.Empty);
+        handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler ConstrainedValueChanged;
+    protected virtual void OnConstrainedValueChanged() {
+      EventHandler handler = ConstrainedValueChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
     }
 
@@ -145 +155 @@
       EventHandler handler = ConstraintDataChanged;
       if (handler != null)
-        ActiveChanged(this, EventArgs.Empty);
+        handler(this, EventArgs.Empty);
     }
 
@@ -152 +162 @@
       EventHandler handler = ConstraintOperationChanged;
       if (handler != null)
-        ActiveChanged(this, EventArgs.Empty);
+        handler(this, EventArgs.Empty);
     }
     #endregion
@@ -158 +168 @@
     #region overriden item methods
     public override string ToString() {
-      IItem constrainedValue = GetConstrainedMember();
+      IItem constrainedMember = GetConstrainedMember();
       string s = string.Empty;
-      if (constrainedValue != null)
-        s += constrainedValue.ToString();
-      else
-        return "Could not determine constraint value.";
-
-      s += " " + ConstraintOperation.ToString() + " ";
+      if (constrainedMember != null)
+        s += constrainedMember.ToString() + " ";
+
+      if (constraintOperation != null)
+        s += ConstraintOperation.ToString() + " ";
 
       if (constraintData != null)
@@ -178 +187 @@
     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
       Constraint clone = (Constraint)base.Clone(cloner);
-      clone.constrainedValue = (IItem)cloner.Clone(this.constrainedValue);
+      clone.constrainedValue = null;  //mkommend: intentional set to null and must be reset in the clone
 
       IItem constraintDataItem = this.constraintData as IItem;

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Core {
-  public interface IConstraint: IItem{
+  public interface IConstraint : IItem {
     bool Active { get; set; }
-    IItem ConstrainedValue { get;}
+    IItem ConstrainedValue { get; set; }
     ConstraintOperation ConstraintOperation { get; set; }
     IEnumerable<ConstraintOperation> AllowedConstraintOperations { get; }
@@ -36 +36 @@
 
     event EventHandler ActiveChanged;
+    event EventHandler ConstrainedValueChanged;
     event EventHandler ConstraintDataChanged;
     event EventHandler ConstraintOperationChanged;