Merge branch 'develop' into beta

Author: justcoding121

appveyor.yml

@@ -62,7 +62,7 @@ environment:
   github_email:
     secure: iBJZGqxyiHVNeYI0uIW+MdGd3I3pg8brJtETNRkKe/A=
   nuget_access_token:
-    secure: 65rklofkoUWJzPPja621kXlxrruHemmbREnIX7QgXK0cydW412yYMZJQsN42Js27
+    secure: OO7/GRKfrScfh1Z92UxFEuBuXUM0WlPv2RMzCL6WnYAMByhiyWC2e1ezy34r/Lc6
 deploy:
 - provider: GitHub
   auth_token: $(github_access_token)

src/Advanced.Algorithms.Mono.sln

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace Advanced.Algorithms.DataStructures
 {
@@ -10,12 +11,20 @@ public class BloomFilter<T>
     {
         private readonly BitArray filter;
 
+        private readonly int numberOfHashFunctions;
+
         /// <summary>
         /// Higher the size lower the collision and 
         /// failure probablity.
         /// </summary>
-        public BloomFilter(int size)
+        public BloomFilter(int size, int numberOfHashFunctions = 2)
         {
+            if (size <= numberOfHashFunctions)
+            {
+                throw new ArgumentException("size cannot be less than or equal to numberOfHashFunctions.");
+            }
+
+            this.numberOfHashFunctions = numberOfHashFunctions;
             filter = new BitArray(size);
         }
 
@@ -24,13 +33,9 @@ public BloomFilter(int size)
         /// </summary>
         public void AddKey(T key)
         {
-            var hashCode = key.GetHashCode();
-
-            //set 8 consecutive bits (a byte)
-            for (var i = 0; i < 8; i++)
+            foreach (var hash in getHashes(key))
             {
-                var index = Math.Abs(hashCode + i) % filter.Length;
-                filter[index] = true;
+                filter[hash % filter.Length] = true;
             }
         }
 
@@ -39,21 +44,24 @@ public void AddKey(T key)
         /// </summary>
         public bool KeyExists(T key)
         {
-            var hashCode = key.GetHashCode();
-
-
-            //set 8 consecutive bits (a byte)
-            for (var i = 0; i < 8; i++)
+            foreach (var hash in getHashes(key))
             {
-                var index = Math.Abs(hashCode + i) % filter.Length;
-
-                if (filter[index] == false)
+                if (filter[hash % filter.Length] == false)
                 {
                     return false;
                 }
             }
 
             return true;
         }
+
+        private IEnumerable<int> getHashes(T key)
+        {
+            for (var i = 1; i <= numberOfHashFunctions; i++)
+            {
+                var obj = new { Key = key, InitialValue = i };
+                yield return Math.Abs(obj.GetHashCode());
+            }
+        }
     }
 }

src/Advanced.Algorithms.NetCore.sln

@@ -127,7 +127,8 @@ private List<T> bfs(IGraph<T> graph,
 
         /// <summary>
         /// Find an augmenting path that start from a given free vertex on right and ending
-        /// at a free vertex on left. Return the matching edges along that path.
+        /// at a free vertex on left, via Matched (right -> left) and UnMatched (left -> right) edges alternatively.  
+        /// Return the matching edges along that path.
         /// </summary>
         private HashSet<MatchEdge<T>> dfs(IGraph<T> graph,
             Dictionary<T, T> leftToRightMatchEdges,

src/Advanced.Algorithms/Advanced.Algorithms.Mono.csproj

@@ -18,5 +18,32 @@ public void BloomFilter_Smoke_Test()
             Assert.IsTrue(filter.KeyExists("cat"));
             Assert.IsFalse(filter.KeyExists("bat"));
         }
+
+        [TestMethod]
+        public void BloomFilter_Accuracy_Test()
+        {
+            var bloomFilter = new BloomFilter<string>(10);
+
+            bloomFilter.AddKey("foo");
+            bloomFilter.AddKey("bar");
+            bloomFilter.AddKey("apple");
+            bloomFilter.AddKey("orange");
+            bloomFilter.AddKey("banana");
+
+            Assert.IsTrue(bloomFilter.KeyExists("bar"));
+            Assert.IsFalse(bloomFilter.KeyExists("ba111r"));
+
+            Assert.IsTrue(bloomFilter.KeyExists("banana"));
+            Assert.IsFalse(bloomFilter.KeyExists("dfs11j"));
+
+            Assert.IsTrue(bloomFilter.KeyExists("foo"));
+            Assert.IsFalse(bloomFilter.KeyExists("1foo"));
+
+            Assert.IsTrue(bloomFilter.KeyExists("apple"));
+            Assert.IsFalse(bloomFilter.KeyExists("applefoo"));
+
+            Assert.IsTrue(bloomFilter.KeyExists("orange"));
+            Assert.IsFalse(bloomFilter.KeyExists("orangew"));
+        }
     }
 }