Changeset 16895 for branches/2971_named_intervals

Timestamp:

05/06/19 13:01:29 (6 years ago)

Author:

chaider

Message:

#2971 Changed IntervalConstraint

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs (modified) (2 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

@@ -124 +124 @@
     }
 
-    private static string UpdateExpression(IntervalConstraint constraint) {
-      var expression = "";
-
-      if (!constraint.IsDerivation) {
-        expression = string.Format("{0} in {1}{2} .. {3}{4}",
-          constraint.Variable, 
-          (constraint.InclusiveLowerBound) ? "[" : "]",
-          constraint.Interval.LowerBound,
-          constraint.Interval.UpperBound,
-          (constraint.InclusiveUpperBound) ? "]" : "[");
-      } else {
-        expression = string.Format("\u2202{5}Target/\u2202{0}{6} in {1}{2} .. {3}{4}",
-          constraint.Variable,
-          (constraint.InclusiveLowerBound) ? "[" : "]",
-          constraint.Interval.LowerBound,
-          constraint.Interval.UpperBound,
-          (constraint.InclusiveUpperBound) ? "]" : "[",
-          GetDerivationString(constraint.numberOfDerivation),
-          GetDerivationString(constraint.numberOfDerivation));
-      }
-
-      return expression;
-    }
-
-    private static string UpdateDefintion(IntervalConstraint constraint) {
-      var definition = "";
-
-      if (!constraint.IsDerivation) {
-        return "Target " + constraint.Variable;
-      }
-
-      definition = $"\u2202{GetDerivationString(constraint.numberOfDerivation)}Target/\u2202{constraint.Variable}{GetDerivationString(constraint.numberOfDerivation)}";
-
-      return definition;
-    }
-
-    private static string GetDerivationString(int derivation) {
-      switch (derivation) {
-        case 1:
-          return "";
-        case 2:
-          return "²";
-        case 3:
-          return "³";
-        default:
-          return "";
-      }
-    }
-
     #endregion
 
@@ -198 +149 @@
       if (!double.IsNaN(value)) {
         Content.Interval = new Interval(value, Content.Interval.UpperBound);
-        var exp = UpdateExpression(Content);
-        Content.Name = exp;
-        Content.Expression = exp;
       }
     }
@@ -226 +174 @@
       if (!double.IsNaN(value)) {
         Content.Interval = new Interval(Content.Interval.LowerBound, value);
-        var exp = UpdateExpression(Content);
-        Content.Name = exp;
-        Content.Expression = exp;
       }
     }
@@ -234 +179 @@
     private void incllowerboundInput_CheckedChanged(object sender, EventArgs e) {
         Content.InclusiveLowerBound = incllowerboundInput.Checked;
-        var exp = UpdateExpression(Content);
-        Content.Name = exp;
-        Content.Expression = exp;
     }
 
     private void inclupperboundInput_CheckedChanged(object sender, EventArgs e) {
         Content.InclusiveUpperBound = inclupperboundInput.Checked;
-        var exp = UpdateExpression(Content);
-        Content.Name = exp;
-        Content.Expression = exp;
     }
 
@@ -257 +196 @@
       else if ((int)numberderivationInput.SelectedItem == 3)
         Content.numberOfDerivation = 3;
-
-      var exp = UpdateExpression(Content);
-      var def = UpdateDefintion(Content);
-      Content.Name = exp;
-      Content.Expression = exp;
-      Content.Definition = def;
     }
 

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

@@ -27 +27 @@
   [StorableType("8109BE58-CCFB-4462-A2F4-EEE5DFADAFF7")]
   [Item("Interval Constraint", "Constraint on intervals.")]
-  public class IntervalConstraint : NamedItem {
+  public sealed class IntervalConstraint : Item {
     private string expression;
     [Storable]
     public string Expression {
       get => expression;
-      set {
-        if (value != expression) {
+      private set {
+        if (expression != value) {
           expression = value;
-          OnChanged(EventArgs.Empty);
-        }
-      }
-    }
-    private string definition;
-    [Storable]
+          OnChanged();
+          OnToStringChanged();
+        }
+      }
+    }
+
     public string Definition {
-      get => definition;
-      set {
-        if (value != definition) {
-          definition = value;
-          OnChanged(EventArgs.Empty);
-        }
-      }
-    }
-    [Storable]
-    public Interval Interval { get; set; }
+      get { return GetDefinitionString(); }
+    }
+
+    private string variable;
+    [Storable]
+    public string Variable {
+      get => variable;
+      private set {
+        if (variable != value) {
+          variable = value;
+          UpdateExpression();
+          OnChanged();
+        }
+      }
+    }
+
+    public bool IsDerivation {
+      get => numberOfDerivation > 0;
+    }
+
+    public int numberOfDerivation;
+    [Storable]
+    public int NumberOfDerivation {
+      get => numberOfDerivation;
+      set {
+        if (value < 0 || value > 3)
+          throw new ArgumentException("Number of derivation has to be between 0 - 3.");
+        if (value != numberOfDerivation) {
+          numberOfDerivation = value;
+          UpdateExpression();
+          OnChanged();
+        }
+      }
+    }
+
+    private Interval interval;
+    [Storable]
+    public Interval Interval {
+      get => interval;
+      set {
+        if (interval != value) {
+          interval = value;
+          UpdateExpression();
+          OnChanged();
+        }
+      }
+    }
     private bool inclusiveLowerBound;
     [Storable]
@@ -57 +94 @@
       get => inclusiveLowerBound;
       set {
-        if (value != inclusiveLowerBound) {
+        if (inclusiveLowerBound != value) {
           inclusiveLowerBound = value;
-          OnChanged(EventArgs.Empty);
-        }
-      }
-    }
-    [Storable]
-    public bool InclusiveUpperBound { get; set; }
-    [Storable]
-    public bool IsDerivation { get; set; }
-
-    private string variable;
-    [Storable]
-    public string Variable {
-      get => variable;
-      set {
-        if (value != variable) {
-          variable = value;
-          OnChanged(EventArgs.Empty);
-        }
-      }
-    }
-
-    public int numberOfDerivation;
-    [Storable]
-    public int NumberOfDerivation {
-      get => numberOfDerivation;
-      set {
-        if (value != numberOfDerivation) {
-          numberOfDerivation = value;
-          OnChanged(EventArgs.Empty);
+          UpdateExpression();
+          OnChanged();
+        }
+      }
+    }
+
+    private bool inclusiveUpperBound;
+
+    [Storable]
+    public bool InclusiveUpperBound {
+      get => inclusiveUpperBound;
+      set {
+        if (inclusiveUpperBound != value) {
+          inclusiveUpperBound = value;
+          UpdateExpression();
+          OnChanged();
         }
       }
@@ -99 +123 @@
         if (value != enabled) {
           enabled = value;
-          OnChanged(EventArgs.Empty);
+          OnChanged();
         }
       }
@@ -105 +129 @@
 
     [StorableConstructor]
-    protected IntervalConstraint(StorableConstructorFlag _) : base(_) { }
-
-    public IntervalConstraint(string expression, string definition, Interval interval, bool inclusiveLowerBound,
-      bool inclusiveUpperBound, bool isDerivation, string variable, int numberOfDerivation, bool isChecked) {
-      base.name = expression;
-      Expression = expression;
-      Definition = definition;
-      Interval = interval;
-      InclusiveLowerBound = inclusiveLowerBound;
-      InclusiveUpperBound = inclusiveUpperBound;
-      IsDerivation = isDerivation;
-      Variable = variable;
-      NumberOfDerivation = numberOfDerivation;
-      enabled = isChecked;
+    private IntervalConstraint(StorableConstructorFlag _) : base(_) { }
+
+    public IntervalConstraint(string expression, string variable, int numberOfDerivation, Interval interval, bool inclusiveLowerBound,
+      bool inclusiveUpperBound, bool enabled) : base(){
+      this.expression = expression;
+      this.variable = variable;
+      this.numberOfDerivation = numberOfDerivation;
+      this.interval = interval;
+      this.inclusiveLowerBound = inclusiveLowerBound;
+      this.inclusiveUpperBound = inclusiveUpperBound;
+      this.enabled = enabled;
     }
 
@@ -125 +146 @@
     }
 
-    protected IntervalConstraint(IntervalConstraint original, Cloner cloner)
+    private IntervalConstraint(IntervalConstraint original, Cloner cloner)
       : base(original, cloner) {
       this.Expression = original.Expression;
-      this.Definition = original.Definition;
       this.Interval = original.Interval;
       this.InclusiveLowerBound = original.InclusiveLowerBound;
       this.InclusiveUpperBound = original.InclusiveUpperBound;
-      this.IsDerivation = original.IsDerivation;
       this.Variable = original.Variable;
       this.NumberOfDerivation = original.NumberOfDerivation;
@@ -139 +158 @@
 
     public event EventHandler Changed;
-    protected virtual void OnChanged(EventArgs e) {
+    private void OnChanged() {
       EventHandler handlers = Changed;
       if (handlers != null)
-        handlers(this, e);
+        handlers(this, EventArgs.Empty);
+    }
+
+    private static string GetDerivationString(int derivation) {
+      switch (derivation) {
+        case 1:
+          return "";
+        case 2:
+          return "²";
+        case 3:
+          return "³";
+        default:
+          return "";
+      }
+    }
+
+    private void UpdateExpression() {
+      var expression = "";
+
+      if (!IsDerivation) {
+        expression = string.Format("{0} in {1}{2} .. {3}{4}",
+          Variable,
+          (InclusiveLowerBound) ? "[" : "]",
+          Interval.LowerBound,
+          Interval.UpperBound,
+          (InclusiveUpperBound) ? "]" : "[");
+        Expression = expression;
+        return;
+      } 
+      expression = string.Format("\u2202{5}Target/\u2202{0}{5} in {1}{2} .. {3}{4}",
+        Variable,
+        (InclusiveLowerBound) ? "[" : "]",
+        Interval.LowerBound,
+        Interval.UpperBound,
+        (InclusiveUpperBound) ? "]" : "[",
+        GetDerivationString(numberOfDerivation));
+        Expression = expression;
+    }
+
+    private string GetDefinitionString() {
+      if (!IsDerivation) {
+        return "Target " + Variable;
+      }
+      var definition = $"\u2202{GetDerivationString(numberOfDerivation)}Target/\u2202{Variable}{GetDerivationString(numberOfDerivation)}";
+      return definition;
+    }
+
+    public override string ToString() {
+      return Expression;
     }
   }

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

@@ -59 +59 @@
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, definition, interval, inclLowerBound, inclUpperBound, isDerivation, variable, numberOfDerivation, true);
-              constraint.Name = expression;
+              var constraint = new IntervalConstraint(expression, variable, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
 
               yield return constraint;
@@ -106 +105 @@
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, definition, interval, inclLowerBound, inclUpperBound, isDerivation, variable, numberOfDerivation, true);
-              constraint.Name = expression;
+              var constraint = new IntervalConstraint(expression, variable, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
 
               yield return constraint;