Добавлено CellsPositionsOnMap для быстрого доступа к позиции ячеек оптимального маршрута и построения на карте узлов и линий между ними.

Небольшой рефакторинг кода.

Author: Maslov

Northrend.Alodi/Classes/Cell.cs

@@ -13,13 +13,18 @@ public class Cell : ICell
 
         public decimal Latitude { get; init; }
 
+        public int PositionX { get; init; }
+        public int PositionY { get; init; }
+
         Dictionary<string, decimal> mIntegralVelocities = [];
         public Dictionary<string, decimal> IntegralVelocities => mIntegralVelocities;
 
-        public Cell(decimal longitude, decimal latitude) 
+        public Cell(decimal longitude, decimal latitude, int positionX, int positionY) 
         {
             Longitude = longitude;
             Latitude = latitude;
+            PositionX = positionX;
+            PositionY = positionY;
         }
 
         public void AddIntegralVelocity(string date, decimal integralVelocity)

Northrend.Alodi/Classes/Factory.cs

@@ -10,8 +10,8 @@ namespace Northrend.Alodi.Classes
 {
     public static class Factory
     {
-        public static ICell CreateCell(decimal longitude, decimal latitude)
-            => new Cell(longitude, latitude);
+        public static ICell CreateCell(decimal longitude, decimal latitude, int positionX, int positionY)
+            => new Cell(longitude, latitude, positionX, positionY);
 
         public static IMap CreateMap(int x, int y)
             => new Map(x, y);

Northrend.Alodi/Classes/Node.cs

@@ -19,7 +19,7 @@ public class Node : INode
         public decimal Longitude { get ; init; }
         public decimal Latitude { get; init; }
 
-        ICell? mCell = null;
+        ICell? mCell;
         public ICell? Cell => mCell;
 
 

Northrend.Alodi/Classes/RouteNode.cs Northrend.Alodi/Classes/RouteByNodes.csNorthrend.Alodi/Classes/RouteNode.cs renamed to Northrend.Alodi/Classes/RouteByNodes.cs

@@ -3,16 +3,19 @@
 
 namespace Northrend.Alodi.Classes
 {
-    public class RouteNode : IEquatable<RouteNode>, IRouteNode
+    public class RouteByNodes : IEquatable<IRouteByNodes>, IRouteByNodes
     {
         readonly List<INode> mNodes = [];
         public List<INode> Nodes => mNodes;
 
         decimal mDistance = 0;
         public decimal Distance => mDistance;
 
-        public RouteNode() { }
-        public RouteNode(IEnumerable<INode> nodes)
+        public IEnumerable<(int i, int j)> CellsPositionsOnMap 
+            => Nodes.Select(x => (x.Cell.PositionX, x.Cell.PositionY) );
+
+        public RouteByNodes() { }
+        public RouteByNodes(IEnumerable<INode> nodes)
         {
             foreach (var node in nodes)
                 Add(node);
@@ -38,10 +41,10 @@ public void Add(INode node)
         public bool IsExistNodeByName(string nodeName)
             => Nodes.Any(x => x.Name.Equals(nodeName, StringComparison.OrdinalIgnoreCase));
 
-        public RouteNode Clone()
-            => new(Nodes);
+        public IRouteByNodes Clone()
+            => new RouteByNodes(Nodes);
 
-        public bool Equals(RouteNode? other)
+        public bool Equals(IRouteByNodes? other)
         {
             if (other is null)
                 return false;

Northrend.Alodi/Interfaces/ICell.cs

@@ -8,6 +8,8 @@ namespace Northrend.Alodi.Interfaces
 {
     public interface ICell : ICoordinate
     {
+        int PositionX { get; }
+        int PositionY { get; }
         Dictionary<string, decimal> IntegralVelocities { get; }
 
         void AddIntegralVelocity(string date, decimal integralVelocity);

Northrend.Alodi/Interfaces/IRouteNode.cs …thrend.Alodi/Interfaces/IRouteByNodes.csNorthrend.Alodi/Interfaces/IRouteNode.cs renamed to Northrend.Alodi/Interfaces/IRouteByNodes.cs Northrend.Alodi/Interfaces/IRouteNode.cs renamed to Northrend.Alodi/Interfaces/IRouteByNodes.cs

@@ -2,14 +2,15 @@
 
 namespace Northrend.Alodi.Interfaces
 {
-    public interface IRouteNode
+    public interface IRouteByNodes
     {
         decimal Distance { get; }
         List<INode> Nodes { get; }
-
+        IEnumerable<(int i, int j)> CellsPositionsOnMap { get; }
         void Add(INode node);
         bool IsExistNodeByName(string nodeName);
-        RouteNode Clone();
-        bool Equals(RouteNode? other);
+        IRouteByNodes Clone();
+        bool Equals(IRouteByNodes? other);
+       
     }
 }

Northrend.Alodi/Services/ImportDataService.cs

@@ -60,7 +60,7 @@ public ImportDataService(IServiceProvider serviceProvider)
                             //вызываем ошибку
                         }
 
-                        var cell = Factory.CreateCell(longitude, latitude);
+                        var cell = Factory.CreateCell(longitude, latitude, col - 1, row - 1);
 
                         for (int i = 2; i < package.Workbook.Worksheets.Count; i++)
                         {

Northrend.Alodi/Services/RoutesCreatorService.cs

@@ -7,7 +7,7 @@ namespace Northrend.Alodi.Services
 {
     public class RoutesCreatorService
     {
-        readonly ConcurrentBag<IRouteNode> mCreatedRoutes = [];
+        readonly ConcurrentBag<IRouteByNodes> mCreatedRoutes = [];
         readonly ConcurrentBag<Task> mTasks = [];
 
         static readonly byte mMaxDegreeOfParallelism = 32;
@@ -32,7 +32,7 @@ public RoutesCreatorService(IServiceProvider serviceProvider) { }
         /// <param name="cancellationToken">Токен отмены анализа в случае, если анализ будет длиться продолжительное время.</param>
         /// <returns>Возвращает кортеж из списка маршрутов, отсортированных по дистанции, а также флаг успешности выполнения поиска маршуртов.
         /// Возвращает true, если успешно выполнен поиск, иначе возвращает false.</returns>
-        public (IEnumerable<IRouteNode> Routes, bool IsSuccess) CreateRoutesByNodes(INodesMap? nodes, string startNodeName, string endNodeName, CancellationToken? cancellationToken = null)
+        public (IEnumerable<IRouteByNodes> Routes, bool IsSuccess) CreateRoutesByNodes(INodesMap? nodes, string startNodeName, string endNodeName, CancellationToken? cancellationToken = null)
         {
             if (nodes is null)
                 return ([], false);
@@ -50,14 +50,14 @@ public RoutesCreatorService(IServiceProvider serviceProvider) { }
             if (cancellationToken is null)
                 cancellationToken = new CancellationTokenSource(new TimeSpan(0, mTimeWatingToAbortAnalyzeInSeconds, 0)).Token;
 
-            ConcurrentBag<IRouteNode> routes = [];
+            ConcurrentBag<IRouteByNodes> routes = [];
             foreach (var nodeLine in mStartPoint.NextNodes)
             {
                 var node = mNodes.GetNodeByName(nodeLine.Key);
                 if (node is null)
                     return ([], false);
 
-                var route = new RouteNode();
+                var route = new RouteByNodes();
                 route.Add(mStartPoint);
                 route.Add(node);
                 routes.Add(route);
@@ -68,15 +68,15 @@ public RoutesCreatorService(IServiceProvider serviceProvider) { }
         }
 
 
-        bool AnalyzeNodesToCreateRoutes(IReadOnlyCollection<IRouteNode> routes) 
+        bool AnalyzeNodesToCreateRoutes(IReadOnlyCollection<IRouteByNodes> routes) 
         {
             if (mNodes is null)
                 return false;
 
             if (mStartPoint is null || mEndPoint is null)
                 return false;
 
-            ConcurrentBag<IRouteNode> tempRoutes = [];
+            ConcurrentBag<IRouteByNodes> tempRoutes = [];
 
             Task[] tasks = new Task[routes.Count];
             int taskPosition = 0;
@@ -137,7 +137,7 @@ bool AnalyzeNodesToCreateRoutes(IReadOnlyCollection<IRouteNode> routes)
         }
 
 
-        public (IRouteNode? UpdatedRoute, bool IsSuccess) FindCellsForRouteNodes(IMap? map, IRouteNode? route, decimal shift)
+        public (IRouteByNodes? UpdatedRoute, bool IsSuccess) FindCellsForRouteNodes(IMap? map, IRouteByNodes? route, decimal shift)
         {
             if(map is null ||  route is null) 
                 return (null, false);
@@ -153,9 +153,10 @@ bool AnalyzeNodesToCreateRoutes(IReadOnlyCollection<IRouteNode> routes)
                         map.Cells[i, j].Latitude - deltaY, 
                         deltaX * 2, 
                         deltaY * 2);
-                    
+
                     foreach (var node in route.Nodes)
-                        if (rectangle.Contains(node.Longitude, node.Latitude, shift))
+                        if (rectangle.Contains(node.Longitude, node.Latitude, shift)
+                            && node.Cell is null)
                             node.AddCell(map.Cells[i, j]);
                 }