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

Timestamp:

03/26/19 11:37:29 (6 years ago)

Author:

bburlacu

Message:

#2971: Make IntervalConstraintsParser class static, adapt code. Add SymbolicRegressionConstraintSatisfactionEvaluator.

File:

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

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

@@ -5 +5 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class IntervalConstraintsParser {
-    public IntervalConstraintsParser() {}
-    private List<IntervalConstraint> intervalConstraints = new List<IntervalConstraint>();
-    public List<IntervalConstraint> Parse(string input) {
+  public static class IntervalConstraintsParser {
+    public static IEnumerable<IntervalConstraint> Parse(string input) {
       var options = RegexOptions.Multiline | RegexOptions.IgnoreCase;
       var matches = Regex.Matches(input, @"^(.*)\bin\b\s*([\[\]])(.*[^\s])(\s*\.\.\s*)([^\s].*)([\[\]])\r?\s*$", options);
 
       for (var i = 0; i < matches.Count; ++i) {
-        if (matches[i].Groups.Count == 7) { 
+        if (matches[i].Groups.Count == 7) {
           var intervalConstraint = new IntervalConstraint();
           //pattern 1 = defintion
@@ -38 +36 @@
           intervalConstraint.InclusiveLowerBound = (matches[i].Groups[2].Value == "[");
           intervalConstraint.InclusiveUpperBound = (matches[i].Groups[6].Value == "]");
-          intervalConstraint.Interval = new Interval(ParseIntervalBounds(matches[i].Groups[3].Value.Replace(" ", string.Empty)), 
+          intervalConstraint.Interval = new Interval(ParseIntervalBounds(matches[i].Groups[3].Value.Replace(" ", string.Empty)),
             ParseIntervalBounds(matches[i].Groups[5].Value.Replace(" ", string.Empty)));
 
-          intervalConstraints.Add(intervalConstraint);
+          yield return intervalConstraint;
         } else {
           throw new ArgumentException($"The given constraint: {matches[i].Value} is not valid.");
         }
       }
-
-      return intervalConstraints;
     }
 
@@ -59 +55 @@
           return double.NegativeInfinity;
         default: {
-          if (double.TryParse(input, NumberStyles.Any, CultureInfo.InvariantCulture, out var value)) {
-            return value;
-          } else {
-            throw new ArgumentException("The given Interval in the constraint is not valid.");
+            if (double.TryParse(input, NumberStyles.Any, CultureInfo.InvariantCulture, out var value)) {
+              return value;
+            } else {
+              throw new ArgumentException("The given Interval in the constraint is not valid.");
+            }
           }
-        }
       }
     }