Merge pull request #7 from matiii/build

bug fix

Author: matiii

src/Dijkstra.NET/Dijkstra.NET.Tests/DijkstraTest.cs

@@ -24,6 +24,12 @@ public void Dijkstra_Should_Find_Path_In_Multi_Paths_Graph()
             _fixture.Algorithm_Should_Find_Path_In_Multi_Paths_Graph(_dijkstraFactory);
         }
 
+        [TestMethod, Timeout(2500)]
+        public void Dijkstra_Should_Find_Path_In_Override_Node()
+        {
+            _fixture.Algorithm_Should_Find_Path_In_Override_Node(_dijkstraFactory);
+        }
+
         [TestMethod]
         public void Dijkstra_Should_Find_Path_With_One_Vertex_In_Graph()
         {

src/Dijkstra.NET/Dijkstra.NET.Tests/TheShortestPathFixture.cs

@@ -41,6 +41,40 @@ public void Algorithm_Should_Find_Path_In_Multi_Paths_Graph(Func<Graph<int, stri
             Assert.IsTrue(result.IsFounded);
         }
 
+        public void Algorithm_Should_Find_Path_In_Override_Node(Func<Graph<int, string>, Dijkstra<int, string>> algorithm)
+        {
+            var graph = new Graph<int, string>();
+
+            graph.AddNode(0);
+            graph.AddNode(0);
+            graph.AddNode(0);
+            graph.AddNode(0);
+            graph.AddNode(0);
+            graph.AddNode(0);
+
+            graph.Connect(0, 1, 2, null);
+            graph.Connect(0, 2, 6, null);
+            graph.Connect(1, 2, 2, null);
+            graph.Connect(2, 3, 1, null);
+            graph.Connect(3, 4, 1, null);
+            graph.Connect(0, 5, 5, null);
+
+            var dijkstra = algorithm(graph);
+            var result = dijkstra.Process(0, 4);
+            uint[] path = result.GetPath().ToArray();
+
+            Dispose(dijkstra);
+
+            Assert.AreEqual<uint>(0, path[0]);
+            Assert.AreEqual<uint>(1, path[1]);
+            Assert.AreEqual<uint>(2, path[2]);
+            Assert.AreEqual<uint>(3, path[3]);
+            Assert.AreEqual<uint>(4, path[4]);
+
+            Assert.AreEqual(6, result.Distance);
+            Assert.IsTrue(result.IsFounded);
+        }
+
         public void Algorithm_Should_Find_Path_With_One_Vertex_In_Graph(Func<Graph<int, string>, Dijkstra<int, string>> algorithm)
         {
             var graph = new Graph<int, string>();

src/Dijkstra.NET/Dijkstra.NET/Model/Node.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using Contract;
+
     public class Node<T, TEdgeCustom>: INode<T, TEdgeCustom> where TEdgeCustom: IEquatable<TEdgeCustom>
     {
         public Node(uint key, T item)
@@ -16,5 +17,16 @@ public Node(uint key, T item)
         public uint Key { get; }
         public T Item { get; }
         public int Distance { get; set; }
+
+        //public override int GetHashCode() => Key.GetHashCode();
+        //public override bool Equals(object obj)
+        //{
+        //    var that = obj as Node<T, TEdgeCustom>;
+
+        //    if (that == null || that.Key != Key)
+        //        return false;
+
+        //    return true;
+        //}
     }
 }

src/Dijkstra.NET/Dijkstra.NET/ShortestPath/Dijkstra.cs

@@ -27,10 +27,12 @@ public virtual IShortestPathResult Process(uint from, uint to)
             var result = new DijkstraResult(from, to);
             Graph[from].Distance = 0;
             var q = new SortedSet<INode<T, TEdgeCustom>>(new[] { Graph[from]}, new NodeComparer<T, TEdgeCustom>());
+            var current = new HashSet<uint>();
 
             while (q.Count > 0)
             {
                 INode<T, TEdgeCustom> u = q.Deque();
+                current.Remove(u.Key);
 
                 if (u.Key == to)
                 {
@@ -44,8 +46,12 @@ public virtual IShortestPathResult Process(uint from, uint to)
 
                     if (e.Node.Distance > u.Distance + e.Cost)
                     {
+                        if (current.Contains(e.Node.Key))
+                            q.Remove(e.Node);
+
                         e.Node.Distance = u.Distance + e.Cost;
                         q.Add(e.Node);
+                        current.Add(e.Node.Key);
                         result.Path[e.Node.Key] = u.Key;
                     }
                 }