Use score and value consistently

[stockfish] / src / pawns.cpp

diff --git a/src/pawns.cpp b/src/pawns.cpp
index b26b1be656cda8a599ca2a00d8405fd45317ac9b..3d98c0124a512c0c843ea7f728138d3b370e48fb 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -104,7 +104,7 @@ namespace {
     Bitboard b, p, doubled, connected;
     Square s;
     bool passed, isolated, opposed, phalanx, backward, unsupported, lever;
     Bitboard b, p, doubled, connected;
     Square s;
     bool passed, isolated, opposed, phalanx, backward, unsupported, lever;

-    Score value = SCORE_ZERO;
+    Score score = SCORE_ZERO;

     const Square* pl = pos.list<PAWN>(Us);
     const Bitboard* pawnAttacksBB = StepAttacksBB[make_piece(Us, PAWN)];
 
     const Square* pl = pos.list<PAWN>(Us);
     const Bitboard* pawnAttacksBB = StepAttacksBB[make_piece(Us, PAWN)];
 


@@ -174,28 +174,28 @@ namespace {
 
         // Score this pawn
         if (isolated)
 
         // Score this pawn
         if (isolated)

-            value -= Isolated[opposed][f];
+            score -= Isolated[opposed][f];

 
         if (unsupported && !isolated)
 
         if (unsupported && !isolated)

-            value -= UnsupportedPawnPenalty;
+            score -= UnsupportedPawnPenalty;

 
         if (doubled)
 
         if (doubled)

-            value -= Doubled[f] / distance<Rank>(s, frontmost_sq(Us, doubled));
+            score -= Doubled[f] / distance<Rank>(s, frontmost_sq(Us, doubled));

 
         if (backward)
 
         if (backward)

-            value -= Backward[opposed][f];
+            score -= Backward[opposed][f];

 
         if (connected)
 
         if (connected)

-            value += Connected[opposed][phalanx][relative_rank(Us, s)];
+            score += Connected[opposed][phalanx][relative_rank(Us, s)];

 
         if (lever)
 
         if (lever)

-            value += Lever[relative_rank(Us, s)];
+            score += Lever[relative_rank(Us, s)];

     }
 
     b = e->semiopenFiles[Us] ^ 0xFF;
     e->pawnSpan[Us] = b ? int(msb(b) - lsb(b)) : 0;
 
     }
 
     b = e->semiopenFiles[Us] ^ 0xFF;
     e->pawnSpan[Us] = b ? int(msb(b) - lsb(b)) : 0;
 

-    return value;
+    return score;

   }
 
 } // namespace
   }
 
 } // namespace


@@ -233,7 +233,7 @@ Entry* probe(const Position& pos, Table& entries) {
       return e;
 
   e->key = key;
       return e;
 
   e->key = key;

-  e->value = evaluate<WHITE>(pos, e) - evaluate<BLACK>(pos, e);
+  e->score = evaluate<WHITE>(pos, e) - evaluate<BLACK>(pos, e);

   return e;
 }
 
   return e;
 }