Changeset 17891 for branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/ShapeConstraintsParser.cs

Timestamp:

03/12/21 16:41:42 (3 years ago)

Author:

gkronber

Message:

#3073 refactoring to prepare for trunk reintegration

Location:

branches/3073_IA_constraint_splitting_reintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/ShapeConstraintsParser.cs (modified) (4 diffs)

branches/3073_IA_constraint_splitting_reintegration

@@ -1 +1 @@
 bin
+TestResults

@@ -1 +1 @@
 bin
+TestResults

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/ShapeConstraintsParser.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public static class ShapeConstraintsParser {
-    public static IEnumerable<ShapeConstraint> ParseConstraints(string text, IEnumerable<string> variables) {
+    public static ShapeConstraints ParseConstraints(string text) {
       if (string.IsNullOrEmpty(text)) throw new ArgumentNullException(nameof(text));
-      if (variables == null) throw new ArgumentNullException(nameof(variables));
-      if (!variables.Any()) throw new ArgumentException("Variables are empty.", nameof(variables));
 
       var lines = text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
 
+      var sc = new ShapeConstraints();
       foreach (var line in lines) {
         var trimmedLine = line.Trim();
-        if (trimmedLine == "") continue;         //If it is a comment just continue without saving anything
+        if (trimmedLine == "") continue; // If it is a comment just continue without saving anything
         if (trimmedLine.StartsWith("#")) {
           // disabled constraints are commented
-          var constraint = ParseConstaint(trimmedLine.TrimStart('#', ' '), variables);
-          constraint.Enabled = false;
-          yield return constraint;
+          var constraint = ParseConstaint(trimmedLine.TrimStart('#', ' '));
+          sc.Add(constraint);
+          sc.SetItemCheckedState(constraint, false);
         } else {
-          yield return ParseConstaint(trimmedLine, variables);
+          var constraint = ParseConstaint(trimmedLine);
+          sc.Add(constraint);
+          sc.SetItemCheckedState(constraint, true);
         }
       }
-    }
-
-    public static ShapeConstraint ParseConstaint(string expr, IEnumerable<string> variables) {
+      return sc;
+    }
+
+    public static ShapeConstraint ParseConstaint(string expr) {
       var trimmedLine = expr.TrimStart();
       if (trimmedLine.StartsWith("f")) {
         return ParseFunctionRangeConstraint(expr);
       } else if (trimmedLine.StartsWith("d") || trimmedLine.StartsWith("∂")) {
-        return ParseDerivationConstraint(expr, variables);
+        return ParseDerivationConstraint(expr);
       } else {
         throw new
@@ -125 +127 @@
               throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
           }
-          return new ShapeConstraint(interval, regions, weight, enabled: true);
+          return new ShapeConstraint(interval, regions, weight);
         } else
-          return new ShapeConstraint(interval, weight, enabled: true);
+          return new ShapeConstraint(interval, weight);
       } else
         throw new ArgumentException("The inserted target constraint is not valid.", nameof(expr));
     }
-    public static ShapeConstraint ParseDerivationConstraint(string expr, IEnumerable<string> variables) {
+    public static ShapeConstraint ParseDerivationConstraint(string expr) {
       var match = Regex.Match(expr,
                                 @"([d∂])" +
@@ -155 +157 @@
         var derivationVariable = match.Groups["varName"].Captures[0].Value.Trim();
 
-        if (variables.All(v => v != derivationVariable))
-          throw new ArgumentException($"The given variable {derivationVariable} does not exist in the dataset.",
-                                      nameof(expr));
-
         var enumeratorNumDeriv = match.Groups["numDerivations"].Captures[0].Value.Trim();
         var denominatorNumDeriv = match.Groups["numDerivations"].Captures[1].Value.Trim();
@@ -191 +189 @@
               throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
           }
-          return new ShapeConstraint(variable, numberOfDerivation, interval, regions, weight, enabled: true);
+          return new ShapeConstraint(variable, numberOfDerivation, interval, regions, weight);
         } else
-          return new ShapeConstraint(variable, numberOfDerivation, interval, weight, enabled: true);
+          return new ShapeConstraint(variable, numberOfDerivation, interval, weight);
       } else
         throw new ArgumentException("The inserted derivation constraint is not valid.", nameof(expr));

@@ -1 +1 @@
 bin
+TestResults