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

Timestamp:

08/11/20 14:22:45 (4 years ago)

Author:

dpiringe

Message:

#3073

• added regions in IntervalConstraint
• modified IntervalConstraintsParser to detect regions

File:

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

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

@@ -22 +22 @@
 #endregion
 using System;
+using System.Collections.Generic;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -113 +114 @@
     }
 
+    [Storable]
+    private IDictionary<string, Interval> regions = new Dictionary<string, Interval>();
+    public IDictionary<string, Interval> Regions
+    {
+      get => regions;
+      set
+      {
+        if (regions != value)
+        {
+          regions = value;
+          UpdateExpression();
+          OnChanged();
+        }
+      }
+    }
+
     [StorableConstructor]
     private IntervalConstraint(StorableConstructorFlag _) : base(_) { }
 
     public IntervalConstraint(string   expression, string variable, string target, int numberOfDerivations,
-                              Interval interval,   bool   enabled) {
-      this.expression          = expression;
-      this.variable            = variable;
-      this.target              = target;
+                              Interval interval,   bool   enabled) 
+      : this(expression, variable, target, numberOfDerivations, 
+             interval, new Dictionary<string, Interval>(), enabled) { }
+
+    public IntervalConstraint(string expression, string variable, string target, int numberOfDerivations,
+                              Interval interval, IDictionary<string, Interval> regions, bool enabled)
+    {
+      this.expression = expression;
+      this.variable = variable;
+      this.target = target;
       this.numberOfDerivations = numberOfDerivations;
-      this.interval            = interval;
-      this.enabled             = enabled;
+      this.interval = interval;
+      this.regions = regions;
+      this.enabled = enabled;
     }
 
@@ -137 +161 @@
       NumberOfDerivations = original.NumberOfDerivations;
       Interval            = original.Interval;
+      Regions             = original.Regions;
       Enabled             = original.Enabled;
     }
@@ -171 +196 @@
                                    Interval?.UpperBound,
                                    "]");
+        foreach(var kvp in Regions)
+          expression += $", {kvp.Key}=({kvp.Value.LowerBound} .. {kvp.Value.UpperBound})";
         Expression = expression;
         return;
@@ -183 +210 @@
                                  "]",
                                  GetDerivationString(numberOfDerivations));
+      foreach (var kvp in Regions)
+        expression += $", {kvp.Key}=({kvp.Value.LowerBound} .. {kvp.Value.UpperBound})";
       Expression = expression;
     }