Changeset 16773 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

04/09/19 14:58:24 (6 years ago)

Author:

chaider

Message:

#2971

• Fixes and updates in IntervalConstraintView
• Changed Parser

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs (modified) (3 diffs)

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

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
@@ -21 +14 @@
       set => base.Content = value;
     }
+
     public ParsedConstraintView() {
       InitializeComponent();
@@ -38 +32 @@
 
     private ItemList<IntervalConstraint> ParseConstraints(string input) {
-      ItemList<IntervalConstraint> constraints = new ItemList<IntervalConstraint>(IntervalConstraintsParser.Parse(input));
+      ItemList<IntervalConstraint> constraints = new ItemList<IntervalConstraint>(IntervalConstraintsParser.ParseInput(input, Content.TargetVariable, Content.AllowedVariables));
       return constraints;
-    }
-
-    private string ConstraintsOutput(IEnumerable<IntervalConstraint> constraints) {
-      var result = "";
-      var count = 1;
-      foreach (var constraint in constraints) {
-        result += "Constraint #" + count + ": " + Environment.NewLine;
-        result += constraint.Expression + Environment.NewLine + Environment.NewLine;
-        count++;
-      }
-
-      return result;
     }