Update some comments (#973)

Use somewhat more precise comments in a couple of places.

No functional change.

diff --git a/src/bitboard.h b/src/bitboard.h
index e4ccc3595df098da7aaae2cd7249f720f21b0cc1..bef6467560bc7efcb122514954686ea5c61b3e93 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -164,7 +164,7 @@ inline Bitboard in_front_bb(Color c, Rank r) {
 
 /// forward_bb() returns a bitboard representing all the squares along the line
 /// in front of the given one, from the point of view of the given color:
 
 /// forward_bb() returns a bitboard representing all the squares along the line
 /// in front of the given one, from the point of view of the given color:

-///        ForwardBB[c][s] = in_front_bb(c, s) & file_bb(s)
+///        ForwardBB[c][s] = in_front_bb(c, rank_of(s)) & file_bb(s)

 
 inline Bitboard forward_bb(Color c, Square s) {
   return ForwardBB[c][s];
 
 inline Bitboard forward_bb(Color c, Square s) {
   return ForwardBB[c][s];


@@ -174,7 +174,7 @@ inline Bitboard forward_bb(Color c, Square s) {
 /// pawn_attack_span() returns a bitboard representing all the squares that can be
 /// attacked by a pawn of the given color when it moves along its file, starting
 /// from the given square:
 /// pawn_attack_span() returns a bitboard representing all the squares that can be
 /// attacked by a pawn of the given color when it moves along its file, starting
 /// from the given square:

-///       PawnAttackSpan[c][s] = in_front_bb(c, s) & adjacent_files_bb(s);
+///       PawnAttackSpan[c][s] = in_front_bb(c, rank_of(s)) & adjacent_files_bb(s);

 
 inline Bitboard pawn_attack_span(Color c, Square s) {
   return PawnAttackSpan[c][s];
 
 inline Bitboard pawn_attack_span(Color c, Square s) {
   return PawnAttackSpan[c][s];

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 6c9a29d7034408df7e750baa3f1b7e2b824d0cde..03b422f8b1155252a7a8930eae5e87a5523fc377 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -44,7 +44,7 @@ namespace {
   Score Connected[2][2][2][RANK_NB];
 
   // Doubled pawn penalty
   Score Connected[2][2][2][RANK_NB];
 
   // Doubled pawn penalty

-  const Score Doubled = S(18,38);
+  const Score Doubled = S(18, 38);

 
   // Lever bonus by rank
   const Score Lever[RANK_NB] = {
 
   // Lever bonus by rank
   const Score Lever[RANK_NB] = {


@@ -53,7 +53,7 @@ namespace {
   };
 
   // Weakness of our pawn shelter in front of the king by [distance from edge][rank].
   };
 
   // Weakness of our pawn shelter in front of the king by [distance from edge][rank].

-  // RANK_1 = 0 is used for files where we have no pawns, or where our pawn is behind our king.
+  // RANK_1 = 0 is used for files where we have no pawns or our pawn is behind our king.

   const Value ShelterWeakness[][RANK_NB] = {
     { V(100), V(20), V(10), V(46), V(82), V( 86), V( 98) },
     { V(116), V( 4), V(28), V(87), V(94), V(108), V(104) },
   const Value ShelterWeakness[][RANK_NB] = {
     { V(100), V(20), V(10), V(46), V(82), V( 86), V( 98) },
     { V(116), V( 4), V(28), V(87), V(94), V(108), V(104) },


@@ -63,7 +63,7 @@ namespace {
 
   // Danger of enemy pawns moving toward our king by [type][distance from edge][rank].
   // For the unopposed and unblocked cases, RANK_1 = 0 is used when opponent has no pawn
 
   // Danger of enemy pawns moving toward our king by [type][distance from edge][rank].
   // For the unopposed and unblocked cases, RANK_1 = 0 is used when opponent has no pawn

-  // on the given file, or his pawn his behind our king.
+  // on the given file, or their pawn is behind our king.

   const Value StormDanger[][4][RANK_NB] = {
     { { V( 0),  V(-290), V(-274), V(57), V(41) },  //BlockedByKing
       { V( 0),  V(  60), V( 144), V(39), V(13) },
   const Value StormDanger[][4][RANK_NB] = {
     { { V( 0),  V(-290), V(-274), V(57), V(41) },  //BlockedByKing
       { V( 0),  V(  60), V( 144), V(39), V(13) },

diff --git a/src/search.cpp b/src/search.cpp
index 45f50a6353c649b1eb80eb1ca6b082a509fbfdde..a7dbd90d522608b992679ec283d64c80bc197f40 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -875,7 +875,8 @@ moves_loop: // When in check search starts from here
       moveCountPruning =   depth < 16 * ONE_PLY
                         && moveCount >= FutilityMoveCounts[improving][depth / ONE_PLY];
 
       moveCountPruning =   depth < 16 * ONE_PLY
                         && moveCount >= FutilityMoveCounts[improving][depth / ONE_PLY];
 

-      // Step 12. Extend checks
+      // Step 12. Extensions
+      // Extend checks

       if (    givesCheck
           && !moveCountPruning
           &&  pos.see_ge(move, VALUE_ZERO))
       if (    givesCheck
           && !moveCountPruning
           &&  pos.see_ge(move, VALUE_ZERO))


@@ -901,7 +902,7 @@ moves_loop: // When in check search starts from here
               extension = ONE_PLY;
       }
 
               extension = ONE_PLY;
       }
 

-      // Update the current move (this must be done after singular extension search)
+      // Calculate new depth for this move

       newDepth = depth - ONE_PLY + extension;
 
       // Step 13. Pruning at shallow depth
       newDepth = depth - ONE_PLY + extension;
 
       // Step 13. Pruning at shallow depth


@@ -953,6 +954,7 @@ moves_loop: // When in check search starts from here
           continue;
       }
 
           continue;
       }
 

+      // Update the current move (this must be done after singular extension search)

       ss->currentMove = move;
       ss->counterMoves = &thisThread->counterMoveHistory[moved_piece][to_sq(move)];
 
       ss->currentMove = move;
       ss->counterMoves = &thisThread->counterMoveHistory[moved_piece][to_sq(move)];