// Razor and futility margins
const int RazorMargin1 = 590;
const int RazorMargin2 = 604;
- Value futility_margin(Depth d) { return Value(150 * d / ONE_PLY); }
+ Value futility_margin(Depth d, bool improving) {
+ return Value((175 - 50 * improving) * d / ONE_PLY);
+ }
// Futility and reductions lookup tables, initialized at startup
int FutilityMoveCounts[2][16]; // [improving][depth]
ct = Options["Contempt"] * PawnValueEg / 100; // From centipawns
// Adjust contempt based on current bestValue (dynamic contempt)
- int sign = (bestValue > 0) - (bestValue < 0);
- ct += bestValue > 500 ? 70 :
- bestValue < -500 ? -70 :
- bestValue / 10 + sign * int(std::round(3.22 * log(1 + abs(bestValue))));
+ ct += int(std::round(48 * atan(float(bestValue) / 128)));
Eval::Contempt = (us == WHITE ? make_score(ct, ct / 2)
: -make_score(ct, ct / 2));
if (inCheck)
{
ss->staticEval = eval = VALUE_NONE;
+ improving = true;
goto moves_loop;
}
else if (ttHit)
ss->staticEval, TT.generation());
}
+ improving = ss->staticEval >= (ss-2)->staticEval
+ ||(ss-2)->staticEval == VALUE_NONE;
+
if (skipEarlyPruning || !pos.non_pawn_material(pos.side_to_move()))
goto moves_loop;
// Step 8. Futility pruning: child node (skipped when in check)
if ( !rootNode
&& depth < 7 * ONE_PLY
- && eval - futility_margin(depth) >= beta
+ && eval - futility_margin(depth, improving) >= beta
&& eval < VALUE_KNOWN_WIN) // Do not return unproven wins
return eval;
Value rbeta = std::min(beta + 200, VALUE_INFINITE);
MovePicker mp(pos, ttMove, rbeta - ss->staticEval, &thisThread->captureHistory);
int probCutCount = 0;
+
while ( (move = mp.next_move()) != MOVE_NONE
&& probCutCount < depth / ONE_PLY - 3)
if (pos.legal(move))
// Perform a preliminary search at depth 1 to verify that the move holds.
// We will only do this search if the depth is not 5, thus avoiding two
// searches at depth 1 in a row.
- if (depth > 5 * ONE_PLY)
+ if (depth != 5 * ONE_PLY)
value = -search<NonPV>(pos, ss+1, -rbeta, -rbeta+1, ONE_PLY, !cutNode, true);
// If the first search was skipped or was performed and held, perform
MovePicker mp(pos, ttMove, depth, &thisThread->mainHistory, &thisThread->captureHistory, contHist, countermove, ss->killers);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
- improving = ss->staticEval >= (ss-2)->staticEval
- /* || ss->staticEval == VALUE_NONE Already implicit in the previous condition */
- ||(ss-2)->staticEval == VALUE_NONE;
singularExtensionNode = !rootNode
&& depth >= 8 * ONE_PLY