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

Refactor `BasicBot.IsBetter`

This commit is contained in:
YoshiRulz 2022-07-18 18:22:59 +10:00
parent 008a5953f6
commit 6b325ff56c
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -915,50 +915,29 @@ namespace BizHawk.Client.EmuHawk
private bool IsBetter(BotAttempt comparison, BotAttempt current)
{
if (!TestValue(MainComparisonType, current.Maximize, comparison.Maximize))
{
return false;
}
if (current.Maximize == comparison.Maximize)
{
if (!TestValue(Tie1ComparisonType, current.TieBreak1, comparison.TieBreak1))
static bool TestValue(byte operation, int currentValue, int bestValue)
=> operation switch
{
return false;
}
0 => (currentValue > bestValue),
1 => (currentValue >= bestValue),
2 => (currentValue == bestValue),
3 => (currentValue <= bestValue),
4 => (currentValue < bestValue),
5 => (currentValue != bestValue),
_ => false
};
if (current.TieBreak1 == comparison.TieBreak1)
{
if (!TestValue(Tie2ComparisonType, current.TieBreak2, comparison.TieBreak2))
{
return false;
}
if (!TestValue(MainComparisonType, current.Maximize, comparison.Maximize)) return false;
if (current.Maximize != comparison.Maximize) return true;
if (current.TieBreak2 == comparison.TieBreak2)
{
if (!TestValue(Tie3ComparisonType, current.TieBreak3, comparison.TieBreak3))
{
return false;
}
}
}
}
if (!TestValue(Tie1ComparisonType, current.TieBreak1, comparison.TieBreak1)) return false;
if (current.TieBreak1 != comparison.TieBreak1) return true;
return true;
}
if (!TestValue(Tie2ComparisonType, current.TieBreak2, comparison.TieBreak2)) return false;
if (current.TieBreak2 != comparison.TieBreak2) return true;
private bool TestValue(byte operation, int currentValue, int bestValue)
{
return operation switch
{
0 => (currentValue > bestValue),
1 => (currentValue >= bestValue),
2 => (currentValue == bestValue),
3 => (currentValue <= bestValue),
4 => (currentValue < bestValue),
5 => (currentValue != bestValue),
_ => false
};
if (!TestValue(Tie3ComparisonType, current.TieBreak3, comparison.TieBreak3)) return false;
/*if (current.TieBreak3 != comparison.TieBreak3)*/ return true;
}
private void UpdateBestAttempt()