Changeset 16778

Timestamp:

04/12/19 13:09:17 (6 years ago)

Author:

chaider

Message:

#2971

• Changed field numberOfDerivation
• Added numberOfDerivation to Expression string
• Added numberOfDerivation to parser

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.Designer.cs (modified) (8 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/ParsedConstraint.cs (modified) (3 diffs)

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

@@ -37 +37 @@
       this.lowerboundInput = new System.Windows.Forms.TextBox();
       this.variableInput = new System.Windows.Forms.TextBox();
-      this.numberderivationInput = new System.Windows.Forms.TextBox();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
       this.ischeckedCheckBox = new System.Windows.Forms.CheckBox();
@@ -46 +45 @@
       this.derivationInput = new System.Windows.Forms.CheckBox();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+      this.numberderivationInput = new System.Windows.Forms.ComboBox();
       this.groupBox1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -162 +162 @@
       this.variableInput.TabIndex = 15;
       // 
-      // numberderivationInput
-      // 
-      this.numberderivationInput.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.numberderivationInput.Location = new System.Drawing.Point(111, 221);
-      this.numberderivationInput.Name = "numberderivationInput";
-      this.numberderivationInput.Size = new System.Drawing.Size(470, 20);
-      this.numberderivationInput.TabIndex = 17;
-      this.numberderivationInput.Validating += new System.ComponentModel.CancelEventHandler(this.numberderivationInput_Validating);
-      this.numberderivationInput.Validated += new System.EventHandler(this.numberderivationInput_Validated);
-      // 
       // groupBox1
       // 
+      this.groupBox1.Controls.Add(this.numberderivationInput);
       this.groupBox1.Controls.Add(this.ischeckedCheckBox);
       this.groupBox1.Controls.Add(this.expressionInput);
@@ -181 +171 @@
       this.groupBox1.Controls.Add(this.incllowerboundInput);
       this.groupBox1.Controls.Add(this.derivationInput);
-      this.groupBox1.Controls.Add(this.numberderivationInput);
       this.groupBox1.Controls.Add(this.variableInput);
       this.groupBox1.Controls.Add(this.lowerboundInput);
@@ -217 +206 @@
       this.expressionInput.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.expressionInput.Location = new System.Drawing.Point(108, 17);
+      this.expressionInput.Location = new System.Drawing.Point(111, 17);
       this.expressionInput.Name = "expressionInput";
       this.expressionInput.Size = new System.Drawing.Size(473, 20);
@@ -264 +253 @@
       this.errorProvider.ContainerControl = this;
       this.errorProvider.RightToLeft = true;
+      // 
+      // numberderivationInput
+      // 
+      this.numberderivationInput.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.numberderivationInput.FormattingEnabled = true;
+      this.numberderivationInput.Location = new System.Drawing.Point(111, 224);
+      this.numberderivationInput.Name = "numberderivationInput";
+      this.numberderivationInput.Size = new System.Drawing.Size(470, 21);
+      this.numberderivationInput.TabIndex = 27;
+      this.numberderivationInput.SelectedIndexChanged += new System.EventHandler(this.numberderivationInput_SelectedIndexChanged);
       // 
       // IntervalConstraintView
@@ -291 +291 @@
     private System.Windows.Forms.TextBox lowerboundInput;
     private System.Windows.Forms.TextBox variableInput;
-    private System.Windows.Forms.TextBox numberderivationInput;
     private System.Windows.Forms.GroupBox groupBox1;
     private System.Windows.Forms.CheckBox derivationInput;
@@ -300 +299 @@
     private System.Windows.Forms.ErrorProvider errorProvider;
     private System.Windows.Forms.CheckBox ischeckedCheckBox;
+    private System.Windows.Forms.ComboBox numberderivationInput;
   }
 }

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

@@ -25 +25 @@
     public IntervalConstraintView() {
       InitializeComponent();
+      int [] items = {1, 2, 3};
       expressionInput.ReadOnly = true;
       definitionInput.ReadOnly = true;
       derivationInput.Enabled = false;
       derivationInput.Checked = Content?.IsDerivation ?? false;
-      if (Content != null && !Content.IsDerivation)
-        numberderivationInput.ReadOnly = true;
+      numberderivationInput.DataSource = items;
     }
 
@@ -85 +85 @@
         derivationInput.Checked = Content.IsDerivation;
         variableInput.Text = Content.Variable;
-        numberderivationInput.Text = Content.NumberOfDerivation.ToString();
+        if (!Content.IsDerivation) {
+          numberderivationInput.Enabled = false;
+        } else {
+          numberderivationInput.Enabled = true;
+          numberderivationInput.SelectedItem = Content.NumberOfDerivation;
+        }
         ischeckedCheckBox.Checked = Content.IsChecked;
-        //Content.Changed += Content_Changed;
-
+        Content.Changed += Content_Changed;
       }
       SetEnabledStateOfControls();
@@ -104 +108 @@
           (Content.InclusiveUpperBound) ? "]" : "[");
       } else {
-        expression = string.Format("\u2202Target/\u2202{0} in {1}{2} .. {3}{4}",
+        expression = string.Format("\u2202{5}Target/\u2202{0}{6} in {1}{2} .. {3}{4}",
           Content.Variable,
           (Content.InclusiveLowerBound) ? "[" : "]",
           Content.Interval.LowerBound,
           Content.Interval.UpperBound,
-          (Content.InclusiveUpperBound) ? "]" : "[");
+          (Content.InclusiveUpperBound) ? "]" : "[",
+          PrintNumberOfDerivation(Content.numberOfDerivation),
+          PrintNumberOfDerivation(Content.numberOfDerivation));
       }
 
@@ -117 +123 @@
     }
 
+    private string PrintNumberOfDerivation(int derivation) {
+      switch (derivation) {
+        case 1:
+          return "";
+        case 2:
+          return "²";
+        case 3:
+          return "³";
+        default:
+          return "";
+      }
+    }
+
     #endregion
 
     #region control event handlers
-
-    private void numberderivationInput_Validating(object sender, CancelEventArgs e) {
-      if (int.TryParse(numberderivationInput.Text, out var derivation)) {
-        if (derivation >= 0) {
-          errorProvider.SetError(numberderivationInput, string.Empty);
-          e.Cancel = false;
-        } else {
-          errorProvider.SetError(numberderivationInput, "Invalid Input: Derivation must be positive!");
-          e.Cancel = true;
-        }
-      } else {
-        errorProvider.SetError(numberderivationInput, "Invalid Input: Derivation must be an integer!");
-        e.Cancel = true;
-      }
-    }
-
-    private void numberderivationInput_Validated(object sender, EventArgs e) {
-      if (int.TryParse(numberderivationInput.Text, out var derivation)) {
-        Content.NumberOfDerivation = derivation;
-        UpdateExpression();
-      }
-    }
-
     private void lowerboundInput_Validating(object sender, CancelEventArgs e) {
       var value = ParseDoubleValue(lowerboundInput.Text, lowerboundInput);
@@ -212 +208 @@
     }
 
+    private void numberderivationInput_SelectedIndexChanged(object sender, EventArgs e) {
+      if ((int)numberderivationInput.SelectedItem == 1)
+        Content.numberOfDerivation = 1;
+      else if ((int)numberderivationInput.SelectedItem == 2)
+        Content.numberOfDerivation = 2;
+      else if ((int)numberderivationInput.SelectedItem == 3)
+        Content.numberOfDerivation = 3;
+
+      UpdateExpression();
+    }
+
     #endregion
 
@@ -221 +228 @@
 
     #endregion
+
+
   }
 }

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

@@ -35 +35 @@
       if (constraintsInput.Text != null) {
         intervalConstraints = ParseConstraints(constraintsInput.Text);
+        intervalConstraints.CheckedItemsChanged -= constraints_CheckedItemsChanged;
         intervalConstraints.CheckedItemsChanged += constraints_CheckedItemsChanged;
         constraintsOutput.Content = intervalConstraints;

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

@@ -47 +47 @@
       }
     }
-    public int NumberOfDerivation { get; set; }
+
+    public int numberOfDerivation;
+    public int NumberOfDerivation {
+      get => numberOfDerivation;
+      set {
+        if (value != numberOfDerivation) {
+          numberOfDerivation = value;
+          OnChanged(EventArgs.Empty);
+        }
+      }
+    }
 
     private bool isChecked;

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

@@ -71 +71 @@
               var upperBound = ParseIntervalBounds(match.Groups[6].Value);
               var constraint = new IntervalConstraint(match.Groups[0].Value);
-              constraint.Expression = match.Groups[0].Value;
-              constraint.Definition = "";
+              constraint.Expression = "Target " + match.Groups[0].Value;
+              constraint.Definition = "Target " + match.Groups[1].Value.Trim();
               constraint.Variable = match.Groups[1].Value.Trim();
               constraint.InclusiveLowerBound = match.Groups[3].Value.Trim() == "[";
@@ -122 +122 @@
               constraint.InclusiveUpperBound = match.Groups[12].Value.Trim() == "]";
               constraint.Variable = match.Groups[6].Value.Trim();
-              constraint.NumberOfDerivation = ParseDerivationCount(match.Groups[2].Value);
+              constraint.NumberOfDerivation = ParseDerivationCount(match.Groups[2].Value.Trim());
               constraint.Interval = new Interval(lowerBound, upperBound);
 
@@ -160 +160 @@
     private static int ParseDerivationCount(string input) {
       switch (input) {
+        case "":
+          return 1;
         case "²":
           return 2;

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

@@ -10 +10 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
+  [StorableType("A56BFB05-8F11-4766-9FBF-20C7010F1CA3")]
   [Item("ParsedConstraint", "Represents parsed constraints.")]
   public class ParsedConstraint : Item {
@@ -22 +24 @@
 
     protected IEnumerable<IntervalConstraint> constraints;
-
     public IEnumerable<IntervalConstraint> Constraints {
       get => constraints;
@@ -32 +33 @@
 
     protected IRegressionProblemData problemData;
-
     public IRegressionProblemData ProblemData {
       get => problemData;