glax/OSMServer
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Compare commits

base: glax:3077b4d8b8a6b36ec5ac70c0f6b93f0283147460
Branches Tags
glax:master
..
compare: glax:e53d1086cc9d2afd08b34a0be0d11a8dea165b76
Branches Tags
glax:master

2 Commits
3077b4d8b8 ... e53d1086cc

Author SHA1 Message Date
glax
e53d1086cc TKey can not be null. 2023-05-17 19:01:00 +02:00
glax
dc98fb51b1 Make RPriorityQueue.Count point directly to the queue.Count instead of manually updating every operation. 2023-05-17 19:00:47 +02:00
1 changed files with 3 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
Pathfinding/RPriorityQueue.cs
View File

@ -3,7 +3,7 @@ namespace Pathfinding;
public class RPriorityQueue<TKey, TPriority> where TKey : notnull public class RPriorityQueue<TKey, TPriority> where TKey : notnull
{ {
public Dictionary<TKey, TPriority> queue; public Dictionary<TKey, TPriority> queue;
public int Count { get; private set; } public int Count => queue.Count;
public RPriorityQueue() public RPriorityQueue()
{ {
@ -14,14 +14,12 @@ public class RPriorityQueue<TKey, TPriority> where TKey : notnull
{ {
if (!queue.TryAdd(key, priority)) if (!queue.TryAdd(key, priority))
queue[key] = priority; queue[key] = priority;
Count = queue.Count;
} }
public TKey? Dequeue() public TKey Dequeue()
{ {
TKey? retKey = queue.MinBy(item => item.Value).Key; TKey retKey = queue.MinBy(item => item.Value).Key;
queue.Remove(retKey); queue.Remove(retKey);
Count = queue.Count;
return retKey; return retKey;
} }
@ -30,7 +28,6 @@ public class RPriorityQueue<TKey, TPriority> where TKey : notnull
int before = Count; int before = Count;
queue = queue.Where(queueitem => !elements.Contains(queueitem.Key)) queue = queue.Where(queueitem => !elements.Contains(queueitem.Key))
.ToDictionary(item => item.Key, item => item.Value); .ToDictionary(item => item.Key, item => item.Value);
Count = queue.Count;
return before - Count; return before - Count;
} }
@ -38,7 +35,6 @@ public class RPriorityQueue<TKey, TPriority> where TKey : notnull
{ {
int before = Count; int before = Count;
queue = queue.IntersectBy(exceptKeys, item => item.Key).ToDictionary(item => item.Key, item => item.Value); queue = queue.IntersectBy(exceptKeys, item => item.Key).ToDictionary(item => item.Key, item => item.Value);
Count = queue.Count;
return before - Count; return before - Count;
} }