Solve new review comments

Author: JosueNina

Common/Securities/UniverseManager.cs

@@ -37,21 +37,6 @@ public class UniverseManager : BaseExtendedDictionary<Symbol, Universe, Concurre
         /// </summary>
         public event EventHandler<UniverseManagerChanged> CollectionChanged;
 
-        /// <summary>
-        /// Gets the number of elements contained in the dictionary
-        /// </summary>
-        public override int Count => TypedDictionary.Skip(0).Count();
-
-        /// <summary>
-        /// Gets the keys of the dictionary
-        /// </summary>
-        public override ICollection<Symbol> Keys => TypedDictionary.Select(x => x.Key).ToList();
-
-        /// <summary>
-        /// Gets the values of the dictionary
-        /// </summary>
-        public override ICollection<Universe> Values => TypedDictionary.Select(x => x.Value).ToList();
-
         /// <summary>
         /// Read-only dictionary containing all active securities. An active security is
         /// a security that is currently selected by the universe or has holdings or open orders.
@@ -73,7 +58,7 @@ public UniverseManager() : base(new ConcurrentDictionary<Symbol, Universe>())
         /// </summary>
         public override void Add(Symbol key, Universe value)
         {
-            if (TypedDictionary.TryAdd(key, value))
+            if (Dictionary.TryAdd(key, value))
             {
                 lock (_pendingChanges)
                 {
@@ -87,7 +72,7 @@ public override void Add(Symbol key, Universe value)
         /// </summary>
         public void Update(Symbol key, Universe value, NotifyCollectionChangedAction action)
         {
-            if (TypedDictionary.ContainsKey(key) && !_pendingChanges.Any(x => x.Value == value))
+            if (Dictionary.ContainsKey(key) && !_pendingChanges.Any(x => x.Value == value))
             {
                 lock (_pendingChanges)
                 {
@@ -122,8 +107,7 @@ public void ProcessChanges()
         /// </summary>
         public override bool Remove(Symbol key)
         {
-            Universe universe;
-            if (TypedDictionary.TryRemove(key, out universe))
+            if (Dictionary.TryRemove(key, out var universe))
             {
                 universe.Dispose();
                 OnCollectionChanged(new UniverseManagerChanged(NotifyCollectionChangedAction.Remove, universe));
@@ -139,16 +123,16 @@ public override Universe this[Symbol symbol]
         {
             get
             {
-                if (!TypedDictionary.ContainsKey(symbol))
+                if (!Dictionary.ContainsKey(symbol))
                 {
                     throw new KeyNotFoundException($"This universe symbol ({symbol}) was not found in your universe list. Please add this security or check it exists before using it with 'Universes.ContainsKey(\"{SymbolCache.GetTicker(symbol)}\")'");
                 }
-                return TypedDictionary[symbol];
+                return Dictionary[symbol];
             }
             set
             {
                 Universe existing;
-                if (TypedDictionary.TryGetValue(symbol, out existing) && existing != value)
+                if (Dictionary.TryGetValue(symbol, out existing) && existing != value)
                 {
                     throw new ArgumentException($"Unable to over write existing Universe: {symbol.Value}");
                 }

Common/Util/BaseExtendedDictionary.cs

@@ -22,28 +22,30 @@
 namespace Common.Util
 {
     /// <summary>
-    /// Provides a default implementation of ExtendedDictionary that can be used with any key-value pair types
+    /// Provides a generic implementation of ExtendedDictionary with specific dictionary type
     /// </summary>
     [PandasNonExpandable]
-    public class BaseExtendedDictionary<TKey, TValue> : ExtendedDictionary<TKey, TValue>, IDictionary<TKey, TValue>
+    public class BaseExtendedDictionary<TKey, TValue, TDictionary> : ExtendedDictionary<TKey, TValue>, IDictionary<TKey, TValue>
+        where TDictionary : IDictionary<TKey, TValue>, new()
     {
         /// <summary>
         /// The dictionary instance
         /// </summary>
-        protected IDictionary<TKey, TValue> Dictionary { get; }
+        protected TDictionary Dictionary { get; }
 
         /// <summary>
         /// Initializes a new instance of the BaseExtendedDictionary class that is empty
         /// </summary>
-        public BaseExtendedDictionary() : this(new Dictionary<TKey, TValue>())
+        public BaseExtendedDictionary()
         {
+            Dictionary = new TDictionary();
         }
 
         /// <summary>
         /// Initializes a new instance of the BaseExtendedDictionary class that contains elements copied from the specified dictionary
         /// </summary>
         /// <param name="dictionary">The dictionary whose elements are copied to the new dictionary</param>
-        public BaseExtendedDictionary(IDictionary<TKey, TValue> dictionary)
+        public BaseExtendedDictionary(TDictionary dictionary)
         {
             Dictionary = dictionary;
         }
@@ -55,7 +57,7 @@ public BaseExtendedDictionary(IDictionary<TKey, TValue> dictionary)
         /// <param name="data">The data source for this dictionary</param>
         /// <param name="keySelector">Delegate used to select a key from the value</param>
         public BaseExtendedDictionary(IEnumerable<TValue> data, Func<TValue, TKey> keySelector)
-            : this(new Dictionary<TKey, TValue>())
+            : this()
         {
             foreach (var datum in data)
             {
@@ -221,32 +223,24 @@ IEnumerator IEnumerable.GetEnumerator()
     }
 
     /// <summary>
-    /// Provides a generic implementation of ExtendedDictionary with specific dictionary type
+    /// Provides a default implementation of ExtendedDictionary using Dictionary{TKey, TValue}
     /// </summary>
     [PandasNonExpandable]
-    public class BaseExtendedDictionary<TKey, TValue, TDictionary> : BaseExtendedDictionary<TKey, TValue>
-        where TDictionary : IDictionary<TKey, TValue>, new()
+    public class BaseExtendedDictionary<TKey, TValue> : BaseExtendedDictionary<TKey, TValue, Dictionary<TKey, TValue>>
     {
-        /// <summary>
-        /// Gets the typed dictionary instance
-        /// </summary>
-        protected TDictionary TypedDictionary { get; }
-
         /// <summary>
         /// Initializes a new instance of the BaseExtendedDictionary class that is empty
         /// </summary>
-        public BaseExtendedDictionary() : base(new TDictionary())
+        public BaseExtendedDictionary() : base()
         {
-            TypedDictionary = (TDictionary)Dictionary;
         }
 
         /// <summary>
         /// Initializes a new instance of the BaseExtendedDictionary class that contains elements copied from the specified dictionary
         /// </summary>
         /// <param name="dictionary">The dictionary whose elements are copied to the new dictionary</param>
-        public BaseExtendedDictionary(TDictionary dictionary) : base(dictionary)
+        public BaseExtendedDictionary(IDictionary<TKey, TValue> dictionary) : base(new Dictionary<TKey, TValue>(dictionary))
         {
-            TypedDictionary = dictionary;
         }
 
         /// <summary>
@@ -255,14 +249,8 @@ public BaseExtendedDictionary(TDictionary dictionary) : base(dictionary)
         /// </summary>
         /// <param name="data">The data source for this dictionary</param>
         /// <param name="keySelector">Delegate used to select a key from the value</param>
-        public BaseExtendedDictionary(IEnumerable<TValue> data, Func<TValue, TKey> keySelector)
-            : base(new TDictionary())
+        public BaseExtendedDictionary(IEnumerable<TValue> data, Func<TValue, TKey> keySelector) : base(data, keySelector)
         {
-            TypedDictionary = (TDictionary)Dictionary;
-            foreach (var datum in data)
-            {
-                TypedDictionary[keySelector(datum)] = datum;
-            }
         }
     }
 }