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

Timestamp:

05/15/19 13:45:51 (6 years ago)

Author:

chaider

Message:

#2971 Fixed parsing of seperator between lower- and upper-bound to match exactly two points

File:

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

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

@@ -38 +38 @@
           var targetConstraint = trimmedLine.Substring(start, end-start);
           var match = Regex.Match(targetConstraint,
-            @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
+            @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
           if (match.Success) {
             if (match.Groups.Count != 10) {
@@ -73 +73 @@
         } else if (trimmedLine.StartsWith("d") || trimmedLine.StartsWith("\u2202")) {
           var match = Regex.Match(trimmedLine,
-            @"([d∂])([²³]?)\s*(['](.*)[']|(.*[^\s]))\s*(\/)\s*([d∂])\s*(['](.*)[']|(.*[^\s²³]))\s*([²³]?)\s*\bin\b\s*([\[\]])\s*(\S*)\s*(..)\s*(\S*)\s*([\[\]])");
+            @"([d∂])([²³]?)\s*(['](.*)[']|(.*[^\s]))\s*(\/)\s*([d∂])\s*(['](.*)[']|(.*[^\s²³]))\s*([²³]?)\s*\bin\b\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
 
           if (match.Success) {