Changeset 9009 for trunk/sources

Timestamp:

12/06/12 15:52:29 (11 years ago)

Author:

abeham

Message:

#1991: Implemented review comments

Location:

trunk/sources

Files:

• HeuristicLab.Collections/3.3/BidirectionalDictionary.cs (modified) (5 diffs)
• HeuristicLab.Collections/3.3/BidirectionalLookup.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Collections/3.3/BidirectionalDictionary.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
+using System.Collections;
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -26 +28 @@
 namespace HeuristicLab.Collections {
   [StorableClass]
-  public class BidirectionalDictionary<TFirst, TSecond> {
+  [Serializable]
+  public class BidirectionalDictionary<TFirst, TSecond> : IEnumerable<KeyValuePair<TFirst, TSecond>> {
     [Storable]
     private readonly Dictionary<TFirst, TSecond> firstToSecond;
@@ -53 +56 @@
       secondToFirst = new Dictionary<TSecond, TFirst>(secondComparer);
     }
+    public BidirectionalDictionary(BidirectionalDictionary<TFirst, TSecond> other)
+      : base() {
+      firstToSecond = new Dictionary<TFirst, TSecond>(other.firstToSecond, other.firstToSecond.Comparer);
+      secondToFirst = new Dictionary<TSecond, TFirst>(other.secondToFirst, other.secondToFirst.Comparer);
+    }
 
     #region Properties
@@ -65 +73 @@
     public IEnumerable<TSecond> SecondValues {
       get { return secondToFirst.Keys; }
-    }
-
-    public IEnumerable<KeyValuePair<TFirst, TSecond>> FirstEnumerable {
-      get { return firstToSecond; }
-    }
-
-    public IEnumerable<KeyValuePair<TSecond, TFirst>> SecondEnumerable {
-      get { return secondToFirst; }
     }
     #endregion
@@ -139 +139 @@
       secondToFirst.Clear();
     }
+
+    public IEnumerator<KeyValuePair<TFirst, TSecond>> GetEnumerator() {
+      return firstToSecond.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() {
+      return GetEnumerator();
+    }
     #endregion
   }

trunk/sources/HeuristicLab.Collections/3.3/BidirectionalLookup.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26 +27 @@
 namespace HeuristicLab.Collections {
   [StorableClass]
+  [Serializable]
   public class BidirectionalLookup<TFirst, TSecond> {
     [Storable]

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs

@@ -26 +26 @@
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [Obsolete("Use BidirectionalDictionary in HeuristicLab.Collections")]
   public class BidirectionalLookup<TFirst, TSecond> {
     [Storable]