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

Timestamp:

02/28/19 12:41:36 (6 years ago)

Author:

gkronber

Message:

#2971: made branch compile with current version of trunk

Location:

branches/2971_named_intervals

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraint.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Parser/IntervalConstraintsParser.cs (modified) (3 diffs)

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

@@ -4 +4 @@
 using System.Text;
 using System.Threading.Tasks;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
+  [StorableType("8109BE58-CCFB-4462-A2F4-EEE5DFADAFF7")]
   public class IntervalConstraint {
     public string Expression { get; set; }

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -27 +22 @@
             if (match.Success) {
               intervalConstraint.NumberOfDerivation = match.Groups[2].Success ? ParseDerivationCount(match.Groups[2].Value) : 1;
-              intervalConstraint.Definition = match.Groups[3].Value;
+              intervalConstraint.Definition = match.Groups[3].Value.Trim(' ', '\t', '\n', '\r');
               intervalConstraint.IsDerivation = true;
               var formulation = Regex.Match(splitted[1], @"([d∂])(.*[^²³])([²³])?");
@@ -37 +32 @@
             }
           } else {
-            intervalConstraint.Definition = Regex.Match(definition, @".*[^.\s]*").Value;
+            intervalConstraint.Definition = Regex.Match(definition, @".*[^.\s]*").Value.Trim(' ','\t','\n','\r');
             intervalConstraint.IsDerivation = false;
           }