ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize ZwinderStateManger.GetStateClosestToFrame 

AllStates() sorted the returned states, but this order was not used anywhere else, so I've removed it. GetStateClosestToFrame is solvable in O(n), so sorting is not required there either.

This is an O(n log(n)) -> O(n) improvement that is mostly relevant for the state history integrity checker
This commit is contained in:
Morilli 2024-10-20 16:55:02 +02:00
parent 7ab2ca6b89
commit b7b8788354
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs
View File

@ -251,14 +251,13 @@ namespace BizHawk.Client.Common
} }
/// <summary> /// <summary>
/// Enumerate all states in reverse order /// Enumerate all states in the following order: current -> recent -> gap -> reserved states
/// </summary> /// </summary>
internal IEnumerable<StateInfo> AllStates() internal IEnumerable<StateInfo> AllStates()
{ {
return CurrentAndRecentStates() return CurrentAndRecentStates()
.Concat(GapStates()) .Concat(GapStates())
.Concat(ReservedStates()) .Concat(ReservedStates());
.OrderByDescending(s => s.Frame);
} }
public int Last => StateCache.Max(); public int Last => StateCache.Max();
@ -474,8 +473,15 @@ namespace BizHawk.Client.Common
if (frame < 0) if (frame < 0)
throw new ArgumentOutOfRangeException(nameof(frame)); throw new ArgumentOutOfRangeException(nameof(frame));
var si = AllStates().First(s => s.Frame <= frame); StateInfo closestState = null;
return new KeyValuePair<int, Stream>(si.Frame, si.Read()); foreach (var state in AllStates())
{
if (state.Frame <= frame && (closestState is null || state.Frame > closestState.Frame))
{
closestState = state;
}
}
return new KeyValuePair<int, Stream>(closestState!.Frame, closestState.Read());
} }
public bool HasState(int frame) public bool HasState(int frame)