Merge pull request #42 from matiii/feature/i20-page-rank

Feature/i20 page rank

Author: matiii

src/Dijkstra.NET.Benchmark/BenchmarkIt.cs

@@ -40,7 +40,7 @@ public int DijkstraExtensionBenchmark()
         [Benchmark]
         public double PageRankExtensionBenchmark()
         {
-            var result = Graph.CalculatePageRank();
+            var result = Graph.PageRank();
 
             return result[BenchmarkBase.First];
         }

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");
 
@@ -114,7 +114,6 @@ public void Edges_Get_TEdgeCustom_Should_Work()
             var first = node.GetFirstEdgeCustom(2);
             var second = node.GetFirstEdgeCustom(3);
 
-
             bool act = first == "First" && second == "Second";
 
             Assert.True(act);

src/Dijkstra.NET.Tests/PageRank/PageRankExtensionsTests.cs

@@ -26,11 +26,34 @@ public void CalculatePageRank_Should_Calculate_Correct_PageRank()
             g.Connect(d, c, 0, 0);
 
 
-            var result = g.CalculatePageRank();
-            
+            var result = g.PageRank();
+
+            Assert.True(Math.Abs(result[c] - 0.35625) < 0.0001);
+        }
+
+        [Fact]
+        public void SimpleGraph_CalculatePageRank_Should_Calculate_Correct_PageRank()
+        {
+            var g = new Graph.Simple.Graph();
+
+            uint a = g.AddNode();
+            uint b = g.AddNode();
+            uint c = g.AddNode();
+            uint d = g.AddNode();
+
+            g.Connect(a, b);
+            g.Connect(a, c);
+            g.Connect(b, d);
+            g.Connect(c, a);
+            g.Connect(c, b);
+            g.Connect(c, d);
+            g.Connect(d, c);
+
+            var result = g.PageRank();
+
             Assert.True(Math.Abs(result[c] - 0.35625) < 0.0001);
         }
-        
+
         [Fact]
         public void CalculatePageRank_Should_Calculate_Correct_PageRank_Wiki()
         {
@@ -49,8 +72,33 @@ public void CalculatePageRank_Should_Calculate_Correct_PageRank_Wiki()
             g.Connect(d, c, 0, 0);
 
 
-            var result = g.CalculatePageRank();
-            
+            var result = g.PageRank();
+
+            Assert.True(Math.Abs(result[a] - 0.35) < 0.01);
+            Assert.True(Math.Abs(result[b] - 0.29) < 0.01);
+            Assert.True(Math.Abs(result[c] - 0.15) < 0.01);
+            Assert.True(Math.Abs(result[d] - 0.18) < 0.01);
+        }
+
+        [Fact]
+        public void SimpleGraph_CalculatePageRank_Should_Calculate_Correct_PageRank_Wiki()
+        {
+            var g = new Graph.Simple.Graph();
+
+            uint a = g.AddNode();
+            uint b = g.AddNode();
+            uint c = g.AddNode();
+            uint d = g.AddNode();
+
+            g.Connect(a, b);
+            g.Connect(a, d);
+            g.Connect(b, a);
+            g.Connect(c, b);
+            g.Connect(c, a);
+            g.Connect(d, c);
+
+            var result = g.PageRank();
+
             Assert.True(Math.Abs(result[a] - 0.35) < 0.01);
             Assert.True(Math.Abs(result[b] - 0.29) < 0.01);
             Assert.True(Math.Abs(result[c] - 0.15) < 0.01);