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

Timestamp:

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

Author:

chaider

Message:

#2971

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

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs (modified) (3 diffs)

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;