refactor graph

Author: justcoding121

Advanced.Algorithms/DataStructures/Graph/AdjacencyList/DiGraph.cs

@@ -216,12 +216,7 @@ public List<T> GetAllInEdges(T vertex)
         /// <returns></returns>
         public DiGraphVertex<T> FindVertex(T value)
         {
-            if (Vertices.ContainsKey(value))
-            {
-                return Vertices[value];
-            }
-
-            return null;
+            return Vertices.ContainsKey(value) ? Vertices[value] : null;
         }
 
         /// <summary>

Advanced.Algorithms/DataStructures/Graph/AdjacencyMatrix/DiGraph.cs

@@ -31,7 +31,7 @@ public DiGraph()
             reverseVertexIndices = new System.Collections.Generic.Dictionary<int, T>();
             matrix = new BitArray[maxSize];
 
-            for (int i = 0; i < maxSize; i++)
+            for (var i = 0; i < maxSize; i++)
             {
                 matrix[i] = new BitArray(maxSize);
             }
@@ -99,7 +99,7 @@ public void RemoveVertex(T value)
             var index = vertexIndices[value];
 
             //clear edges
-            for (int i = 0; i < maxSize; i++)
+            for (var i = 0; i < maxSize; i++)
             {
                 matrix[i].Set(index, false);
                 matrix[index].Set(i, false);
@@ -191,12 +191,7 @@ public bool HasEdge(T source, T dest)
             var sourceIndex = vertexIndices[source];
             var destIndex = vertexIndices[dest];
 
-            if (matrix[sourceIndex].Get(destIndex))
-            {
-                return true;
-            }
-
-            return false;
+            return matrix[sourceIndex].Get(destIndex);
         }
 
         public List<T> GetAllOutEdges(T vertex)
@@ -210,7 +205,7 @@ public List<T> GetAllOutEdges(T vertex)
 
             var result = new List<T>();
 
-            for (int i = 0; i < maxSize; i++)
+            for (var i = 0; i < maxSize; i++)
             {
                 if(matrix[index].Get(i))
                 {
@@ -232,7 +227,7 @@ public List<T> GetAllInEdges(T vertex)
 
             var result = new List<T>();
 
-            for (int i = 0; i < maxSize; i++)
+            for (var i = 0; i < maxSize; i++)
             {
                 if (matrix[i].Get(index))
                 {
@@ -246,15 +241,15 @@ public List<T> GetAllInEdges(T vertex)
         private void doubleMatrixSize()
         {
             var newMatrix = new BitArray[maxSize * 2];
-            for (int i = 0; i < maxSize * 2; i++)
+            for (var i = 0; i < maxSize * 2; i++)
             {
                 newMatrix[i] = new BitArray(maxSize * 2);
             }
 
             var newVertexIndices = new System.Collections.Generic.Dictionary<T, int>();
             var newReverseIndices = new System.Collections.Generic.Dictionary<int, T>();
 
-            int k = 0;
+            var k = 0;
             foreach (var vertex in vertexIndices)
             {
                 newVertexIndices.Add(vertex.Key, k);
@@ -263,20 +258,21 @@ private void doubleMatrixSize()
             }
             nextAvailableIndex = k;
 
-            for (int i = 0; i < maxSize; i++)
+            for (var i = 0; i < maxSize; i++)
             {
                 newMatrix[i] = new BitArray(maxSize * 2);
-                for (int j = 0; j < maxSize; j++)
+                for (var j = 0; j < maxSize; j++)
                 {
-                    if (matrix[i].Get(j)
-                        && reverseVertexIndices.ContainsKey(i)
-                        && reverseVertexIndices.ContainsKey(j))
+                    if (!matrix[i].Get(j) || !reverseVertexIndices.ContainsKey(i) ||
+                        !reverseVertexIndices.ContainsKey(j))
                     {
-                        var newI = newVertexIndices[reverseVertexIndices[i]];
-                        var newJ = newVertexIndices[reverseVertexIndices[j]];
-
-                        newMatrix[newI].Set(newJ, true);
+                        continue;
                     }
+
+                    var newI = newVertexIndices[reverseVertexIndices[i]];
+                    var newJ = newVertexIndices[reverseVertexIndices[j]];
+
+                    newMatrix[newI].Set(newJ, true);
                 }
             }
 
@@ -289,15 +285,15 @@ private void doubleMatrixSize()
         private void halfMatrixSize()
         {
             var newMatrix = new BitArray[maxSize / 2];
-            for (int i = 0; i < maxSize / 2; i++)
+            for (var i = 0; i < maxSize / 2; i++)
             {
                 newMatrix[i] = new BitArray(maxSize / 2);
             }
 
             var newVertexIndices = new System.Collections.Generic.Dictionary<T, int>();
             var newReverseIndices = new System.Collections.Generic.Dictionary<int, T>();
 
-            int k = 0;
+            var k = 0;
             foreach (var vertex in vertexIndices)
             {
                 newVertexIndices.Add(vertex.Key, k);
@@ -306,19 +302,20 @@ private void halfMatrixSize()
             }
             nextAvailableIndex = k;
 
-            for (int i = 0; i < maxSize; i++)
+            for (var i = 0; i < maxSize; i++)
             {
-                for (int j = 0; j < maxSize; j++)
+                for (var j = 0; j < maxSize; j++)
                 {
-                    if (matrix[i].Get(j) 
-                        && reverseVertexIndices.ContainsKey(i)
-                        && reverseVertexIndices.ContainsKey(j))
+                    if (!matrix[i].Get(j) || !reverseVertexIndices.ContainsKey(i) ||
+                        !reverseVertexIndices.ContainsKey(j))
                     {
-                        var newI = newVertexIndices[reverseVertexIndices[i]];
-                        var newJ = newVertexIndices[reverseVertexIndices[j]];
-
-                        newMatrix[newI].Set(newJ, true);
+                        continue;
                     }
+
+                    var newI = newVertexIndices[reverseVertexIndices[i]];
+                    var newJ = newVertexIndices[reverseVertexIndices[j]];
+
+                    newMatrix[newI].Set(newJ, true);
                 }
             }