Merge pull request #164 from NosCoreIO/AddDotnet6

Add dotnet6

Author: erwan-joly

documentation/brushfire.png

@@ -17,8 +17,8 @@
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
     <PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.1.0" />
-    <PackageReference Include="NosCore.Dao" Version="1.7.4" />
-    <PackageReference Include="NosCore.Shared" Version="1.14.4" />
+    <PackageReference Include="NosCore.Dao" Version="2.0.0" />
+    <PackageReference Include="NosCore.Shared" Version="2.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
     <PackageReference Include="OpenTK.NetStandard" Version="1.0.5.32" />
   </ItemGroup>

documentation/goal-based-pathfinder.png

@@ -39,21 +39,21 @@ public static BrushFire LoadBrushFire(this IMapGrid mapGrid, (short X, short Y)
                 return new BrushFire(user, new Dictionary<(short X, short Y), Node?>(), mapGrid.Width, mapGrid.Height);
             }
 
-            var path = new MinHeap();
+            var path = new PriorityQueue<Node, double>();
             var cellGrid = new Dictionary<(short X, short Y), Node?>();
             var grid = new Node?[mapGrid.Width, mapGrid.Height];
             grid[user.X, user.Y] = new Node(user, mapGrid[user.X, user.Y])
             {
                 Closed = true
             };
-            path.Push(grid[user.X, user.Y]!);
+            path.Enqueue(grid[user.X, user.Y]!, 0);
             cellGrid[user] = new Node(user, null);
 
             // while the open list is not empty
             while (path.Count > 0)
             {
                 // pop the position of Cell which has the minimum `f` value.
-                var cell = path.Pop();
+                var cell = path.Dequeue();
                 cellGrid[cell.Position] ??= new Node(cell.Position, mapGrid[cell.Position.X, cell.Position.Y]);
                 grid[cell.Position.X, cell.Position.Y] ??= new Node(cell.Position, mapGrid[cell.Position.X, cell.Position.Y]);
                 grid[cell.Position.X, cell.Position.Y]!.Closed = true;
@@ -78,7 +78,7 @@ public static BrushFire LoadBrushFire(this IMapGrid mapGrid, (short X, short Y)
                         grid[neighbors[i]!.Position.X, neighbors[i]!.Position.Y] = neighbors[i];
                     }
 
-                    path.Push(neighbors[i]!);
+                    path.Enqueue(neighbors[i]!, neighbors[i]!.F);
                     neighbors[i]!.Closed = true;
                 }
             }

documentation/jump-point-search-pathfinder.png

@@ -8,23 +8,16 @@
 
 namespace NosCore.PathFinder.Brushfire
 {
-    public class JumpNode : Node, IComparable<JumpNode>
+    public class JumpNode : Node
     {
-        public JumpNode((short X, short Y) position, double? value)
+        public JumpNode((short X, short Y) position, double? value) : base(position, value)
         {
-            Value = value;
-            Position = position;
         }
 
         public double G { get; set; }
 
         public double? H { get; set; }
 
         public bool Opened { get; set; }
-
-        public int CompareTo(JumpNode? other)
-        {
-            return F > other?.F ? 1 : F < other?.F ? -1 : 0;
-        }
     }
 }

src/NosCore.PathFinder.Gui/NosCore.PathFinder.Gui.csproj

@@ -8,22 +8,14 @@
 
 namespace NosCore.PathFinder.Brushfire
 {
-    public class Node : IComparable<Node>
+    public class Node
     {
         public Node((short X, short Y) position, double? value)
         {
             Value = value;
             Position = position;
         }
-
-        public Node()
-        {
-        }
-
-        public int CompareTo(Node? other)
-        {
-            return F > other?.F ? 1 : F < other?.F ? -1 : 0;
-        }
+        
         public bool Closed { get; set; }
 
         public Node? Parent { get; set; }

src/NosCore.PathFinder/Brushfire/IMapGridExtension.cs

@@ -12,7 +12,7 @@
 		<RepositoryUrl>https://github.com/NosCoreIO/NosCore.PathFinder.git</RepositoryUrl>
 		<PackageIconUrl></PackageIconUrl>
 		<PackageTags>nostale, noscore, nostale private server source, nostale emulator</PackageTags>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<Description>NosCore's PathFinder</Description>
 		<PackageLicenseExpression></PackageLicenseExpression>

src/NosCore.PathFinder/Brushfire/JumpNode.cs

@@ -79,12 +79,12 @@ public JumpPointSearchPathfinder(IMapGrid mapGrid, IHeuristic heuristic)
             {
                 var startNode = new JumpNode(start, _mapGrid[start.X, start.Y]) { F = 0, G = 0, Opened = true };
                 nodes[start.X, start.Y] = startNode;
-                var heap = new MinHeap();
-                heap.Push(startNode);
+                var heap = new PriorityQueue<JumpNode, double>();
+                heap.Enqueue(startNode, 0);
 
                 while (heap.Count != 0)
                 {
-                    var node = heap.Pop();
+                    var node = heap.Dequeue();
                     node.Closed = true;
                     if (node.Position == end)
                     {
@@ -109,7 +109,7 @@ public JumpPointSearchPathfinder(IMapGrid mapGrid, IHeuristic heuristic)
             return path.Select(s => s.Position).ToList();
         }
 
-        private void IdentifySuccessors(JumpNode node, JumpNode?[,] nodes, (short X, short Y) end, MinHeap heap)
+        private void IdentifySuccessors(JumpNode node, JumpNode?[,] nodes, (short X, short Y) end, PriorityQueue<JumpNode, double> heap)
         {
             foreach (var neighbour in _mapGrid.GetNeighbors(node.Position))
             {
@@ -143,7 +143,7 @@ private void IdentifySuccessors(JumpNode node, JumpNode?[,] nodes, (short X, sho
 
                 if (!jumpNode.Opened)
                 {
-                    heap.Push(jumpNode);
+                    heap.Enqueue(jumpNode, jumpNode.F);
                     jumpNode.Opened = true;
                 }
             }