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

Fix LowerBoundBinarySearch, fix lag check

This commit is contained in:
Morilli 2024-03-08 02:22:31 +01:00
parent b8e49413cf
commit d29da10e91
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -82,7 +82,7 @@ namespace BizHawk.Client.EmuHawk
else if (index < Markers.Count) else if (index < Markers.Count)
{ {
var marker = Markers[index]; var marker = Markers[index];
bool? lagged = Tastudio.CurrentTasMovie.LagLog[marker.Frame]; bool? lagged = Tastudio.CurrentTasMovie.LagLog[marker.Frame + 1];
if (lagged.HasValue) if (lagged.HasValue)
{ {

37
src/BizHawk.Common/Extensions/CollectionExtensions.cs
View File

@ -21,14 +21,13 @@ namespace BizHawk.Common.CollectionExtensions
where TKey : IComparable<TKey> where TKey : IComparable<TKey>
{ {
int min = 0; int min = 0;
int max = list.Count; int max = list.Count - 1;
int mid; int mid;
TKey midKey;
while (min < max) while (min < max)
{ {
mid = (max + min) / 2; mid = (max + min) / 2;
T midItem = list[mid]; T midItem = list[mid];
midKey = keySelector(midItem); var midKey = keySelector(midItem);
int comp = midKey.CompareTo(key); int comp = midKey.CompareTo(key);
if (comp < 0) if (comp < 0)
{ {
@ -44,32 +43,16 @@ namespace BizHawk.Common.CollectionExtensions
} }
} }
// did we find it exactly? int compareResult = keySelector(list[min]).CompareTo(key);
if (min == max && keySelector(list[min]).CompareTo(key) == 0)
// return something corresponding to lower_bound semantics
// if min is higher than key, return min - 1. Otherwise, when min is <=key, return min directly.
if (compareResult > 0)
{ {
return min; return min - 1;
} }
mid = min; return min;
// we didn't find it. return something corresponding to lower_bound semantics
if (mid == list.Count)
{
return max; // had to go all the way to max before giving up; lower bound is max
}
if (mid == 0)
{
return -1; // had to go all the way to min before giving up; lower bound is min
}
midKey = keySelector(list[mid]);
if (midKey.CompareTo(key) >= 0)
{
return mid - 1;
}
return mid;
} }
/// <exception cref="InvalidOperationException"><paramref name="key"/> not found after mapping <paramref name="keySelector"/> over <paramref name="list"/></exception> /// <exception cref="InvalidOperationException"><paramref name="key"/> not found after mapping <paramref name="keySelector"/> over <paramref name="list"/></exception>
@ -256,7 +239,7 @@ namespace BizHawk.Common.CollectionExtensions
else else
{ {
foreach (var item in list.Where(item => match(item)) // can't simply cast to Func<T, bool> foreach (var item in list.Where(item => match(item)) // can't simply cast to Func<T, bool>
.ToList()) // very important .ToList()) // very important
{ {
list.Remove(item); list.Remove(item);
} }