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

Timestamp:

04/17/19 14:37:55 (5 years ago)

Author:

chaider

Message:

#2971 Several chanages regarding review comments

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs (modified) (6 diffs)

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

@@ -4 +4 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Collections;
 using HEAL.Attic;
 
@@ -10 +11 @@
   [StorableType("230B4E4B-41E5-4D33-9BC3-E2DAADDCA5AE")]
   public class NamedIntervals : Item {
-    Dictionary<string, Interval> variableIntervals = new Dictionary<string, Interval>();
-    public Dictionary<string, Interval> VariableIntervals => variableIntervals;
+    public ObservableDictionary<string, Interval> VariableIntervals { get; } = new ObservableDictionary<string, Interval>();
 
     [Storable(Name = "StorableIntervalInformation")]
@@ -17 +17 @@
       get {
         var l = new List<KeyValuePair<string, double[]>>();
-        foreach (var varInt in variableIntervals)
+        foreach (var varInt in VariableIntervals)
 
           l.Add(new KeyValuePair<string, double[]>(varInt.Key,
@@ -26 +26 @@
       set {
         foreach (var varInt in value)
-          variableIntervals.Add(varInt.Key, new Interval(varInt.Value[0], varInt.Value[1]));
+          VariableIntervals.Add(varInt.Key, new Interval(varInt.Value[0], varInt.Value[1]));
       }
     }
@@ -36 +36 @@
     protected NamedIntervals(NamedIntervals original, Cloner cloner) : base(original, cloner) {
       foreach (var keyValuePair in original.VariableIntervals) {
-        variableIntervals.Add(keyValuePair.Key, keyValuePair.Value);
+        VariableIntervals.Add(keyValuePair.Key, new Interval(keyValuePair.Value.LowerBound, keyValuePair.Value.UpperBound));
       }
     }
@@ -46 +46 @@
     public bool ReadOnly { get; }
 
-    public bool InsertMany(IEnumerable<KeyValuePair<string, Interval>> entries) {
-      if (entries == null) throw new ArgumentNullException("The given dataset is null.");
-      if (entries.Count() != 0) {
-        foreach (var entry in entries) {
-          if (variableIntervals.ContainsKey(entry.Key))
-            variableIntervals[entry.Key] = entry.Value;
-          else
-            variableIntervals.Add(entry.Key, entry.Value);
-        }
-      }
-      return true;
-    }
-
-    public bool Add(string key, Interval value) {
-      variableIntervals[key] = value;
-      return true;
-    }
-
   }
 }