epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework PriorityQueue for performance.

Browse Source 
- Providing the comparer as a type argument that is a struct allows the calls to be devirtualised, leading to approx a 3x performance improvement.
- Use a single backing array, rather than a list of arrays.
This commit is contained in:
RoosterDragon
2023-03-22 18:04:14 +00:00
committed by abcdefg30
parent 7a4ac01348
commit 8a4303cc94
4 changed files with 90 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Pathfinder/IPathGraph.cs
View File

@@ -77,12 +77,8 @@ namespace OpenRA.Mods.Common.Pathfinder
/// </summary>
public readonly struct GraphConnection
{
public static readonly CostComparer ConnectionCostComparer = CostComparer.Instance;
public sealed class CostComparer : IComparer<GraphConnection>
public readonly struct CostComparer : IComparer<GraphConnection>
{
public static readonly CostComparer Instance = new CostComparer();
CostComparer() { }
public int Compare(GraphConnection x, GraphConnection y)
{
return x.Cost.CompareTo(y.Cost);

2
OpenRA.Mods.Common/Pathfinder/PathSearch.cs
View File

@@ -170,7 +170,7 @@ namespace OpenRA.Mods.Common.Pathfinder
this.heuristicWeightPercentage = heuristicWeightPercentage;
TargetPredicate = targetPredicate;
this.recorder = recorder;
openQueue = new PriorityQueue<GraphConnection>(GraphConnection.ConnectionCostComparer);
openQueue = new Primitives.PriorityQueue<GraphConnection, GraphConnection.CostComparer>(default);
}
void AddInitialCell(CPos location, Func<CPos, int> customCost)