From: DU-jdto <SNP_Tiranasta@hotmail.com>
Date: Wed, 21 Mar 2018 00:26:12 +0000 (+0100)
Subject: Fix a few minor code style inconsistencies
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=ed26d71354c3ab1a1419975430258b6e961787a7

Fix a few minor code style inconsistencies

No functional change.
---

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 64e0eca4..48c6e8ea 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -289,7 +289,7 @@ namespace {
 
     constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
     constexpr Bitboard OutpostRanks = (Us == WHITE ? Rank4BB | Rank5BB | Rank6BB
-                                               : Rank5BB | Rank4BB | Rank3BB);
+                                                   : Rank5BB | Rank4BB | Rank3BB);
     const Square* pl = pos.squares<Pt>(Us);
 
     Bitboard b, bb;
diff --git a/src/movegen.cpp b/src/movegen.cpp
index ed8745e8..35ca6e77 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -28,7 +28,7 @@ namespace {
   template<CastlingRight Cr, bool Checks, bool Chess960>
   ExtMove* generate_castling(const Position& pos, ExtMove* moveList, Color us) {
 
-    static constexpr bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO);
+    constexpr bool KingSide = (Cr == WHITE_OO || Cr == BLACK_OO);
 
     if (pos.castling_impeded(Cr) || !pos.can_castle(Cr))
         return moveList;
diff --git a/src/search.cpp b/src/search.cpp
index ada0cd5b..7979fd5b 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -31,8 +31,8 @@
 #include "movepick.h"
 #include "position.h"
 #include "search.h"
-#include "timeman.h"
 #include "thread.h"
+#include "timeman.h"
 #include "tt.h"
 #include "uci.h"
 #include "syzygy/tbprobe.h"
@@ -689,12 +689,12 @@ namespace {
 
     // Step 7. Razoring (skipped when in check)
     if (  !PvNode
-        && depth <= 2 * ONE_PLY
-        && eval <= alpha - Value(RazorMargin[depth / ONE_PLY]))
+        && depth < 3 * ONE_PLY
+        && eval <= alpha - RazorMargin[depth / ONE_PLY])
     {
-        Value ralpha = alpha - Value((depth != ONE_PLY) * RazorMargin[depth / ONE_PLY]);
+        Value ralpha = alpha - (depth >= 2 * ONE_PLY) * RazorMargin[depth / ONE_PLY];
         Value v = qsearch<NonPV>(pos, ss, ralpha, ralpha+1);
-        if (depth == ONE_PLY || v <= ralpha)
+        if (depth < 2 * ONE_PLY || v <= ralpha)
             return v;
     }
 
@@ -1148,7 +1148,6 @@ moves_loop: // When in check, search starts from here
   Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth) {
 
     constexpr bool PvNode = NT == PV;
-    const bool inCheck = bool(pos.checkers());
 
     assert(alpha >= -VALUE_INFINITE && alpha < beta && beta <= VALUE_INFINITE);
     assert(PvNode || (alpha == beta - 1));
@@ -1162,7 +1161,7 @@ moves_loop: // When in check, search starts from here
     Move ttMove, move, bestMove;
     Depth ttDepth;
     Value bestValue, value, ttValue, futilityValue, futilityBase, oldAlpha;
-    bool ttHit, givesCheck, evasionPrunable;
+    bool ttHit, inCheck, givesCheck, evasionPrunable;
     int moveCount;
 
     if (PvNode)
@@ -1174,6 +1173,7 @@ moves_loop: // When in check, search starts from here
 
     (ss+1)->ply = ss->ply + 1;
     ss->currentMove = bestMove = MOVE_NONE;
+    inCheck = pos.checkers();
     moveCount = 0;
 
     // Check for an immediate draw or maximum ply reached
diff --git a/src/uci.cpp b/src/uci.cpp
index b4772305..72eda4a0 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -28,8 +28,8 @@
 #include "position.h"
 #include "search.h"
 #include "thread.h"
-#include "tt.h"
 #include "timeman.h"
+#include "tt.h"
 #include "uci.h"
 #include "syzygy/tbprobe.h"