Changeset 16776 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/12/19 07:48:00 (6 years ago)

Author:

chaider

Message:

#2971

• Added Expression change event
• Added errorProvider Validation

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/Parser/IntervalConstraint.cs (modified) (1 diff)
• Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)
• ParsedConstraint.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs

@@ -12 +12 @@
   [Item("Interval Constraint", "Constraint on intervals.")]
   public class IntervalConstraint : NamedItem {
-    public string Expression { get; set; }
+    private string expression;
+    public string Expression {
+      get => expression;
+      set {
+        if (value != expression) {
+          expression = value;
+        }
+      }
+    }
     public string Definition { get; set; }
     public Interval Interval { get; set; }
-    public bool InclusiveLowerBound { get; set; }
+    private bool inclusiveLowerBound;
+
+    public bool InclusiveLowerBound {
+      get => inclusiveLowerBound;
+      set {
+        if (value != inclusiveLowerBound) {
+          inclusiveLowerBound = value;
+          OnChanged(EventArgs.Empty);
+        }
+      }
+    }
     public bool InclusiveUpperBound { get; set; }
     public bool IsDerivation { get; set; }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -181 +181 @@
                            "#double: upperbound of the interval" + Environment.NewLine +
                            "#bracket: open or closed regarding to open or closed interval definition" + Environment.NewLine +
-                           "#Y2 in [0 .. 1.2]" + Environment.NewLine + Environment.NewLine +
+                           "#Target:Y2 in [0 .. 1.2]" + Environment.NewLine + Environment.NewLine +
                            "#Constraints on model parameters:" + Environment.NewLine +
                            "#derivation symbol: d or ∂" + Environment.NewLine +

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs

@@ -25 +25 @@
     public IEnumerable<IntervalConstraint> Constraints {
       get => constraints;
-      set => constraints = value;
-    }
+      set { 
+        constraints = value;
+        OnChanged(EventArgs.Empty);
+      }
+  }
 
     protected IRegressionProblemData problemData;
@@ -38 +41 @@
       : base(original, cloner) {
       this.input = original.Input ?? string.Empty;
-      this.constraints = original.Constraints ?? new ItemList<IntervalConstraint>();
+      this.constraints = original.Constraints ?? new CheckedItemList<IntervalConstraint>();
       
     }
@@ -48 +51 @@
     public ParsedConstraint() {
       this.input = string.Empty;
-      this.constraints = new ItemList<IntervalConstraint>();
+      this.constraints = new CheckedItemList<IntervalConstraint>();
     }
 
     public ParsedConstraint(string input, IRegressionProblemData problemData) {
       this.input = input;
-      this.constraints = new ItemList<IntervalConstraint>();
+      this.constraints = new CheckedItemList<IntervalConstraint>();
       this.problemData = problemData;
     }
@@ -61 +64 @@
       this.constraints = constraints;
     }
+
+    public event EventHandler Changed;
+    protected virtual void OnChanged(EventArgs e) {
+      EventHandler handlers = Changed;
+      if (handlers != null)
+        handlers(this, e);
+    }
   }
 }