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

Timestamp:

04/23/19 13:21:08 (6 years ago)

Author:

chaider

Message:

#2971 Added variable block-symbol (') for constraint parser

File:

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

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

@@ -78 +78 @@
           var targetConstraint = trimmedLine.Substring(start, end-start);
           var match = Regex.Match(targetConstraint,
-            @"(.*)\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) {
@@ -108 +108 @@
         } 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*([²³]?)\s*\bin\b\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
 
           if (match.Success) {