kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-12 03:59:15 +00:00
Code Issues Releases Wiki Activity

Reformat FastMove

Browse source 
Align to SF coding style.

Verified no regression:

LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 55938 W: 10893 L: 10835 D: 34210

No functional change.
This commit is contained in:
Marco Costalba 2015-03-18 08:12:59 +01:00
parent 9a6cfee73b
commit 54889618c2
1 changed files with 47 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/search.cpp
View file

@ -90,47 +90,48 @@ namespace {
Move best = MOVE_NONE; Move best = MOVE_NONE;
}; };
struct FastMove { // EasyMoveManager struct is used to detect a so called 'easy move'; when PV is
FastMove() { clear(); } // stable across multiple search iterations we can fast return the best move.
struct EasyMoveManager {
inline void clear() { void clear() {
expectedPosKey = 0;
pv3[0] = pv3[1] = pv3[2] = MOVE_NONE;
stableCnt = 0; stableCnt = 0;
expectedPosKey = 0;
pv[0] = pv[1] = pv[2] = MOVE_NONE;
} }
void update(Position& pos) { Move get(Key key) const {
// Keep track how many times in a row the PV stays stable 3 ply deep. return expectedPosKey == key ? pv[2] : MOVE_NONE;
const std::vector<Move>& RMpv = RootMoves[0].pv; }
if (RMpv.size() >= 3)
{
if (pv3[2] == RMpv[2])
stableCnt++;
else
stableCnt = 0, pv3[2] = RMpv[2];
if (!expectedPosKey || pv3[0] != RMpv[0] || pv3[1] != RMpv[1]) void update(Position& pos, const std::vector<Move>& newPv) {
assert(newPv.size() >= 3);
// Keep track of how many times in a row 3rd ply remains stable
stableCnt = (newPv[2] == pv[2]) ? stableCnt + 1 : 0;
if (!std::equal(newPv.begin(), newPv.begin() + 3, pv))
{ {
pv3[0] = RMpv[0], pv3[1] = RMpv[1]; std::copy(newPv.begin(), newPv.begin() + 3, pv);
StateInfo st[2]; StateInfo st[2];
pos.do_move(RMpv[0], st[0], pos.gives_check(RMpv[0], CheckInfo(pos))); pos.do_move(newPv[0], st[0], pos.gives_check(newPv[0], CheckInfo(pos)));
pos.do_move(RMpv[1], st[1], pos.gives_check(RMpv[1], CheckInfo(pos))); pos.do_move(newPv[1], st[1], pos.gives_check(newPv[1], CheckInfo(pos)));
expectedPosKey = pos.key(); expectedPosKey = pos.key();
pos.undo_move(RMpv[1]); pos.undo_move(newPv[1]);
pos.undo_move(RMpv[0]); pos.undo_move(newPv[0]);
} }
} }
else
clear();
}
Key expectedPosKey;
Move pv3[3];
int stableCnt; int stableCnt;
} FM; Key expectedPosKey;
Move pv[3];
};
size_t PVIdx; size_t PVIdx;
TimeManager TimeMgr; TimeManager TimeMgr;
EasyMoveManager EasyMove;
double BestMoveChanges; double BestMoveChanges;
Value DrawValue[COLOR_NB]; Value DrawValue[COLOR_NB];
HistoryStats History; HistoryStats History;
@ -323,9 +324,8 @@ namespace {
Depth depth; Depth depth;
Value bestValue, alpha, beta, delta; Value bestValue, alpha, beta, delta;
// Init fastMove if the previous search generated a candidate and we now got the predicted position. Move easyMove = EasyMove.get(pos.key());
const Move fastMove = (FM.expectedPosKey == pos.key()) ? FM.pv3[2] : MOVE_NONE; EasyMove.clear();
FM.clear();
std::memset(ss-2, 0, 5 * sizeof(Stack)); std::memset(ss-2, 0, 5 * sizeof(Stack));
@ -460,13 +460,13 @@ namespace {
TimeMgr.pv_instability(BestMoveChanges); TimeMgr.pv_instability(BestMoveChanges);
// Stop the search if only one legal move is available or all // Stop the search if only one legal move is available or all
// of the available time has been used or we matched a fastMove // of the available time has been used or we matched an easyMove
// from the previous search and just did a fast verification. // from the previous search and just did a fast verification.
if ( RootMoves.size() == 1 if ( RootMoves.size() == 1
|| now() - SearchTime > TimeMgr.available_time() || now() - SearchTime > TimeMgr.available_time()
|| ( fastMove == RootMoves[0].pv[0] || ( RootMoves[0].pv[0] == easyMove
&& BestMoveChanges < 0.03 && BestMoveChanges < 0.03
&& 10 * (now() - SearchTime) > TimeMgr.available_time())) && now() - SearchTime > TimeMgr.available_time() / 10))
{ {
// If we are allowed to ponder do not stop the search now but // If we are allowed to ponder do not stop the search now but
// keep pondering until the GUI sends "ponderhit" or "stop". // keep pondering until the GUI sends "ponderhit" or "stop".
@ -477,16 +477,17 @@ namespace {
} }
} }
// Update fast move stats. if (RootMoves[0].pv.size() >= 3)
FM.update(pos); EasyMove.update(pos, RootMoves[0].pv);
else
EasyMove.clear();
} }
} }
// Clear any candidate fast move that wasn't completely stable for at least // Clear any candidate easy move that wasn't stable for the last search
// the 6 final search iterations. (Independent of actual depth and thus TC.) // iterations; the second condition prevents consecutive fast moves.
// Time condition prevents consecutive fast moves. if (EasyMove.stableCnt < 6 || now() - SearchTime < TimeMgr.available_time())
if (FM.stableCnt < 6 || now() - SearchTime < TimeMgr.available_time()) EasyMove.clear();
FM.clear();
// If skill level is enabled, swap best PV line with the sub-optimal one // If skill level is enabled, swap best PV line with the sub-optimal one
if (skill.enabled()) if (skill.enabled())
@ -1074,9 +1075,11 @@ moves_loop: // When in check and at SpNode search starts from here
if (value > alpha) if (value > alpha)
{ {
// Clear fast move if unstable. // If there is an easy move for this position, clear it if unstable
if (PvNode && pos.key() == FM.expectedPosKey && (move != FM.pv3[2] || moveCount > 1)) if ( PvNode
FM.clear(); && EasyMove.get(pos.key())
&& (move != EasyMove.get(pos.key()) || moveCount > 1))
EasyMove.clear();
bestMove = SpNode ? splitPoint->bestMove = move : move; bestMove = SpNode ? splitPoint->bestMove = move : move;