From dbc984d9f87ba79db3c7802310450f60e95e89e4 Mon Sep 17 00:00:00 2001 From: AndyGrant Date: Wed, 9 Aug 2017 21:43:30 -0400 Subject: [PATCH 1/1] Make variable naming consistent moved_piece is the only variable in search not using camel case --- src/search.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index 94052ef5..673d3a23 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -550,7 +550,7 @@ namespace { Value bestValue, value, ttValue, eval; bool ttHit, inCheck, givesCheck, singularExtensionNode, improving; bool captureOrPromotion, doFullDepthSearch, moveCountPruning, skipQuiets, ttCapture; - Piece moved_piece; + Piece movedPiece; int moveCount, quietCount; // Step 1. Initialize node @@ -848,7 +848,7 @@ moves_loop: // When in check search starts from here extension = DEPTH_ZERO; captureOrPromotion = pos.capture_or_promotion(move); - moved_piece = pos.moved_piece(move); + movedPiece = pos.moved_piece(move); givesCheck = type_of(move) == NORMAL && !pos.discovered_check_candidates() ? pos.check_squares(type_of(pos.piece_on(from_sq(move)))) & to_sq(move) @@ -906,8 +906,8 @@ moves_loop: // When in check search starts from here // Countermoves based pruning if ( lmrDepth < 3 - && (*contHist[0])[moved_piece][to_sq(move)] < CounterMovePruneThreshold - && (*contHist[1])[moved_piece][to_sq(move)] < CounterMovePruneThreshold) + && (*contHist[0])[movedPiece][to_sq(move)] < CounterMovePruneThreshold + && (*contHist[1])[movedPiece][to_sq(move)] < CounterMovePruneThreshold) continue; // Futility pruning: parent node @@ -942,7 +942,7 @@ moves_loop: // When in check search starts from here // Update the current move (this must be done after singular extension search) ss->currentMove = move; - ss->contHistory = &thisThread->contHistory[moved_piece][to_sq(move)]; + ss->contHistory = &thisThread->contHistory[movedPiece][to_sq(move)]; // Step 14. Make the move pos.do_move(move, st, givesCheck); @@ -975,9 +975,9 @@ moves_loop: // When in check search starts from here r -= 2 * ONE_PLY; ss->statScore = thisThread->mainHistory[~pos.side_to_move()][from_to(move)] - + (*contHist[0])[moved_piece][to_sq(move)] - + (*contHist[1])[moved_piece][to_sq(move)] - + (*contHist[3])[moved_piece][to_sq(move)] + + (*contHist[0])[movedPiece][to_sq(move)] + + (*contHist[1])[movedPiece][to_sq(move)] + + (*contHist[3])[movedPiece][to_sq(move)] - 4000; // Decrease/increase reduction by comparing opponent's stat score -- 2.39.2