Changeset 17891 for branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/ShapeConstraint.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/ShapeConstraint.cs (modified) (6 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/ShapeConstraint.cs

@@ -102 +102 @@
     }
 
-    [Storable]
-    private bool enabled;
-
-    public bool Enabled {
-      get => enabled;
-      set {
-        if (enabled == value)
-          return;
-        enabled = value;
-        OnChanged();
-      }
-    }
+    // [Storable]
+    // private bool enabled;
+    // 
+    // public bool Enabled {
+    //   get => enabled;
+    //   set {
+    //     if (enabled == value)
+    //       return;
+    //     enabled = value;
+    //     OnChanged();
+    //   }
+    // }
 
     [Storable]
@@ -143 +143 @@
 
     // without derivation
-    public ShapeConstraint(Interval interval, double weight, bool enabled)
+    public ShapeConstraint(Interval interval, double weight)
       : this(string.Empty, 0,
-         interval, new IntervalCollection(), weight, enabled) { }
-
-    public ShapeConstraint(Interval interval, IntervalCollection regions, double weight, bool enabled)
+         interval, new IntervalCollection(), weight) { }
+
+    public ShapeConstraint(Interval interval, IntervalCollection regions, double weight)
       : this(string.Empty, 0,
-         interval, regions, weight, enabled) { }
+         interval, regions, weight) { }
 
     public ShapeConstraint(string variable, int numberOfDerivations,
-                              Interval interval, double weight, bool enabled)
+                              Interval interval, double weight)
       : this(variable, numberOfDerivations,
-             interval, new IntervalCollection(), weight, enabled) { }
+             interval, new IntervalCollection(), weight) { }
 
     public ShapeConstraint(string variable, int numberOfDerivations,
-                              Interval interval, IntervalCollection regions, double weight, bool enabled) {
+                              Interval interval, IntervalCollection regions, double weight) {
       this.regions = regions;
       this.weight = weight;
@@ -163 +163 @@
       this.numberOfDerivations = numberOfDerivations;
       this.interval = interval;
-      this.enabled = enabled;
+      //this.enabled = enabled;
     }
 
@@ -176 +176 @@
       NumberOfDerivations = original.NumberOfDerivations;
       Interval = original.Interval;
-      Enabled = original.Enabled;
+      //Enabled = original.Enabled;
     }
 
@@ -208 +208 @@
         if (Regions != null) {
           foreach (var region in Regions.GetReadonlyDictionary())
-            expression += $", {region.Key}=({region.Value.LowerBound} .. {region.Value.UpperBound})";
+            expression += $", {region.Key} in [{region.Value.LowerBound} .. {region.Value.UpperBound}]";
+        }
+        if (Weight != 1.0) {
+          expression += $" weight: {weight}";
         }
 
@@ -226 +229 @@
       if (Regions != null) {
         foreach (var region in Regions.GetReadonlyDictionary())
-          expression += $", {region.Key}=({region.Value.LowerBound} .. {region.Value.UpperBound})";
+          expression += $", {region.Key} in [{region.Value.LowerBound} .. {region.Value.UpperBound}]";
+      }
+      if(Weight != 1.0) {
+        expression += $" weight: {weight}";
       }
       return expression;

@@ -1 +1 @@
 bin
+TestResults