Changeset 16918

Timestamp:

05/08/19 10:22:58 (5 years ago)

Author:

chaider

Message:

#2971

• changed VariableIntervals from ObservableDictionary to IDictionary
• Added methods to get single intervals and all intervals

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalCollection.cs (modified) (3 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs

@@ -51 +51 @@
       intervalConstraints.CheckedItemsChanged += constraint_CheckedItemChanged;
       intervalConstraints.ItemsAdded += constraints_Updated;
-      intervalConstraints.ItemsRemoved += constraints_Updated; 
+      intervalConstraints.ItemsRemoved += constraint_removed; 
     }
 
@@ -57 +57 @@
       intervalConstraints.CheckedItemsChanged -= constraint_CheckedItemChanged;
       intervalConstraints.ItemsAdded -= constraints_Updated;
-      intervalConstraints.ItemsRemoved -= constraints_Updated;
+      intervalConstraints.ItemsRemoved -= constraint_removed;
       base.DeregisterContentEvents();
     }
@@ -109 +109 @@
     }
 
+    private void constraint_removed(object sender, CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {
+      foreach (var removedItem in e.Items) {
+        removedItem.Value.Changed -= constraint_Changed;
+      }
+    }
+
     private void constraint_CheckedItemChanged(object sender,
       CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {

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

@@ -19 +19 @@
  */
 #endregion
+
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Common;
@@ -32 +34 @@
       get => HeuristicLab.Common.Resources.VSImageLibrary.Object;
     }
-    public ObservableDictionary<string, Interval> VariableIntervals { get; } = new ObservableDictionary<string, Interval>();
+    public IDictionary<string, Interval> VariableIntervals { get; } = new Dictionary<string, Interval>();
 
     [Storable(Name = "StorableIntervalInformation")]
@@ -61 +63 @@
     }
 
+    public IntervalCollection(IDictionary<string, Interval> variableIntervals) {
+      this.VariableIntervals = variableIntervals;
+    }
+
+    public KeyValuePair<string, Interval> getInterval(string variable) {
+      if (VariableIntervals.ContainsKey(variable)) {
+        return new KeyValuePair<string, Interval>(variable, VariableIntervals[variable]);
+      } else {
+        throw new ArgumentException($"The given variable:{variable} is not present!");
+      } 
+    }
+
+    public IDictionary<string, Interval> getIntervals() {
+      return VariableIntervals;
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new IntervalCollection(this, cloner);