Changeset 17765 for branches

Timestamp:

09/29/20 10:16:11 (4 years ago)

Author:

dpiringe

Message:

#3073

• added new class Region and refactored the relevant code in IntervalConstraint and IntervalConstraintsParser
• added the .editorconfig file from trunk (to satisfy the coding guidelines)

Location:

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Implementation/Interval/IntervalConstraint.cs (modified) (4 diffs)
• Implementation/Interval/IntervalConstraintsParser.cs (modified) (3 diffs)
• Implementation/Interval/Region.cs (added)

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -192 +192 @@
     <Compile Include="Implementation\Interval\IntervalConstraint.cs" />
     <Compile Include="Implementation\Interval\IntervalConstraintsParser.cs" />
+    <Compile Include="Implementation\Interval\Region.cs" />
     <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
     <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
@@ -300 +301 @@
     <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\ThresholdCalculator.cs" />
+    <None Include=".editorconfig" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

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

@@ -115 +115 @@
 
     [Storable]
-    private IDictionary<string, Interval> regions = new Dictionary<string, Interval>();
-    public IDictionary<string, Interval> Regions
+    private /*IDictionary<string, Interval>*/ IEnumerable<Region> regions; //= new Dictionary<string, Interval>();
+    public IEnumerable<Region> Regions
     {
       get => regions;
@@ -152 +152 @@
                               Interval interval, double weight, bool enabled) 
       : this(expression, variable, target, numberOfDerivations, 
-             interval, new Dictionary<string, Interval>(), weight, enabled) { }
+             interval, new List<Region>(), weight, enabled) { }
 
     public IntervalConstraint(string expression, string variable, string target, int numberOfDerivations,
-                              Interval interval, IDictionary<string, Interval> regions, double weight, bool enabled)
+                              Interval interval, IEnumerable<Region> regions, double weight, bool enabled)
     {
       this.expression = expression;
@@ -213 +213 @@
                                    Interval?.UpperBound,
                                    "]");
-        foreach(var kvp in Regions)
-          expression += $", {kvp.Key}=({kvp.Value.LowerBound} .. {kvp.Value.UpperBound})";
+        foreach(var region in Regions)
+          expression += $", {region.VariableName}=({region.Interval.LowerBound} .. {region.Interval.UpperBound})";
         Expression = expression;
         return;
@@ -227 +227 @@
                                  "]",
                                  GetDerivationString(numberOfDerivations));
-      foreach (var kvp in Regions)
-        expression += $", {kvp.Key}=({kvp.Value.LowerBound} .. {kvp.Value.UpperBound})";
+      foreach (var region in Regions)
+        expression += $", {region.VariableName}=({region.Interval.LowerBound} .. {region.Interval.UpperBound})";
       Expression = expression;
     }

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

@@ -93 +93 @@
             if (match.Groups[10].Success)
             {
-              IDictionary<string, Interval> pairs = new Dictionary<string, Interval>();
+              IList<Region> regions = new List<Region>();
               // option variables found
               for(int idx = 0; idx < match.Groups[10].Captures.Count; ++idx)
               {
-                AddRegion(pairs,
+                Region 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);
+                else
+                  throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
               }
-              yield return new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, pairs, weight, isEnabled);
+              yield return new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, regions, weight, isEnabled);
             }
             else
@@ -180 +184 @@
             if(match.Groups[17].Success)
             {
-              IDictionary<string, Interval> pairs = new Dictionary<string, Interval>();
+              IList<Region> regions = new List<Region>();
               // option variables found
               for (int idx = 0; idx < match.Groups[17].Captures.Count; ++idx)
               {
-                AddRegion(pairs, 
-                  match.Groups[18].Captures[idx].Value, 
-                  match.Groups[20].Captures[idx].Value, 
+                Region 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);
+                else
+                  throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
               }
-              yield return new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, pairs, weight, isEnabled);
+              yield return new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, regions, weight, isEnabled);
             } else
               yield return new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, weight, isEnabled);
@@ -209 +217 @@
     }
 
-    private static void AddRegion(IDictionary<string, Interval> dict, string variable, string lb, string ub)
+    private static Region ParseRegion(string variable, string lb, string ub)
     {
       var regionLb = ParseIntervalBounds(lb);
       var regionUb = ParseIntervalBounds(ub);
-      if (dict.ContainsKey(variable))
-        throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
-      dict.Add(variable, new Interval(regionLb, regionUb));
+      return new Region(variable, new Interval(regionLb, regionUb));
     }