// Vote according to score and depth
for (Thread* th : Threads)
- votes[th->rootMoves[0].pv[0]] += int(th->rootMoves[0].score - minScore)
+ votes[th->rootMoves[0].pv[0]] += int(th->rootMoves[0].score - minScore)
+ int(th->completedDepth);
// Select best thread
if ( Threads.stop.load(std::memory_order_relaxed)
|| pos.is_draw(ss->ply)
|| ss->ply >= MAX_PLY)
- return (ss->ply >= MAX_PLY && !inCheck) ? evaluate(pos) : VALUE_DRAW;
+ return (ss->ply >= MAX_PLY && !inCheck) ? evaluate(pos) - 10 * ((ss-1)->statScore > 0)
+ : VALUE_DRAW;
// 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
{
// Never assume anything on values stored in TT
if ((ss->staticEval = eval = tte->eval()) == VALUE_NONE)
- eval = ss->staticEval = evaluate(pos);
+ eval = ss->staticEval = evaluate(pos) - 10 * ((ss-1)->statScore > 0);
// Can ttValue be used as a better position evaluation?
if ( ttValue != VALUE_NONE
}
else
{
- ss->staticEval = eval =
- (ss-1)->currentMove != MOVE_NULL ? evaluate(pos)
- : -(ss-1)->staticEval + 2 * Eval::Tempo;
+ int p = (ss-1)->statScore;
+ int malus = p > 0 ? (p + 5000) / 1024 :
+ p < 0 ? (p - 5000) / 1024 : 0;
- tte->save(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE,
- ss->staticEval);
+ ss->staticEval = eval = (ss-1)->currentMove != MOVE_NULL ? evaluate(pos) - malus
+ : -(ss-1)->staticEval + 2 * Eval::Tempo;
+
+ tte->save(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE, ss->staticEval);
}
// Step 7. Razoring (~2 Elo)