Skip to content

Commit 676fbc5

Browse files
author
Зелёный Андрей Сергеевич
committed
Заменил ConcurrentPriorityQueue на SimplePriorityQueue
1 parent 643f69a commit 676fbc5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

DijkstraAlgorithm.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<Reference Include="ConcurrentPriorityQueue, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
3737
<HintPath>packages\PriorityQueue.0.1.0\lib\net45\ConcurrentPriorityQueue.dll</HintPath>
3838
</Reference>
39+
<Reference Include="PriorityQueue, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5e136dbf0437dacd, processorArchitecture=MSIL">
40+
<HintPath>packages\OptimizedPriorityQueue.5.1.0\lib\net45\PriorityQueue.dll</HintPath>
41+
</Reference>
3942
<Reference Include="System" />
4043
<Reference Include="System.Core" />
4144
<Reference Include="System.Xml.Linq" />

Graph.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using ConcurrentPriorityQueue;
5+
using Priority_Queue;
66

77

88
namespace DijkstraAlgorithm
@@ -88,7 +88,7 @@ public List<Point2D> FindShortestPathAndLength(Point2D startPoint, Point2D goalP
8888
Vertex goal = Vertices[goalPoint.i, goalPoint.j];
8989

9090
// Очередь с приоритетом
91-
ConcurrentPriorityQueue<Vertex, double> priorityQueue = new ConcurrentPriorityQueue<Vertex, double>(new MyDoubleComparer());
91+
SimplePriorityQueue<Vertex, double> priorityQueue = new SimplePriorityQueue<Vertex, double>();
9292
priorityQueue.Enqueue(start, start.Label);
9393

9494
// Цикл заканчивает свою работу, когда очередь пустая, либо когда целевая вершина оказалась посещена

packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="OptimizedPriorityQueue" version="5.1.0" targetFramework="net472" />
34
<package id="PriorityQueue" version="0.1.0" targetFramework="net472" />
45
</packages>

0 commit comments

Comments
 (0)