opelly/Stockfish
1
0
Fork 0
mirror of https://github.com/opelly27/Stockfish.git synced 2026-05-20 08:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose EvalInfo struct to search

Browse Source 
Allow to use EvalInfo struct, populated by
evaluation(), in search.

In particular we allocate Eval::Info on the stack
and pass a pointer to this to evaluate().

Also add to Search::Stack a pointer to Eval::Info,
this allows to reference eval info of previous/next
nodes.

WARNING: Eval::Info is NOT initialized and is populated
by evaluate(), only if the latter is called, and this
does not happen in all the code paths, so care should be
taken when accessing this struct.

No functional change.
This commit is contained in:
Marco Costalba
2013-04-25 12:43:55 +02:00
parent 79bcb2ca54
commit d810441b35
4 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/search.cpp
+7 -4
View File
@@ -489,6 +489,7 @@ namespace {
Move movesSearched[64];
StateInfo st;
Eval::Info ei;
const TTEntry *tte;
SplitPoint* splitPoint;
Key posKey;
@@ -523,6 +524,7 @@ namespace {
bestValue = -VALUE_INFINITE;
ss->currentMove = threatMove = (ss+1)->excludedMove = bestMove = MOVE_NONE;
ss->ply = (ss-1)->ply + 1;
ss->ei = &ei;
(ss+1)->skipNullMove = false; (ss+1)->reduction = DEPTH_ZERO;
(ss+2)->killers[0] = (ss+2)->killers[1] = MOVE_NONE;
@@ -592,7 +594,7 @@ namespace {
// Never assume anything on values stored in TT
if ( (ss->staticEval = eval = tte->eval_value()) == VALUE_NONE
||(ss->evalMargin = tte->eval_margin()) == VALUE_NONE)
eval = ss->staticEval = evaluate(pos, ss->evalMargin);
eval = ss->staticEval = evaluate(pos, ss->evalMargin, &ei);
// Can ttValue be used as a better position evaluation?
if (ttValue != VALUE_NONE)
@@ -602,7 +604,7 @@ namespace {
}
else
{
eval = ss->staticEval = evaluate(pos, ss->evalMargin);
eval = ss->staticEval = evaluate(pos, ss->evalMargin, &ei);
TT.store(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE,
ss->staticEval, ss->evalMargin);
}
@@ -1119,6 +1121,7 @@ split_point_start: // At split points actual search starts from here
assert(depth <= DEPTH_ZERO);
StateInfo st;
Eval::Info ei;
const TTEntry* tte;
Key posKey;
Move ttMove, move, bestMove;
@@ -1175,10 +1178,10 @@ split_point_start: // At split points actual search starts from here
// Never assume anything on values stored in TT
if ( (ss->staticEval = bestValue = tte->eval_value()) == VALUE_NONE
||(ss->evalMargin = tte->eval_margin()) == VALUE_NONE)
ss->staticEval = bestValue = evaluate(pos, ss->evalMargin);
ss->staticEval = bestValue = evaluate(pos, ss->evalMargin, &ei);
}
else
ss->staticEval = bestValue = evaluate(pos, ss->evalMargin);
ss->staticEval = bestValue = evaluate(pos, ss->evalMargin, &ei);
// Stand pat. Return immediately if static value is at least beta
if (bestValue >= beta)