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

Timestamp:

05/06/19 14:53:28 (5 years ago)

Author:

chaider

Message:

#2971

• Added field Target to IntervalConstraint
• Prefixed Target-Item with Target:
• Removed prefixed Target: at derivations ==> show target field instead

File:

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

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

@@ -51 +51 @@
               var upperBound = ParseIntervalBounds(match.Groups[6].Value);
               var expression = "Target:" + match.Groups[0].Value;
-              var definition = "Target " + match.Groups[1].Value.Trim();
+              var parsedTarget = match.Groups[1].Value.Trim();
               var variable = match.Groups[1].Value.Trim();
               var inclLowerBound = match.Groups[3].Value.Trim() == "[";
@@ -59 +59 @@
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, variable, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
+              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
 
               yield return constraint;
@@ -96 +96 @@
               var upperBound = ParseIntervalBounds(match.Groups[11].Value);
               var expression = match.Groups[0].Value;
-              var definition = match.Groups[1].Value + match.Groups[2].Value + match.Groups[3].Value +
-                                      match.Groups[4].Value + match.Groups[5].Value + match.Groups[6].Value + match.Groups[7].Value;
+              var parsedTarget = match.Groups[3].Value.Trim();
               var isDerivation = true;
               var inclLowerBound = match.Groups[8].Value.Trim() == "[";
@@ -105 +104 @@
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, variable, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
+              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, true);
 
               yield return constraint;