Changeset 17146

Timestamp:

07/22/19 13:39:09 (5 years ago)

Author:

mkommend

Message:

#2971: Renamed views and updated error messages in constraint parser.

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.designer.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs) (6 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs (modified) (7 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs (modified) (2 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -325 +325 @@
       <DependentUpon>ModifiableDatasetView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ParsedConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ParsedConstraintView.designer.cs">
-      <DependentUpon>ParsedConstraintView.cs</DependentUpon>
+    <Compile Include="ProblemDataConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ProblemDataConstraintView.designer.cs">
+      <DependentUpon>ProblemDataConstraintView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />

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

@@ -29 +29 @@
   [View("ParsedConstraint View")]
   [Content(typeof(ProblemDataConstraint), true)]
-  public partial class ParsedConstraintView : AsynchronousContentView {
-    private CheckedItemList<IntervalConstraint> intervalConstraints;
+  public partial class ProblemDataConstraintView : AsynchronousContentView {
+    private readonly CheckedItemList<IntervalConstraint> intervalConstraints = new CheckedItemList<IntervalConstraint>();
     public new ProblemDataConstraint Content {
       get => (ProblemDataConstraint)base.Content;
@@ -36 +36 @@
     }
 
-    public ParsedConstraintView() {
+    public ProblemDataConstraintView() {
       InitializeComponent();
       errorOutput.Text = "";
-      intervalConstraints = new CheckedItemList<IntervalConstraint>();
     }
 
@@ -88 +87 @@
       if (Content == null) {
         intervalConstraints.Clear();
-        constraintsOutput.Content = intervalConstraints;
+        intervalConstraintsView.Content = intervalConstraints;
       } else {
         intervalConstraints.Clear();
@@ -96 +95 @@
         }
 
-        constraintsOutput.Content = intervalConstraints;
+        intervalConstraintsView.Content = intervalConstraints;
       }
     }
 
     private void constraint_Changed(object sender, EventArgs e) {
-      var constraint = (IntervalConstraint) sender;
+      var constraint = (IntervalConstraint)sender;
       intervalConstraints.SetItemCheckedState(constraint, constraint.Enabled);
     }
@@ -119 +118 @@
     private void constraint_CheckedItemChanged(object sender,
       CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {
-      ICheckedItemList<IntervalConstraint> checkedItemList = (ICheckedItemList<IntervalConstraint>) sender;
+      ICheckedItemList<IntervalConstraint> checkedItemList = (ICheckedItemList<IntervalConstraint>)sender;
       foreach (var indexedItem in e.Items) {
         indexedItem.Value.Enabled = checkedItemList.ItemChecked(indexedItem.Value);

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.designer.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  partial class ParsedConstraintView {
+  partial class ProblemDataConstraintView {
     /// <summary> 
     /// Required designer variable.
@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ParsedConstraintView));
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProblemDataConstraintView));
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -52 +52 @@
       this.parseBtn = new System.Windows.Forms.Button();
       this.label1 = new System.Windows.Forms.Label();
-      //this.constraintsOutput = new System.Windows.Forms.Label();
-      this.constraintsOutput = new HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint>();
+      this.intervalConstraintsView = new HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint>();
       this.errorOutput = new System.Windows.Forms.Label();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -74 +73 @@
       // splitContainer1.Panel2
       // 
-      this.splitContainer1.Panel2.Controls.Add(this.constraintsOutput);
+      this.splitContainer1.Panel2.Controls.Add(this.intervalConstraintsView);
       this.splitContainer1.Size = new System.Drawing.Size(888, 629);
       this.splitContainer1.SplitterDistance = 296;
@@ -136 +135 @@
                          "5. Follow the steps 3-5 from above";
       // 
-      // constraintsOutput
+      // intervalConstraintsView
       // 
-      this.constraintsOutput.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.constraintsOutput.Location = new System.Drawing.Point(3, 16);
-      this.constraintsOutput.Name = "constraintsOutput";
-      this.constraintsOutput.Size = new System.Drawing.Size(582, 587);
-      this.constraintsOutput.TabIndex = 2;
+      this.intervalConstraintsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.intervalConstraintsView.Location = new System.Drawing.Point(3, 16);
+      this.intervalConstraintsView.Name = "intervalConstraintsView";
+      this.intervalConstraintsView.Size = new System.Drawing.Size(582, 587);
+      this.intervalConstraintsView.TabIndex = 2;
       // 
       // errorOutput
@@ -178 +177 @@
     private System.Windows.Forms.Button parseBtn;
     private System.Windows.Forms.Label label1;
+    private HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint> intervalConstraintsView;
     private System.Windows.Forms.TextBox constraintsInput;
     private System.Windows.Forms.Label errorOutput;
 
-    //private System.Windows.Forms.Label constraintsOutput;
-    private HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint> constraintsOutput;
   }
 }

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

@@ -28 +28 @@
   public static class IntervalConstraintsParser {
 
-    public static IEnumerable<IntervalConstraint> ParseInput(string input, string target = "", IEnumerable<string> variables = null) {
-      var lines = input.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+    public static IEnumerable<IntervalConstraint> ParseInput(string inputText, string target, IEnumerable<string> variables) {
+
+      if (string.IsNullOrEmpty(inputText)) throw new ArgumentNullException("No input text has been provided.");
+      if (string.IsNullOrEmpty(target)) throw new ArgumentNullException("No target variable has been provided.");
+      if (variables == null) throw new ArgumentNullException("No variables have been provided.");
+      if (!variables.Any()) throw new ArgumentException("Varialbes are empty.");
+
+      var lines = inputText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
       foreach (var line in lines) {
         var trimmedLine = line.TrimStart();
@@ -36 +42 @@
           var start = "Target:".Length;
           var end = trimmedLine.Length;
-          var targetConstraint = trimmedLine.Substring(start, end-start);
+          var targetConstraint = trimmedLine.Substring(start, end - start);
           var match = Regex.Match(targetConstraint,
             @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
           if (match.Success) {
             if (match.Groups.Count != 10) {
-              throw new ArgumentException("The given target-constraint is not complete!");
+              throw new ArgumentException("The target-constraint is not complete.");
             } else {
               var targetVariable = match.Groups[1].Value.Trim();
@@ -47 +53 @@
                 targetVariable = targetVariable.Substring(1, targetVariable.Length - 2);
               }
-              if (target != "") {
-                if (targetVariable != target) {
-                  throw new ArgumentException("The given target variable is not in the given dataset!");
-                }
+
+              if (targetVariable != target) {
+                throw new ArgumentException($"The target variable {targetVariable}  does not match the provided target {target}.");
               }
+
               var lowerBound = ParseIntervalBounds(match.Groups[6].Value);
               var upperBound = ParseIntervalBounds(match.Groups[8].Value);
@@ -68 +74 @@
             }
           } else {
-            throw new ArgumentException("The inserted target constraint is not valid!");
+            throw new ArgumentException("The inserted target constraint is not valid.");
           }
           //Check for derivation
@@ -77 +83 @@
           if (match.Success) {
             if (match.Groups.Count != 17) {
-              throw new ArgumentException("The given derivation-constraint is not complete");
+              throw new ArgumentException("The given derivation-constraint is not complete.");
             } else {
               var derivationTarget = match.Groups[3].Value.Trim();
@@ -88 +94 @@
                 derivationVariable = derivationVariable.Substring(1, derivationVariable.Length - 2);
               }
-              if (target != "") {
-                if (derivationTarget != target) 
-                  throw new ArgumentException("The given target variable is not given in the dataset!");
+
+              if (derivationTarget != target) {
+                throw new ArgumentException($"The target variable {derivationTarget}  does not match the provided target {target}.");
               }
 
-              if (variables != null && variables.Any()) {
-                if (variables.All(v => v != derivationVariable)) {
-                  throw new ArgumentException("The given variable does not exist in the dataset!");
-                }
+              if (variables.All(v => v != derivationVariable)) {
+                throw new ArgumentException($"The given variable {derivationVariable} does not exist in the dataset.");
               }
 
               if (match.Groups[2].Value.Trim() != "" || match.Groups[11].Value.Trim() != "") {
                 if (match.Groups[2].Value.Trim() == "" || match.Groups[11].Value.Trim() == "")
-                  throw new ArgumentException("Number of derivation has to be written on both sides!");
+                  throw new ArgumentException("Number of derivation has to be written on both sides.");
                 if (match.Groups[2].Value.Trim() != match.Groups[11].Value.Trim())
-                  throw new ArgumentException("Derivation number is not equal on both sides!");
+                  throw new ArgumentException("Derivation number is not equal on both sides.");
               }
 
@@ -122 +126 @@
             }
           } else {
-            throw new ArgumentException("The inserted derivation constraint is not valid!");
+            throw new ArgumentException("The inserted derivation constraint is not valid.");
           }
           //Check for comment

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

@@ -24 +24 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableType("A56BFB05-8F11-4766-9FBF-20C7010F1CA3")]
-  [Item("ParsedConstraint", "Represents parsed constraints.")]
+  [Item("ProblemDataConstraints", "Represents constraints associated with a problem data.")]
   public class ProblemDataConstraint : Item {
     private static readonly string exampleInput = "# Example for a target variable constraint:" + Environment.NewLine +
@@ -76 +76 @@
     }
 
-    public ProblemDataConstraint() :base () {
+    public ProblemDataConstraint() : base() {
       this.Input = exampleInput;
       this.constraints = new List<IntervalConstraint>();