Changes identified in RENAME/REFORMATTING thread (#1861)

I've gone through the RENAME/REFORMATTING thread and changed everything I could find, plus a few more. With this, let's close the previous issue and open another.

No functional change.
This commit is contained in:
protonspring
2018-12-11 05:47:56 -07:00
committed by Marco Costalba
parent e8ffca3eb4
commit e917bd59b1
11 changed files with 38 additions and 38 deletions
+13 -13
View File
@@ -826,8 +826,8 @@ namespace {
&& depth >= 5 * ONE_PLY
&& abs(beta) < VALUE_MATE_IN_MAX_PLY)
{
Value rbeta = std::min(beta + 216 - 48 * improving, VALUE_INFINITE);
MovePicker mp(pos, ttMove, rbeta - ss->staticEval, &thisThread->captureHistory);
Value raisedBeta = std::min(beta + 216 - 48 * improving, VALUE_INFINITE);
MovePicker mp(pos, ttMove, raisedBeta - ss->staticEval, &thisThread->captureHistory);
int probCutCount = 0;
while ( (move = mp.next_move()) != MOVE_NONE
@@ -844,15 +844,15 @@ namespace {
pos.do_move(move, st);
// Perform a preliminary qsearch to verify that the move holds
value = -qsearch<NonPV>(pos, ss+1, -rbeta, -rbeta+1);
value = -qsearch<NonPV>(pos, ss+1, -raisedBeta, -raisedBeta+1);
// If the qsearch held perform the regular search
if (value >= rbeta)
value = -search<NonPV>(pos, ss+1, -rbeta, -rbeta+1, depth - 4 * ONE_PLY, !cutNode);
if (value >= raisedBeta)
value = -search<NonPV>(pos, ss+1, -raisedBeta, -raisedBeta+1, depth - 4 * ONE_PLY, !cutNode);
pos.undo_move(move);
if (value >= rbeta)
if (value >= raisedBeta)
return value;
}
}
@@ -928,18 +928,18 @@ moves_loop: // When in check, search starts from here
if ( depth >= 8 * ONE_PLY
&& move == ttMove
&& !rootNode
&& !excludedMove // Recursive singular search is not allowed
&& !excludedMove // Avoid recursive singular search
&& ttValue != VALUE_NONE
&& (tte->bound() & BOUND_LOWER)
&& tte->depth() >= depth - 3 * ONE_PLY
&& pos.legal(move))
{
Value rBeta = std::max(ttValue - 2 * depth / ONE_PLY, -VALUE_MATE);
Value reducedBeta = std::max(ttValue - 2 * depth / ONE_PLY, -VALUE_MATE);
ss->excludedMove = move;
value = search<NonPV>(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode);
value = search<NonPV>(pos, ss, reducedBeta - 1, reducedBeta, depth / 2, cutNode);
ss->excludedMove = MOVE_NONE;
if (value < rBeta)
if (value < reducedBeta)
extension = ONE_PLY;
}
else if ( givesCheck // Check extension (~2 Elo)
@@ -1186,9 +1186,9 @@ moves_loop: // When in check, search starts from here
update_capture_stats(pos, bestMove, capturesSearched, captureCount, stat_bonus(depth + ONE_PLY));
// Extra penalty for a quiet TT or main killer move in previous ply when it gets refuted
if ( (ss-1)->moveCount == 1
|| ((ss-1)->currentMove == (ss-1)->killers[0] && (ss-1)->killers[0]))
if (!pos.captured_piece())
if ( (ss-1)->moveCount == 1
|| ((ss-1)->currentMove == (ss-1)->killers[0] && (ss-1)->killers[0]))
if (!pos.captured_piece())
update_continuation_histories(ss-1, pos.piece_on(prevSq), prevSq, -stat_bonus(depth + ONE_PLY));
}