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.

diff --git a/AUTHORS b/AUTHORS
index 5b646dae2b9ee1cfdbecadd572e56fd2c0e7a6d5..603b0fb370aa760460067f7f5b95b5b2c44bb833 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -88,7 +88,7 @@ Michael Chaly (Vizvezdenec)
 Michel Van den Bergh (vdbergh)
 Miguel Lahoz (miguel-l)
 Mikael Bäckman (mbootsector)
 Michel Van den Bergh (vdbergh)
 Miguel Lahoz (miguel-l)
 Mikael Bäckman (mbootsector)

-Mike Whiteley (protonspring)
+Michael Whiteley (protonspring)

 Miroslav Fontán (Hexik)
 Moez Jellouli (MJZ1977)
 Mohammed Li (tthsqe12)
 Miroslav Fontán (Hexik)
 Moez Jellouli (MJZ1977)
 Mohammed Li (tthsqe12)

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index d6239594d9165cb91578311a353e801851ac724e..48e305efebf569bf1f672168a0f5da293fe748cf 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -381,7 +381,7 @@ namespace {
             {
                 File kf = file_of(pos.square<KING>(Us));
                 if ((kf < FILE_E) == (file_of(s) < kf))
             {
                 File kf = file_of(pos.square<KING>(Us));
                 if ((kf < FILE_E) == (file_of(s) < kf))

-                    score -= (TrappedRook - make_score(mob * 22, 0)) * (1 + !pos.can_castle(Us));
+                    score -= (TrappedRook - make_score(mob * 22, 0)) * (1 + !pos.castling_rights(Us));

             }
         }
 
             }
         }
 


@@ -512,7 +512,7 @@ namespace {
     Score score = SCORE_ZERO;
 
     // Non-pawn enemies
     Score score = SCORE_ZERO;
 
     // Non-pawn enemies

-    nonPawnEnemies = pos.pieces(Them) ^ pos.pieces(Them, PAWN);
+    nonPawnEnemies = pos.pieces(Them) & ~pos.pieces(Them, PAWN);

 
     // Squares strongly protected by the enemy, either because they defend the
     // square with a pawn, or because they defend the square twice and we don't.
 
     // Squares strongly protected by the enemy, either because they defend the
     // square with a pawn, or because they defend the square twice and we don't.

diff --git a/src/material.h b/src/material.h
index 56de9ad225022bb29db03ceed4c9f2d101da92a1..b472c3fd266c362cd0b032448908475b20291ec2 100644 (file)
--- a/src/material.h
+++ b/src/material.h
@@ -58,7 +58,7 @@ struct Entry {
   Key key;
   const EndgameBase<Value>* evaluationFunction;
   const EndgameBase<ScaleFactor>* scalingFunction[COLOR_NB]; // Could be one for each
   Key key;
   const EndgameBase<Value>* evaluationFunction;
   const EndgameBase<ScaleFactor>* scalingFunction[COLOR_NB]; // Could be one for each

-                                                             // side (e.g. KPKP, KBPsKs)
+                                                             // side (e.g. KPKP, KBPsK)

   int16_t value;
   uint8_t factor[COLOR_NB];
   Phase gamePhase;
   int16_t value;
   uint8_t factor[COLOR_NB];
   Phase gamePhase;

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 833cd2fc88ec74d94ae19599408715621773baa6..b4a9d27ba1d7459fcc959ba30fc4fe88a84a6a1b 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -278,7 +278,7 @@ namespace {
             *moveList++ = make_move(ksq, pop_lsb(&b));
     }
 
             *moveList++ = make_move(ksq, pop_lsb(&b));
     }
 

-    if (Type != CAPTURES && Type != EVASIONS && pos.can_castle(Us))
+    if (Type != CAPTURES && Type != EVASIONS && pos.castling_rights(Us))

     {
         if (pos.is_chess960())
         {
     {
         if (pos.is_chess960())
         {

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 7d39a4a08bde360f2299f3cc231817e0d749ac07..edd670b84cc4ec3021fdcd2b3962bbd419cfdc88 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -67,7 +67,7 @@ namespace {
     constexpr Color     Them = (Us == WHITE ? BLACK : WHITE);
     constexpr Direction Up   = (Us == WHITE ? NORTH : SOUTH);
 
     constexpr Color     Them = (Us == WHITE ? BLACK : WHITE);
     constexpr Direction Up   = (Us == WHITE ? NORTH : SOUTH);
 

-    Bitboard b, neighbours, stoppers, doubled, supported, phalanx;
+    Bitboard b, neighbours, stoppers, doubled, support, phalanx;

     Bitboard lever, leverPush;
     Square s;
     bool opposed, backward;
     Bitboard lever, leverPush;
     Square s;
     bool opposed, backward;


@@ -102,7 +102,7 @@ namespace {
         doubled    = ourPawns   & (s - Up);
         neighbours = ourPawns   & adjacent_files_bb(f);
         phalanx    = neighbours & rank_bb(s);
         doubled    = ourPawns   & (s - Up);
         neighbours = ourPawns   & adjacent_files_bb(f);
         phalanx    = neighbours & rank_bb(s);

-        supported  = neighbours & rank_bb(s - Up);
+        support    = neighbours & rank_bb(s - Up);

 
         // A pawn is backward when it is behind all pawns of the same color
         // on the adjacent files and cannot be safely advanced.
 
         // A pawn is backward when it is behind all pawns of the same color
         // on the adjacent files and cannot be safely advanced.


@@ -114,22 +114,22 @@ namespace {
         // which could become passed after one or two pawn pushes when are
         // not attacked more times than defended.
         if (   !(stoppers ^ lever ^ leverPush)
         // which could become passed after one or two pawn pushes when are
         // not attacked more times than defended.
         if (   !(stoppers ^ lever ^ leverPush)

-            && popcount(supported) >= popcount(lever) - 1
+            && popcount(support) >= popcount(lever) - 1

             && popcount(phalanx)   >= popcount(leverPush))
             e->passedPawns[Us] |= s;
 
         else if (   stoppers == SquareBB[s + Up]
                  && relative_rank(Us, s) >= RANK_5)
         {
             && popcount(phalanx)   >= popcount(leverPush))
             e->passedPawns[Us] |= s;
 
         else if (   stoppers == SquareBB[s + Up]
                  && relative_rank(Us, s) >= RANK_5)
         {

-            b = shift<Up>(supported) & ~theirPawns;
+            b = shift<Up>(support) & ~theirPawns;

             while (b)
                 if (!more_than_one(theirPawns & PawnAttacks[Us][pop_lsb(&b)]))
                     e->passedPawns[Us] |= s;
         }
 
         // Score this pawn
             while (b)
                 if (!more_than_one(theirPawns & PawnAttacks[Us][pop_lsb(&b)]))
                     e->passedPawns[Us] |= s;
         }
 
         // Score this pawn

-        if (supported | phalanx)
-            score += Connected[opposed][bool(phalanx)][popcount(supported)][relative_rank(Us, s)];
+        if (support | phalanx)
+            score += Connected[opposed][bool(phalanx)][popcount(support)][relative_rank(Us, s)];

 
         else if (!neighbours)
             score -= Isolated, e->weakUnopposed[Us] += !opposed;
 
         else if (!neighbours)
             score -= Isolated, e->weakUnopposed[Us] += !opposed;


@@ -137,7 +137,7 @@ namespace {
         else if (backward)
             score -= Backward, e->weakUnopposed[Us] += !opposed;
 
         else if (backward)
             score -= Backward, e->weakUnopposed[Us] += !opposed;
 

-        if (doubled && !supported)
+        if (doubled && !support)

             score -= Doubled;
     }
 
             score -= Doubled;
     }
 


@@ -214,10 +214,10 @@ Value Entry::evaluate_shelter(const Position& pos, Square ksq) {
   for (File f = File(center - 1); f <= File(center + 1); ++f)
   {
       b = ourPawns & file_bb(f);
   for (File f = File(center - 1); f <= File(center + 1); ++f)
   {
       b = ourPawns & file_bb(f);

-      int ourRank = b ? relative_rank(Us, backmost_sq(Us, b)) : 0;
+      Rank ourRank = b ? relative_rank(Us, backmost_sq(Us, b)) : RANK_1;

 
       b = theirPawns & file_bb(f);
 
       b = theirPawns & file_bb(f);

-      int theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : 0;
+      Rank theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : RANK_1;

 
       int d = std::min(f, ~f);
       safety += ShelterStrength[d][ourRank];
 
       int d = std::min(f, ~f);
       safety += ShelterStrength[d][ourRank];


@@ -237,7 +237,7 @@ Score Entry::do_king_safety(const Position& pos) {
 
   Square ksq = pos.square<KING>(Us);
   kingSquares[Us] = ksq;
 
   Square ksq = pos.square<KING>(Us);
   kingSquares[Us] = ksq;

-  castlingRights[Us] = pos.can_castle(Us);
+  castlingRights[Us] = pos.castling_rights(Us);

   int minKingPawnDistance = 0;
 
   Bitboard pawns = pos.pieces(Us, PAWN);
   int minKingPawnDistance = 0;
 
   Bitboard pawns = pos.pieces(Us, PAWN);

diff --git a/src/pawns.h b/src/pawns.h
index 4d8b293664d6cabd176162a233189363a1f59d0a..df220eabbe9433fffad3dc47577446e49bbf84df 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -51,7 +51,7 @@ struct Entry {
 
   template<Color Us>
   Score king_safety(const Position& pos) {
 
   template<Color Us>
   Score king_safety(const Position& pos) {

-    return  kingSquares[Us] == pos.square<KING>(Us) && castlingRights[Us] == pos.can_castle(Us)
+    return  kingSquares[Us] == pos.square<KING>(Us) && castlingRights[Us] == pos.castling_rights(Us)

           ? kingSafety[Us] : (kingSafety[Us] = do_king_safety<Us>(pos));
   }
 
           ? kingSafety[Us] : (kingSafety[Us] = do_king_safety<Us>(pos));
   }
 

diff --git a/src/position.cpp b/src/position.cpp
index c915a1f9f3cf7e466eb2ed9d754cc75cdd22cbd1..bd5daa6dcb0268be338f753750cdb945ecdc0faf 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -476,7 +476,7 @@ const string Position::fen() const {
   if (can_castle(BLACK_OOO))
       ss << (chess960 ? char('a' + file_of(castling_rook_square(BLACK | QUEEN_SIDE))) : 'q');
 
   if (can_castle(BLACK_OOO))
       ss << (chess960 ? char('a' + file_of(castling_rook_square(BLACK | QUEEN_SIDE))) : 'q');
 

-  if (!can_castle(WHITE) && !can_castle(BLACK))
+  if (!can_castle(ANY_CASTLING))

       ss << '-';
 
   ss << (ep_square() == SQ_NONE ? " - " : " " + UCI::square(ep_square()) + " ")
       ss << '-';
 
   ss << (ep_square() == SQ_NONE ? " - " : " " + UCI::square(ep_square()) + " ")

diff --git a/src/position.h b/src/position.h
index e1eacf26d01530cfc9df3fb2e22e7233d394738e..d94ef185ac9c45a47de27148ce34f8dfe0ff3685 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -97,8 +97,8 @@ public:
   template<PieceType Pt> Square square(Color c) const;
 
   // Castling
   template<PieceType Pt> Square square(Color c) const;
 
   // Castling

-  int can_castle(Color c) const;
-  int can_castle(CastlingRight cr) const;
+  int castling_rights(Color c) const;
+  bool can_castle(CastlingRight cr) const;

   bool castling_impeded(CastlingRight cr) const;
   Square castling_rook_square(CastlingRight cr) const;
 
   bool castling_impeded(CastlingRight cr) const;
   Square castling_rook_square(CastlingRight cr) const;
 


@@ -260,11 +260,11 @@ inline Square Position::ep_square() const {
   return st->epSquare;
 }
 
   return st->epSquare;
 }
 

-inline int Position::can_castle(CastlingRight cr) const {
+inline bool Position::can_castle(CastlingRight cr) const {

   return st->castlingRights & cr;
 }
 
   return st->castlingRights & cr;
 }
 

-inline int Position::can_castle(Color c) const {
+inline int Position::castling_rights(Color c) const {

   return st->castlingRights & ((WHITE_OO | WHITE_OOO) << (2 * c));
 }
 
   return st->castlingRights & ((WHITE_OO | WHITE_OOO) << (2 * c));
 }
 

diff --git a/src/search.cpp b/src/search.cpp
index c589f2369c2cf72d256de89734cbae52d0d1c185..6c16aca8ba9fc5db0ae8980006f40784bc4da6a5 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -826,8 +826,8 @@ namespace {
         &&  depth >= 5 * ONE_PLY
         &&  abs(beta) < VALUE_MATE_IN_MAX_PLY)
     {
         &&  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
         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
                 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 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);
 
 
                 pos.undo_move(move);
 

-                if (value >= rbeta)
+                if (value >= raisedBeta)

                     return value;
             }
     }
                     return value;
             }
     }


@@ -928,18 +928,18 @@ moves_loop: // When in check, search starts from here
       if (    depth >= 8 * ONE_PLY
           &&  move == ttMove
           && !rootNode
       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))
       {
           &&  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;
           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;
 
           ss->excludedMove = MOVE_NONE;
 

-          if (value < rBeta)
+          if (value < reducedBeta)

               extension = ONE_PLY;
       }
       else if (    givesCheck // Check extension (~2 Elo)
               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
         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));
 
     }
                 update_continuation_histories(ss-1, pos.piece_on(prevSq), prevSq, -stat_bonus(depth + ONE_PLY));
 
     }

diff --git a/src/syzygy/tbprobe.cpp b/src/syzygy/tbprobe.cpp
index d0b59f056a9c02119c7ca3ce94e3c6a7dd1341bd..60979a5687409a41001e93332f0019ffcae3e330 100644 (file)
--- a/src/syzygy/tbprobe.cpp
+++ b/src/syzygy/tbprobe.cpp
@@ -1107,10 +1107,10 @@ void* mapped(TBTable<Type>& e, const Position& pos) {
 
     static Mutex mutex;
 
 
     static Mutex mutex;
 

-    // Use 'aquire' to avoid a thread reads 'ready' == true while another is
-    // still working, this could happen due to compiler reordering.
+    // Use 'acquire' to avoid a thread reading 'ready' == true while
+    // another is still working. (compiler reordering may cause this).

     if (e.ready.load(std::memory_order_acquire))
     if (e.ready.load(std::memory_order_acquire))

-        return e.baseAddress; // Could be nullptr if file does not exsist
+        return e.baseAddress; // Could be nullptr if file does not exist

 
     std::unique_lock<Mutex> lk(mutex);
 
 
     std::unique_lock<Mutex> lk(mutex);
 

diff --git a/src/thread.cpp b/src/thread.cpp
index 5e990fdc680c0549a58f6412256d61ddf4642ac2..e69120842c58f0be117c0b16e2c7800b14f54d26 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -118,7 +118,7 @@ void Thread::idle_loop() {
 }
 
 /// ThreadPool::set() creates/destroys threads to match the requested number.
 }
 
 /// ThreadPool::set() creates/destroys threads to match the requested number.

-/// Created and launched threads will go immediately to sleep in idle_loop.
+/// Created and launched threads will immediately go to sleep in idle_loop.

 /// Upon resizing, threads are recreated to allow for binding if necessary.
 
 void ThreadPool::set(size_t requested) {
 /// Upon resizing, threads are recreated to allow for binding if necessary.
 
 void ThreadPool::set(size_t requested) {