Use score and value consistently

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index 28fe1c075ed9ae344dbfc052058ff7ba80a2ac15..04aced772a814bd48d67a332779c27443a960a05 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -32,10 +32,9 @@ namespace Pawns {
 
 struct Entry {
 
-  Score pawns_value() const { return value; }
+  Score pawns_score() const { return score; }
   Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
   Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
-  Bitboard candidate_pawns(Color c) const { return candidatePawns[c]; }
 
   int semiopen_file(Color c, File f) const {
     return semiopenFiles[c] & (1 << f);
@@ -45,6 +44,10 @@ struct Entry {
     return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1));
   }
 
+  int pawn_span(Color c) const {
+    return pawnSpan[c];
+  }
+
   int pawns_on_same_color_squares(Color c, Square s) const {
     return pawnsOnSquares[c][!!(DarkSquares & s)];
   }
@@ -62,15 +65,15 @@ struct Entry {
   Value shelter_storm(const Position& pos, Square ksq);
 
   Key key;
-  Score value;
+  Score score;
   Bitboard passedPawns[COLOR_NB];
-  Bitboard candidatePawns[COLOR_NB];
   Bitboard pawnAttacks[COLOR_NB];
   Square kingSquares[COLOR_NB];
   Score kingSafety[COLOR_NB];
-  int minKPdistance[COLOR_NB];
+  int minKingPawnDistance[COLOR_NB];
   int castlingRights[COLOR_NB];
   int semiopenFiles[COLOR_NB];
+  int pawnSpan[COLOR_NB];
   int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
 };