kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Move Tempo to evaluation

Browse source 
No functional change.
This commit is contained in:
Marco Costalba 2014-06-06 09:35:34 +02:00
parent 69ac45d903
commit 08753771fc
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/evaluate.cpp
View file

@ -855,7 +855,7 @@ namespace Eval {
/// of the position always from the point of view of the side to move. /// of the position always from the point of view of the side to move.
Value evaluate(const Position& pos) { Value evaluate(const Position& pos) {
return do_evaluate<false>(pos); return do_evaluate<false>(pos) + Tempo;
} }

2
src/evaluate.h
View file

@ -26,6 +26,8 @@ class Position;
namespace Eval { namespace Eval {
const int Tempo = 17; // Must be visible to search
extern void init(); extern void init();
extern Value evaluate(const Position& pos); extern Value evaluate(const Position& pos);
extern std::string trace(const Position& pos); extern std::string trace(const Position& pos);

15
src/search.cpp
View file

@ -76,9 +76,6 @@ namespace {
return (Depth) Reductions[PvNode][i][std::min(int(d) / ONE_PLY, 63)][std::min(mn, 63)]; return (Depth) Reductions[PvNode][i][std::min(int(d) / ONE_PLY, 63)][std::min(mn, 63)];
} }
// Tempo bonus. Must be handled by search to preserve eval symmetry.
const int Tempo = 17;
size_t MultiPV, PVIdx; size_t MultiPV, PVIdx;
TimeManager TimeMgr; TimeManager TimeMgr;
double BestMoveChanges; double BestMoveChanges;
@ -484,7 +481,7 @@ namespace {
{ {
// Step 2. Check for aborted search and immediate draw // Step 2. Check for aborted search and immediate draw
if (Signals.stop || pos.is_draw() || ss->ply > MAX_PLY) if (Signals.stop || pos.is_draw() || ss->ply > MAX_PLY)
return ss->ply > MAX_PLY && !inCheck ? evaluate(pos) + Tempo : DrawValue[pos.side_to_move()]; return ss->ply > MAX_PLY && !inCheck ? evaluate(pos) : DrawValue[pos.side_to_move()];
// Step 3. Mate distance pruning. Even if we mate at the next move our score // Step 3. Mate distance pruning. Even if we mate at the next move our score
// would be at best mate_in(ss->ply+1), but if alpha is already bigger because // would be at best mate_in(ss->ply+1), but if alpha is already bigger because
@ -539,7 +536,7 @@ namespace {
{ {
// Never assume anything on values stored in TT // Never assume anything on values stored in TT
if ((ss->staticEval = eval = tte->eval_value()) == VALUE_NONE) if ((ss->staticEval = eval = tte->eval_value()) == VALUE_NONE)
eval = ss->staticEval = evaluate(pos) + Tempo; eval = ss->staticEval = evaluate(pos);
// Can ttValue be used as a better position evaluation? // Can ttValue be used as a better position evaluation?
if (ttValue != VALUE_NONE) if (ttValue != VALUE_NONE)
@ -548,7 +545,7 @@ namespace {
} }
else else
{ {
eval = ss->staticEval = ss->nullChild ? -(ss-1)->staticEval + 2 * Tempo : evaluate(pos) + Tempo; eval = ss->staticEval = ss->nullChild ? -(ss-1)->staticEval + 2 * Eval::Tempo : evaluate(pos);
TT.store(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE, ss->staticEval); TT.store(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE, ss->staticEval);
} }
@ -1066,7 +1063,7 @@ moves_loop: // When in check and at SpNode search starts from here
// Check for an instant draw or if the maximum ply has been reached // Check for an instant draw or if the maximum ply has been reached
if (pos.is_draw() || ss->ply > MAX_PLY) if (pos.is_draw() || ss->ply > MAX_PLY)
return ss->ply > MAX_PLY && !InCheck ? evaluate(pos) + Tempo : DrawValue[pos.side_to_move()]; return ss->ply > MAX_PLY && !InCheck ? evaluate(pos) : DrawValue[pos.side_to_move()];
// Decide whether or not to include checks: this fixes also the type of // Decide whether or not to include checks: this fixes also the type of
// TT entry depth that we are going to use. Note that in qsearch we use // TT entry depth that we are going to use. Note that in qsearch we use
@ -1103,7 +1100,7 @@ moves_loop: // When in check and at SpNode search starts from here
{ {
// Never assume anything on values stored in TT // Never assume anything on values stored in TT
if ((ss->staticEval = bestValue = tte->eval_value()) == VALUE_NONE) if ((ss->staticEval = bestValue = tte->eval_value()) == VALUE_NONE)
ss->staticEval = bestValue = evaluate(pos) + Tempo; ss->staticEval = bestValue = evaluate(pos);
// Can ttValue be used as a better position evaluation? // Can ttValue be used as a better position evaluation?
if (ttValue != VALUE_NONE) if (ttValue != VALUE_NONE)
@ -1111,7 +1108,7 @@ moves_loop: // When in check and at SpNode search starts from here
bestValue = ttValue; bestValue = ttValue;
} }
else else
ss->staticEval = bestValue = ss->nullChild ? -(ss-1)->staticEval + 2 * Tempo : evaluate(pos) + Tempo; ss->staticEval = bestValue = ss->nullChild ? -(ss-1)->staticEval + 2 * Eval::Tempo : evaluate(pos);
// Stand pat. Return immediately if static value is at least beta // Stand pat. Return immediately if static value is at least beta
if (bestValue >= beta) if (bestValue >= beta)