/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
public:
PawnInfo() { clear(); }
- Score value() const;
+ Score pawns_value() const;
Value kingside_storm_value(Color c) const;
Value queenside_storm_value(Color c) const;
Bitboard pawn_attacks(Color c) const;
Key key;
Bitboard passedPawns;
Bitboard pawnAttacks[2];
- int16_t mgValue, egValue;
+ Square kingSquares[2];
+ Score value;
int16_t ksStormValue[2], qsStormValue[2];
uint8_t halfOpenFiles[2];
- Square kingSquares[2];
uint8_t kingShelters[2];
};
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);
+ Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
unsigned size;
PawnInfo* entries;
//// Inline functions
////
-inline Score PawnInfo::value() const {
- return make_score(mgValue, egValue);
+inline Score PawnInfo::pawns_value() const {
+ return value;
}
inline Bitboard PawnInfo::passed_pawns() const {