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

Timestamp:

02/06/19 14:37:02 (6 years ago)

Author:

chaider

Message:

#2971
Interval-Parser:

• Changed Parser ==> after last group there can be now an infinite amount of whitepsaces
• Save userinput as property
• Save variable case-sensitive

NamedIntervals

• Changed Storable attribute from IEnumerable to KeyValuePair, because old Persistance cant handle IEnumerable

Added SymbolicRegressionConstraintAnalyzer
SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator

• Fixed checking if a given interval is in another interval

Location:

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

Files:

• IntervalConstraint.cs (modified) (1 diff)
• IntervalConstraintsParser.cs (modified) (6 diffs)

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

@@ -7 +7 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public class IntervalConstraint {
+    public string Derivaiton { get; set; }
     public string Definition { get; set; }
     public Interval Interval { get; set; }

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -14 +15 @@
     public List<IntervalConstraint> Parse(string input) {
       var options = RegexOptions.Multiline | RegexOptions.IgnoreCase;
-      var matches = Regex.Matches(input, @"^(.*)\bin\b\s*([\[\]])(.*[^\s])(\s*\.\.\s*)([^\s].*)([\[\]])\r?$", options);
+      var matches = Regex.Matches(input, @"^(.*)\bin\b\s*([\[\]])(.*[^\s])(\s*\.\.\s*)([^\s].*)([\[\]])\r?\s*$", options);
 
       for (var i = 0; i < matches.Count; ++i) {
@@ -22 +23 @@
           var definition = Regex.Replace(matches[i].Groups[1].Value, @"\s *", "");
           if (Regex.IsMatch(definition, @"\/")) {
-            var splitted = Regex.Split(definition.ToLower().Replace(" ", string.Empty), @"\/");
+            var splitted = Regex.Split(definition.Replace(" ", string.Empty), @"\/");
             var match = Regex.Match(splitted[0], @"([d∂])([0-9]|[²³])?(.*[^\s*])");
             if (match.Success) {
@@ -28 +29 @@
               intervalConstraint.Definition = match.Groups[3].Value;
               intervalConstraint.IsDerivation = true;
-              var formulation = Regex.Match(splitted[1], @"([d∂])(.*[^\s*][^²³])([²³])?");
+              var formulation = Regex.Match(splitted[1], @"([d∂])(.*[^²³])([²³])?");
               if (formulation.Success) {
                 intervalConstraint.Variable = formulation.Groups[2].Success ? formulation.Groups[2].Value : "";
@@ -38 +39 @@
             intervalConstraint.Definition = Regex.Match(definition, @".*[^.\s]*").Value;
             intervalConstraint.IsDerivation = false;
-          }     
+          }
+          intervalConstraint.Derivaiton = matches[i].Groups[0].Value;
           intervalConstraint.InclusiveLowerBound = (matches[i].Groups[2].Value == "[");
           intervalConstraint.InclusiveUpperBound = (matches[i].Groups[6].Value == "]");
@@ -62 +64 @@
           return double.NegativeInfinity;
         default: {
-          if (double.TryParse(input, out var value)) {
+          if (double.TryParse(input, NumberStyles.Any, CultureInfo.InvariantCulture, out var value)) {
             return value;
           } else {