Changeset 16548

Timestamp:

01/23/19 12:45:26 (6 years ago)

Author:

chaider

Message:

#2971

• Removed Storable from Intervals
• Changed copy constructor from NamedIntervals class

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Interval.cs (modified) (2 diffs)
• NamedIntervals.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [StorableClass]
-  public class Interval :Item, IEquatable<Interval> {
-    [Storable]
+  public class Interval : IEquatable<Interval> {
     public double LowerBound { get; private set; }
-    [Storable]
     public double UpperBound { get; private set; }
 
-    [StorableConstructor]
-    protected Interval(bool deserializing) : base(deserializing) { }
-    protected Interval(Interval original, Cloner cloner)
-      : base(original, cloner) {
-    }
+
     public Interval(double lowerBound, double upperBound) {
       if (lowerBound > upperBound)
@@ -50 +43 @@
     public bool Contains(double value) {
       return LowerBound <= value && value <= UpperBound;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Interval(this, cloner);
     }
 

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs

@@ -13 +13 @@
   [Item("NamedIntervals", "Represents variables with their interval ranges.")]
   [StorableClass]
-  public class NamedIntervals : Item {
+  public class NamedIntervals : Item {   
     ObservableDictionary<string, Interval> variableIntervals = new ObservableDictionary<string, Interval>();
+    public ObservableDictionary<string, Interval> VariableIntervals {
+      get { return variableIntervals; }
+    }
+
+    [Storable(Name = "StorableIntervalInformation")]
+    private IEnumerable<Tuple<string, double, double>> StorableIntervalInformation {
+      get {
+        foreach (var varInt in variableIntervals)
+          yield return Tuple.Create(varInt.Key, varInt.Value.LowerBound, varInt.Value.UpperBound);
+      }
+
+      set {
+        foreach (var varInt in value)
+          variableIntervals.Add(varInt.Item1,new Interval(varInt.Item2,varInt.Item3));
+      }
+    }
 
     public NamedIntervals() : base(){}
     protected NamedIntervals(bool deserializing) : base(deserializing) { }
-    protected NamedIntervals(NamedIntervals original, Cloner cloner) : base(original, cloner) { }
+
+    protected NamedIntervals(NamedIntervals original, Cloner cloner) : base(original, cloner) {
+      foreach (var keyValuePair in original.VariableIntervals) {
+        variableIntervals.Add(keyValuePair.Key, keyValuePair.Value);
+      }
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new NamedIntervals(this, cloner);
     }
-
-    public ObservableDictionary<string, Interval> VariableIntervals => variableIntervals;
 
     public bool ReadOnly { get; }