Changeset 17768 for branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs

Timestamp:

10/02/20 11:36:34 (4 years ago)

Author:

chaider

Message:

#3073

• Removed Region class and used IntervallCollection instead
• Changed Parser to work with IntervalColletions
• Moved CheckConstraint methods from Analyzer to IntervalUtil class
• Added CheckConstraint method to interface to check if an interval is in a given constraint
• Added possibility to stop splitting as soon as a constraint is fulfiled

File:

• branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs (modified) (3 diffs)

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs

@@ -93 +93 @@
             if (match.Groups[10].Success)
             {
-              IList<Region> regions = new List<Region>();
+              IntervalCollection regions = new IntervalCollection();
               // option variables found
               for(int idx = 0; idx < match.Groups[10].Captures.Count; ++idx)
               {
-                Region region = ParseRegion(
+                KeyValuePair<string, Interval> region = ParseRegion(
                   match.Groups[11].Captures[idx].Value,
                   match.Groups[13].Captures[idx].Value,
                   match.Groups[15].Captures[idx].Value);
-                if(!regions.Any(r => r.VariableName == region.VariableName))
-                  regions.Add(region);
+                if (regions.GetReadonlyDictionary().All(r => r.Key != region.Key))
+                  regions.AddInterval(region.Key, region.Value);
                 else
                   throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
@@ -184 +184 @@
             if(match.Groups[17].Success)
             {
-              IList<Region> regions = new List<Region>();
+              IntervalCollection regions = new IntervalCollection();
               // option variables found
               for (int idx = 0; idx < match.Groups[17].Captures.Count; ++idx)
               {
-                Region region = ParseRegion(
+                KeyValuePair<string, Interval> region = ParseRegion(
                   match.Groups[18].Captures[idx].Value,
                   match.Groups[20].Captures[idx].Value,
                   match.Groups[22].Captures[idx].Value);
-                if (!regions.Any(r => r.VariableName == region.VariableName))
-                  regions.Add(region);
+                if (regions.GetReadonlyDictionary().All(r => r.Key != region.Key))
+                  regions.AddInterval(region.Key, region.Value);
                 else
                   throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
@@ -217 +217 @@
     }
 
-    private static Region ParseRegion(string variable, string lb, string ub)
+    private static KeyValuePair<string, Interval> ParseRegion(string variable, string lb, string ub)
     {
       var regionLb = ParseIntervalBounds(lb);
       var regionUb = ParseIntervalBounds(ub);
-      return new Region(variable, new Interval(regionLb, regionUb));
+      return new KeyValuePair<string, Interval>(variable, new Interval(regionLb, regionUb));
+      //return new Region(variable, new Interval(regionLb, regionUb));
     }