Changeset 16809 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

04/18/19 08:45:53 (6 years ago)

Author:

chaider

Message:

#2971

• Added possibilty to use variables with whitespaces or derivation in constraint-definitions

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

@@ -58 +58 @@
           var targetConstraint = trimmedLine.Substring(start, end-start);
           var match = Regex.Match(targetConstraint,
-            @"([^\s]*)\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
+            @"(.*)\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
           if (match.Success) {
             if (match.Groups.Count != 8) {
@@ -88 +88 @@
         } else if (trimmedLine.StartsWith("d") || trimmedLine.StartsWith("\u2202")) {
           var match = Regex.Match(trimmedLine,
-            @"([d∂])([²³])?\s*(\S*)\s*(\/)([d∂])\s*([^²³]*)([²³])?\s*\bin\b\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
+            @"([d∂])([²³])?\s*(.*)\s+(\/)\s+([d∂])\s*([^²³]*)([²³])?\s*\bin\b\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
 
           if (match.Success) {
@@ -135 +135 @@
           continue;
         } else {
-          throw new ArgumentException("Error at your constraints definition constraints have to start with Target: | d | \u2202 | #");
+          throw new ArgumentException("Error at your constraints definition constraints have to start with (Target: | d | \u2202 | #)");
         }
       }