i-20: Merge remote-tracking branch 'origin/master' into feature/i20-page-rank

# Conflicts:
#	src/Dijkstra.NET/Graph/Node.cs

Author: matiii

README.md

@@ -1,4 +1,4 @@
-# Dijkstra.NET Dijkstra algorithm in C# [![NuGet Version](https://img.shields.io/badge/Dijkstra.NET-1.1.0-blue.svg)](https://www.nuget.org/packages/Dijkstra.NET)
+# Dijkstra.NET [![NuGet Version](https://img.shields.io/badge/Dijkstra.NET-1.2.0-blue.svg)](https://www.nuget.org/packages/Dijkstra.NET)
 
 Dijkstra algorithm which use priority queue thus complexity is equal O(ElogV) where E is number of edges and V is number of vertices. Used data structures are based on interfaces so you can implement your own or reused present. Simply example below. More information about algorithm you can find on [Wikipedia](https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm).
 
@@ -12,39 +12,56 @@ Install the latest version from NuGet
 ## Simple example
 
 ```c#
-using Dijkstra.NET.Extensions;
+using Dijkstra.NET.Graph;
+using Dijkstra.NET.ShortestPath;
 
 var graph = new Graph<int, string>();
 
 graph.AddNode(1);
 graph.AddNode(2);
 
-graph.Connect(0, 1, 5, "some custom information in edge"); //First node has key equal 0
+graph.Connect(1, 2, 5, "some custom information in edge"); //First node has key equal 1
 
-ShortestPathResult result = graph.Dijkstra(0, 1); //result contains the shortest path
+ShortestPathResult result = graph.Dijkstra(1, 2); //result contains the shortest path
 
-result.GetPath();
+var path = result.GetPath();
+```
+or
+
+```c#
+using Dijkstra.NET.Graph;
+using Dijkstra.NET.ShortestPath;
+
+var graph = new Graph<int, string>() + 1 + 2;
+
+bool connected = graph >> 1 >> 2 >> 5 ^ "custome edge information"; 
+
+ShortestPathResult result = graph.Dijkstra(1, 2); //result contains the shortest path
+
+var path = result.GetPath();
 ```
 
 ## Benchmark
 
-For Graph where number of nodes is 10 000 000 and connections between them 1 000 000. The length of path is minimum 10.
+For Graph where number of nodes is 1 000 000 and connections between them 1 000 000. The length of path is minimum 10.
 
 ``` ini
 
-BenchmarkDotNet=v0.10.10, OS=Windows 7 SP1 (6.1.7601.0)
-Processor=Intel Core i7-6600U CPU 2.60GHz (Skylake), ProcessorCount=4
-Frequency=2742363 Hz, Resolution=364.6490 ns, Timer=TSC
-  [Host]     : .NET Framework 4.7 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.2563.0
-  Job-XQYAYC : .NET Framework 4.7 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.2563.0
+BenchmarkDotNet=v0.10.10, OS=Windows 10.0.17134
+Processor=Intel Core i7-4700HQ CPU 2.40GHz (Haswell), ProcessorCount=8
+Frequency=2338342 Hz, Resolution=427.6534 ns, Timer=TSC
+  [Host]     : .NET Framework 4.6.1 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3260.0
+  Job-XQYAYC : .NET Framework 4.6.1 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3260.0
 
 LaunchCount=1  RunStrategy=Monitoring  TargetCount=3  
 WarmupCount=2  
 
 ```
-|                     Method |     Mean |    Error |   StdDev | Scaled | Allocated |
-|--------------------------- |---------:|---------:|---------:|-------:|----------:|
-| Dijkstra | 5.348 us | 24.43 us | 1.381 us |   1.00 |     16 KB |
+|                     Method |         Mean |      Error |     StdDev | Scaled | ScaledSD |      Gen 0 |      Gen 1 |   Allocated |
+|--------------------------- |-------------:|-----------:|-----------:|-------:|---------:|-----------:|-----------:|------------:|
+| Dijkstra |     7.515 ms |   3.845 ms |  0.2173 ms |   1.00 |     0.00 |          - |          - |       48 KB |
+| PageRank | 1,139.983 ms | 762.417 ms | 43.0780 ms | 151.77 |     5.86 | 40000 | 40000 | 272365.8 KB |
+
 
 ## License
 

src/Dijkstra.NET.Tests/EdgeTest.cs

@@ -5,13 +5,13 @@ namespace Dijkstra.NET.Tests
 {
     public class EdgeTest
     {
-        
+
         [Fact]
         public void Two_Edges_Should_Be_Equal()
         {
             var g = new Graph<string, int>() + "node1";
             var n = g >> 1;
-            
+
             var a = new Edge<string, int>(n, 1, 1);
             var b = new Edge<string, int>(n,1, 1);
 
@@ -25,7 +25,7 @@ public void Two_Edges_Should_Be_Equal_With_Null_References()
         {
             var g = new Graph<string, string>() + "node1";
             var n = g >> 1;
-            
+
             var a = new Edge<string, string>(n, 1, null);
             var b = new Edge<string, string>(n,1, null);
 
@@ -39,7 +39,7 @@ public void Two_Edges_Should_Be_Diffrent_With_Null_Reference()
         {
             var g = new Graph<string, string>() + "node1";
             var n = g >> 1;
-            
+
             var a = new Edge<string, string>(n, 1, null);
             var b = new Edge<string, string>(n,1, "a");
 
@@ -55,7 +55,7 @@ public void Two_Edges_Should_Be_Diffrent_With_Diffrent_Parameter()
         {
             var g = new Graph<string, string>() + "node1";
             var n = g >> 1;
-            
+
             var a = new Edge<string, string>(n, 1, "b");
             var b = new Edge<string, string>(n,1, "a");
 
@@ -71,7 +71,7 @@ public void Two_Edges_Should_Be_Diffrent_With_Diffrent_Costs()
         {
             var g = new Graph<string, string>() + "node1";
             var n = g >> 1;
-            
+
             var a = new Edge<string, string>(n, 3, "a");
             var b = new Edge<string, string>(n,1, "a");
 
@@ -88,7 +88,7 @@ public void Two_Edges_Should_Be_Diffrent_With_Diffrent_Nodes()
             var g = new Graph<string, string>() + "node1" + "node2";
             var n1 = g >> 1;
             var n2 = g >> 2;
-            
+
             var a = new Edge<string, string>(n1, 1, "a");
             var b = new Edge<string, string>(n2,1, "a");
 
@@ -98,5 +98,25 @@ public void Two_Edges_Should_Be_Diffrent_With_Diffrent_Nodes()
             Assert.False(act);
             Assert.False(act2);
         }
+
+        [Fact]
+        public void Edges_Get_TEdgeCustom_Should_Work()
+        {
+            var g = new Graph<int, string>();
+            g.AddNode(1);
+            g.AddNode(2);
+            g.AddNode(3);
+
+            g.Connect(1, 2, 1, "First");
+            g.Connect(1, 3, 1, "Second");
+
+            var node = g >> 1;
+            var first = node.GetFirstEdgeCustom(2);
+            var second = node.GetFirstEdgeCustom(3);
+
+            bool act = first == "First" && second == "Second";
+
+            Assert.True(act);
+        }
     }
 }

src/Dijkstra.NET/Graph/INode.cs

@@ -7,9 +7,9 @@ public interface INode
     {
         uint Key { get; }
     }
-    
+
     public interface INode<T, TEdgeCustom> : INode, IEnumerable<Edge<T, TEdgeCustom>> where TEdgeCustom : IEquatable<TEdgeCustom>
     {
         T Item { get; }
     }
-}
+}

src/Dijkstra.NET/Graph/Node.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using Dijkstra.NET.Graph.Exceptions;
-using Dijkstra.NET.PageRank;
 using Dijkstra.NET.ShortestPath;
 
 namespace Dijkstra.NET.Graph
@@ -130,4 +129,4 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
     }
-}
+}