Merge pull request #30 from matiii/feature/depth-dijkstra

Implementation of depth in Dijkstra

Author: matiii

src/Dijkstra.NET.Benchmark/BenchmarkIt.cs

@@ -11,53 +11,28 @@ namespace Dijkstra.NET.Benchmark
     [MemoryDiagnoser]
     public class BenchmarkIt
     {
-        private readonly DijkstraBenchmarkBase _dijkstra;
-        private readonly DijkstraBenchmarkBase _bfs;
-
         public BenchmarkIt()
         {
-            _dijkstra = new DijkstraBenchmark();
-            _bfs = new BfsParallelBenchmark();
         }
 
         [GlobalSetup]
         public void Initialise()
         {
             Console.WriteLine("--- Global Setup ---");
-
-            _dijkstra.Initialise();
         }
 
         [IterationSetup]
         public void IterationSetup()
         {
             Console.WriteLine("--- Iteration Setup ---");
-
-            _dijkstra.Setup();
         }
 
         [Benchmark(Baseline = true)]
-        public int DijkstraBenchmark()
-        {
-            var result = _dijkstra.GetPath();
-
-            return result.GetPath().Count();
-        }
-
-        [Benchmark]
         public int DijkstraExtensionBenchmark()
         {
             var result = DijkstraBenchmarkBase.Graph.Dijkstra(DijkstraBenchmarkBase.From, DijkstraBenchmarkBase.To);
 
             return result.GetPath().Count();
         }
-
-        [Benchmark]
-        public int BfsBenchmark()
-        {
-            var result = _bfs.GetPath();
-
-            return result.GetPath().Count();
-        }
     }
 }

src/Dijkstra.NET.Benchmark/BfsParallelBenchmark.cs

@@ -137,8 +137,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BenchmarkIt.cs" />
-    <Compile Include="BfsParallelBenchmark.cs" />
-    <Compile Include="DijkstraBenchmark.cs" />
     <Compile Include="DijkstraBenchmarkBase.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/Dijkstra.NET.Benchmark/Dijkstra.NET.Benchmark.csproj

@@ -44,12 +44,5 @@ public void Initialise()
             From = 0;
             To = Nodes - 1;
         }
-
-        public void Setup()
-        {
-            Graph.Reset();
-        }
-
-        public abstract IShortestPathResult GetPath();
     }
 }

src/Dijkstra.NET.Benchmark/DijkstraBenchmark.cs

@@ -84,6 +84,20 @@ public void DijkstraGraphShould_Find_Path_With_One_Vertex_In_Graph()
             Assert.True(result.IsFounded);
         }
 
+        [Fact]
+        public void DijkstraGraphShould_Find_Path_With_One_Vertex_In_Graph_And_Depth_Zero()
+        {
+            var graph = new Graph<int, string>();
+            graph.AddNode(0);
+
+            var result = graph.Dijkstra(0, 0, 0);
+            uint[] path = result.GetPath().ToArray();
+
+            Assert.Equal<uint>(0, path[0]);
+            Assert.Equal(0, result.Distance);
+            Assert.True(result.IsFounded);
+        }
+
         [Fact]
         public void DijkstraGraphShould_Find_Path_With_One_Vertex_And_One_Edge_In_Graph()
         {
@@ -155,5 +169,31 @@ public void DijkstraGraphNot_Should_Find_Path_In_Graph()
 
             Assert.False(result.IsFounded);
         }
+
+        [Fact]
+        public void Dijkstra_Should_Concern_Depth_In_Graph()
+        {
+            var graph = new Graph<int, string>();
+
+            graph.AddNode(0);
+            graph.AddNode(0);
+            graph.AddNode(0);
+            graph.AddNode(0);
+
+            graph.Connect(0, 1, 1, null);
+            graph.Connect(0, 2, 1, null);
+            graph.Connect(0, 3, 5, null);
+            graph.Connect(2, 3, 2, null);
+
+            var result = graph.Dijkstra(0, 3, 1);
+
+            Assert.True(result.IsFounded);
+            Assert.Equal(5, result.Distance);
+
+            uint[] path = result.GetPath().ToArray();
+
+            Assert.Equal((uint)0, path[0]);
+            Assert.Equal((uint)3, path[1]);
+        }
     }
 }