Changeset 16903

Timestamp:

05/07/19 11:59:07 (6 years ago)

Author:

chaider

Message:

#2971 Added variable definition without escape chars

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*(\bin\b)\s*([\[\]])\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) {
+            if (match.Groups.Count != 10) {
               throw new ArgumentException("The given target-constraint is not complete!");
             } else {
+              var targetVariable = match.Groups[1].Value.Trim();
+              if (match.Groups[1].Value.Trim().StartsWith("'") && match.Groups[1].Value.Trim().EndsWith("'")) {
+                targetVariable = targetVariable.Substring(1, targetVariable.Length - 2);
+              }
               if (target != "") {
-                if (match.Groups[1].Value.Trim() != target) {
+                if (targetVariable != target) {
                   throw new ArgumentException("The given target variable is not in the given dataset!");
                 }
               }
-              var lowerBound = ParseIntervalBounds(match.Groups[4].Value);
-              var upperBound = ParseIntervalBounds(match.Groups[6].Value);
+              var lowerBound = ParseIntervalBounds(match.Groups[6].Value);
+              var upperBound = ParseIntervalBounds(match.Groups[8].Value);
               var expression = "Target:" + match.Groups[0].Value;
               var parsedTarget = match.Groups[1].Value.Trim();
-              var variable = match.Groups[1].Value.Trim();
-              var inclLowerBound = match.Groups[3].Value.Trim() == "[";
-              var inclUpperBound = match.Groups[7].Value.Trim() == "]";
+              var variable = targetVariable;
+              var inclLowerBound = match.Groups[5].Value.Trim() == "[";
+              var inclUpperBound = match.Groups[9].Value.Trim() == "]";
               var isDerivation = false;
               var numberOfDerivation = 0;
@@ -69 +73 @@
         } else if (trimmedLine.StartsWith("d") || trimmedLine.StartsWith("\u2202")) {
           var match = Regex.Match(trimmedLine,
-            @"([d∂])([²³]?)\s*['](.*)[']\s*(\/)\s*([d∂])\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*(..)\s*(\S*)\s*([\[\]])");
 
           if (match.Success) {
-            if (match.Groups.Count != 13) {
+            if (match.Groups.Count != 17) {
               throw new ArgumentException("The given derivation-constraint is not complete");
             } else {
+              var derivationTarget = match.Groups[3].Value.Trim();
+              var derivationVariable = match.Groups[8].Value.Trim();
+
+              if (match.Groups[3].Value.Trim().StartsWith("'") && match.Groups[3].Value.Trim().EndsWith("'")) {
+                derivationTarget = derivationTarget.Substring(1, derivationTarget.Length - 2);
+              }
+              if (match.Groups[8].Value.Trim().StartsWith("'") && match.Groups[8].Value.Trim().EndsWith("'")) {
+                derivationVariable = derivationVariable.Substring(1, derivationVariable.Length - 2);
+              }
               if (target != "") {
-                if (match.Groups[3].Value != target) 
+                if (derivationTarget != target) 
                   throw new ArgumentException("The given target variable is not given in the dataset!");
               }
 
               if (variables != null && variables.Any()) {
-                if (variables.All(v => v != match.Groups[6].Value.Trim())) {
+                if (variables.All(v => v != derivationVariable)) {
                   throw new ArgumentException("The given variable does not exist in the dataset!");
                 }
               }
 
-              if (match.Groups[2].Value.Trim() != "" || match.Groups[7].Value.Trim() != "") {
-                if (match.Groups[2].Value.Trim() == "" || match.Groups[7].Value.Trim() == "")
+              if (match.Groups[2].Value.Trim() != "" || match.Groups[11].Value.Trim() != "") {
+                if (match.Groups[2].Value.Trim() == "" || match.Groups[11].Value.Trim() == "")
                   throw new ArgumentException("Number of derivation has to be written on both sides!");
-                if (match.Groups[2].Value.Trim() != match.Groups[7].Value.Trim())
+                if (match.Groups[2].Value.Trim() != match.Groups[11].Value.Trim())
                   throw new ArgumentException("Derivation number is not equal on both sides!");
               }
 
-              var lowerBound = ParseIntervalBounds(match.Groups[9].Value);
-              var upperBound = ParseIntervalBounds(match.Groups[11].Value);
+              var lowerBound = ParseIntervalBounds(match.Groups[13].Value);
+              var upperBound = ParseIntervalBounds(match.Groups[15].Value);
               var expression = match.Groups[0].Value;
-              var parsedTarget = match.Groups[3].Value.Trim();
+              var parsedTarget = derivationTarget;
               var isDerivation = true;
-              var inclLowerBound = match.Groups[8].Value.Trim() == "[";
-              var inclUpperBound = match.Groups[12].Value.Trim() == "]";
-              var variable = match.Groups[6].Value.Trim();
+              var inclLowerBound = match.Groups[12].Value.Trim() == "[";
+              var inclUpperBound = match.Groups[16].Value.Trim() == "]";
+              var variable = derivationVariable;
               var numberOfDerivation = ParseDerivationCount(match.Groups[2].Value.Trim());
               var interval = new Interval(lowerBound, upperBound);