Merge pull request #32 from matiii/feature/issue-19-parallel-dijkstra

matiii · web-flow · commit 348d91339f52 · 2018-12-30T18:28:42.000+01:00
Refactor
diff --git a/src/Dijkstra.NET.Benchmark/BenchmarkIt.cs b/src/Dijkstra.NET.Benchmark/BenchmarkIt.cs
@@ -3,7 +3,7 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Attributes.Jobs;
 using BenchmarkDotNet.Engines;
-using Dijkstra.NET.Extensions;
+using Dijkstra.NET.ShortestPath;
 
 namespace Dijkstra.NET.Benchmark
 {
diff --git a/src/Dijkstra.NET.Benchmark/DijkstraBenchmarkBase.cs b/src/Dijkstra.NET.Benchmark/DijkstraBenchmarkBase.cs
@@ -1,6 +1,5 @@
 ﻿using System;
-using Dijkstra.NET.Contract;
-using Dijkstra.NET.Model;
+using Dijkstra.NET.Graph;
 
 namespace Dijkstra.NET.Benchmark
 {
diff --git a/src/Dijkstra.NET.Tests/Dijkstra.NET.Tests.csproj b/src/Dijkstra.NET.Tests/Dijkstra.NET.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
diff --git a/src/Dijkstra.NET.Tests/EdgeTest.cs b/src/Dijkstra.NET.Tests/EdgeTest.cs
@@ -1,4 +1,4 @@
-﻿using Dijkstra.NET.Model;
+﻿using Dijkstra.NET.Graph;
 using Xunit;
 
 namespace Dijkstra.NET.Tests
diff --git a/src/Dijkstra.NET.Tests/ShortestPath/DijkstraExtensionsTests.cs b/src/Dijkstra.NET.Tests/ShortestPath/DijkstraExtensionsTests.cs
@@ -1,11 +1,11 @@
 ﻿using System.Linq;
-using Dijkstra.NET.Extensions;
-using Dijkstra.NET.Model;
+using Dijkstra.NET.Graph;
+using Dijkstra.NET.ShortestPath;
 using Xunit;
 
-namespace Dijkstra.NET.Tests.Extensions
+namespace Dijkstra.NET.Tests.ShortestPath
 {
-    public class ShortestPathExtensionsTests
+    public class DijkstraExtensionsTests
     {
         [Fact]
         public void DijkstraGraphShould_Find_Path_In_Multi_Paths_Graph()
diff --git a/src/Dijkstra.NET/Dijkstra.NET.csproj b/src/Dijkstra.NET/Dijkstra.NET.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net40</TargetFrameworks>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Mateusz Mazurek</Authors>
     <Company />
     <Description>High performance the shortest path in directed graph with non negative weights algorithm implementation.</Description>
diff --git a/src/Dijkstra.NET/Graph/ChildAction.cs b/src/Dijkstra.NET/Graph/ChildAction.cs
@@ -1,7 +1,6 @@
 ﻿using System;
-using Dijkstra.NET.Model;
 
-namespace Dijkstra.NET.Delegates
+namespace Dijkstra.NET.Graph
 {
     public delegate void ChildAction<T, TEdgeCustom>(in Edge<T, TEdgeCustom> edge) where TEdgeCustom : IEquatable<TEdgeCustom>;
 }
diff --git a/src/Dijkstra.NET/Graph/Edge.cs b/src/Dijkstra.NET/Graph/Edge.cs
@@ -1,8 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
-using Dijkstra.NET.Contract;
 
-namespace Dijkstra.NET.Model
+namespace Dijkstra.NET.Graph
 {
     public readonly struct Edge<T, TCustom>: IEquatable<Edge<T, TCustom>> where TCustom: IEquatable<TCustom>
     {
diff --git a/src/Dijkstra.NET/Graph/Graph.cs b/src/Dijkstra.NET/Graph/Graph.cs
@@ -2,9 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Dijkstra.NET.Contract;
 
-namespace Dijkstra.NET.Model
+namespace Dijkstra.NET.Graph
 {
     public class Graph<T, TEdgeCustom>: IGraph<T, TEdgeCustom>, IEnumerable<INode<T, TEdgeCustom>> where TEdgeCustom : IEquatable<TEdgeCustom>
     {
diff --git a/src/Dijkstra.NET/Graph/IGraph.cs b/src/Dijkstra.NET/Graph/IGraph.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Dijkstra.NET.Contract
+namespace Dijkstra.NET.Graph
 {
     public interface IGraph<T, TEdgeCustom> where TEdgeCustom : IEquatable<TEdgeCustom>
     {
diff --git a/src/Dijkstra.NET/Graph/INode.cs b/src/Dijkstra.NET/Graph/INode.cs
@@ -1,7 +1,6 @@
 ﻿using System;
-using Dijkstra.NET.Delegates;
 
-namespace Dijkstra.NET.Contract
+namespace Dijkstra.NET.Graph
 {
     public interface INode<T,TEdgeCustom> where TEdgeCustom : IEquatable<TEdgeCustom>
     {
diff --git a/src/Dijkstra.NET/Graph/Node.cs b/src/Dijkstra.NET/Graph/Node.cs
@@ -1,9 +1,6 @@
 ﻿using System;
-using Dijkstra.NET.Constants;
-using Dijkstra.NET.Contract;
-using Dijkstra.NET.Delegates;
 
-namespace Dijkstra.NET.Model
+namespace Dijkstra.NET.Graph
 {
     public class Node<T, TEdgeCustom>: INode<T, TEdgeCustom> where TEdgeCustom: IEquatable<TEdgeCustom>
     {
diff --git a/src/Dijkstra.NET/Graph/NodeConstants.cs b/src/Dijkstra.NET/Graph/NodeConstants.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Dijkstra.NET.Constants
+namespace Dijkstra.NET.Graph
 {
     internal class NodeConstants
     {
diff --git a/src/Dijkstra.NET/ShortestPath/Dijkstra.cs b/src/Dijkstra.NET/ShortestPath/Dijkstra.cs
@@ -1,33 +1,13 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
-using Dijkstra.NET.Contract;
-using Dijkstra.NET.Model;
-using Dijkstra.NET.Utility;
+using Dijkstra.NET.Graph;
 
-namespace Dijkstra.NET.Extensions
+namespace Dijkstra.NET.ShortestPath
 {
-    public static class ShortestPathExtensions
+    internal static class Dijkstra
     {
-        /// <summary>
-        /// Get path from @from to @to
-        /// </summary>
-        /// <param name="graph">Source graph</param>
-        /// <param name="from">Start node</param>
-        /// <param name="to">End node</param>
-        /// <returns>Value with path</returns>
-        public static ShortestPathResult Dijkstra<T, TEdgeCustom>(this IGraph<T, TEdgeCustom> graph, uint from, uint to)
-            where TEdgeCustom : IEquatable<TEdgeCustom> => Dijkstra(graph, from, to, Int32.MaxValue);
-
-        /// <summary>
-        /// Get path from @from to @to
-        /// </summary>
-        /// <param name="graph">Source graph</param>
-        /// <param name="from">Start node</param>
-        /// <param name="to">End node</param>
-        /// <param name="depth">Depth of path</param>
-        /// <returns>Value with path</returns>
-        public static ShortestPathResult Dijkstra<T, TEdgeCustom>(this IGraph<T, TEdgeCustom> graph, uint from, uint to,
-            int depth)
+        public static ShortestPathResult GetShortestPath<T, TEdgeCustom>(IGraph<T, TEdgeCustom> graph, uint from, uint to,
+            int depth, int modulo = 1, int r = 0)
             where TEdgeCustom : IEquatable<TEdgeCustom>
         {
             var path = new Dictionary<uint, uint>();
@@ -59,7 +39,7 @@ int Distance(uint key)
 
                 graph[u].EachChild((in Edge<T, TEdgeCustom> e) =>
                 {
-                    if (Distance(e.Node.Key) > Distance(u) + e.Cost)
+                    if (e.Node.Key % modulo == r && Distance(e.Node.Key) > Distance(u) + e.Cost)
                     {
                         if (current.Contains(e.Node.Key))
                         {
diff --git a/src/Dijkstra.NET/ShortestPath/DijkstraExtensions.cs b/src/Dijkstra.NET/ShortestPath/DijkstraExtensions.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Dijkstra.NET.Graph;
+
+namespace Dijkstra.NET.ShortestPath
+{
+    public static class DijkstraExtensions
+    {
+        /// <summary>
+        /// Get path from @from to @to
+        /// </summary>
+        /// <param name="graph">Source graph</param>
+        /// <param name="from">Start node</param>
+        /// <param name="to">End node</param>
+        /// <returns>Value with path</returns>
+        public static ShortestPathResult Dijkstra<T, TEdgeCustom>(this IGraph<T, TEdgeCustom> graph, uint from, uint to)
+            where TEdgeCustom : IEquatable<TEdgeCustom> => Dijkstra(graph, from, to, Int32.MaxValue);
+
+        /// <summary>
+        /// Get path from @from to @to
+        /// </summary>
+        /// <param name="graph">Source graph</param>
+        /// <param name="from">Start node</param>
+        /// <param name="to">End node</param>
+        /// <param name="depth">Depth of path</param>
+        /// <returns>Value with path</returns>
+        public static ShortestPathResult Dijkstra<T, TEdgeCustom>(this IGraph<T, TEdgeCustom> graph, uint from, uint to,
+            int depth)
+            where TEdgeCustom : IEquatable<TEdgeCustom>
+        {
+            return ShortestPath.Dijkstra.GetShortestPath(graph, from, to, depth);
+        }
+    }
+}
diff --git a/src/Dijkstra.NET/ShortestPath/NodeComparer.cs b/src/Dijkstra.NET/ShortestPath/NodeComparer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Dijkstra.NET.Utility
+namespace Dijkstra.NET.ShortestPath
 {
     internal class NodeComparer : IComparer<uint>
     {
diff --git a/src/Dijkstra.NET/ShortestPath/ShortestPathResult.cs b/src/Dijkstra.NET/ShortestPath/ShortestPathResult.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Dijkstra.NET.Model
+namespace Dijkstra.NET.ShortestPath
 {
     public readonly struct ShortestPathResult
     {
@@ -24,7 +24,7 @@ internal ShortestPathResult(uint @from, uint to): this(@from, @to, Int32.MaxValu
 
         public uint ToNode { get; }
 
-        public bool IsFounded => Distance != Int32.MaxValue;
+        public bool IsFounded => _path != null;
 
         public IEnumerable<uint> GetReversePath()
         {
@@ -47,5 +47,10 @@ public IEnumerable<uint> GetReversePath()
         }
 
         public IEnumerable<uint> GetPath() => GetReversePath().Reverse();
+
+        public override string ToString()
+        {
+            return $"({FromNode})-[{Distance}]->({ToNode})";
+        }
     }
 }
diff --git a/src/Dijkstra.NET/ShortestPath/SortedSetExtensions.cs b/src/Dijkstra.NET/ShortestPath/SortedSetExtensions.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 
-namespace Dijkstra.NET.Extensions
+namespace Dijkstra.NET.ShortestPath
 {
     internal static class SortedSetExtensions
     {
diff --git a/src/Samples/Dijkstra.Net40/Program.cs b/src/Samples/Dijkstra.Net40/Program.cs
@@ -1,5 +1,5 @@
-﻿using Dijkstra.NET.Extensions;
-using Dijkstra.NET.Model;
+﻿using Dijkstra.NET.Graph;
+using Dijkstra.NET.ShortestPath;
 
 namespace Dijkstra.Net40
 {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using BenchmarkDotNet.Attributes;`
`4`	`4`	`using BenchmarkDotNet.Attributes.Jobs;`
`5`	`5`	`using BenchmarkDotNet.Engines;`
`6`		`-using Dijkstra.NET.Extensions;`
	`6`	`+using Dijkstra.NET.ShortestPath;`
`7`	`7`
`8`	`8`	`namespace Dijkstra.NET.Benchmark`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using Dijkstra.NET.Contract;`
`3`		`-using Dijkstra.NET.Model;`
	`2`	`+using Dijkstra.NET.Graph;`
`4`	`3`
`5`	`4`	`namespace Dijkstra.NET.Benchmark`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<TargetFramework>netcoreapp2.0</TargetFramework>`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using Dijkstra.NET.Model;`
`3`	`2`
`4`		`-namespace Dijkstra.NET.Delegates`
	`3`	`+namespace Dijkstra.NET.Graph`
`5`	`4`	`{`
`6`	`5`	`public delegate void ChildAction<T, TEdgeCustom>(in Edge<T, TEdgeCustom> edge) where TEdgeCustom : IEquatable<TEdgeCustom>;`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using Dijkstra.NET.Contract;`
`4`	`3`
`5`		`-namespace Dijkstra.NET.Model`
	`4`	`+namespace Dijkstra.NET.Graph`
`6`	`5`	`{`
`7`	`6`	`public readonly struct Edge<T, TCustom>: IEquatable<Edge<T, TCustom>> where TCustom: IEquatable<TCustom>`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,8 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
`5`		`-using Dijkstra.NET.Contract;`
`6`	`5`
`7`		`-namespace Dijkstra.NET.Model`
	`6`	`+namespace Dijkstra.NET.Graph`
`8`	`7`	`{`
`9`	`8`	`public class Graph<T, TEdgeCustom>: IGraph<T, TEdgeCustom>, IEnumerable<INode<T, TEdgeCustom>> where TEdgeCustom : IEquatable<TEdgeCustom>`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace Dijkstra.NET.Contract`
	`3`	`+namespace Dijkstra.NET.Graph`
`4`	`4`	`{`
`5`	`5`	`public interface IGraph<T, TEdgeCustom> where TEdgeCustom : IEquatable<TEdgeCustom>`
`6`	`6`	`{`