Convert MaterialInfo and PawnInfo to use Score

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index bfd30898ea705c9400fe2ac0ea54ad5f72a87dfc..557580e11ca3f41ee674ab8a58ee1362249fe39f 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -47,8 +47,7 @@ class PawnInfo {
 public:
   PawnInfo() { clear(); }
 
-  Value mg_value() const;
-  Value eg_value() const;
+  Score value() const;
   Value kingside_storm_value(Color c) const;
   Value queenside_storm_value(Color c) const;
   Bitboard pawn_attacks(Color c) const;
@@ -85,6 +84,11 @@ public:
   PawnInfo* get_pawn_info(const Position& pos);
 
 private:
+  typedef std::pair<Value, Value> Values;
+
+  template<Color Us>
+  Values evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+
   unsigned size;
   PawnInfo* entries;
 };
@@ -94,12 +98,8 @@ private:
 //// Inline functions
 ////
 
-inline Value PawnInfo::mg_value() const {
-  return Value(mgValue);
-}
-
-inline Value PawnInfo::eg_value() const {
-  return Value(egValue);
+inline Score PawnInfo::value() const {
+  return Score(mgValue, egValue);
 }
 
 inline Bitboard PawnInfo::passed_pawns() const {