/*
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
////
#include "bitboard.h"
+#include "scale.h"
#include "value.h"
////
friend class PawnInfoTable;
public:
- PawnInfo() : key(0) { clear(); }
+ PawnInfo() { clear(); }
- Value mg_value() const;
- Value eg_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;
Bitboard passed_pawns() const;
+ ScaleFactor scale_factor(Color c) const;
int file_is_half_open(Color c, File f) const;
int has_open_file_to_left(Color c, File f) const;
int has_open_file_to_right(Color c, File f) const;
Key key;
Bitboard passedPawns;
Bitboard pawnAttacks[2];
- int16_t mgValue, egValue;
- int16_t ksStormValue[2], qsStormValue[2];
- uint8_t halfOpenFiles[2];
Square kingSquares[2];
- uint8_t kingShelters[2];
+ Score value;
+ int16_t ksStormValue[2], qsStormValue[2];
+ uint8_t halfOpenFiles[2], kingShelters[2], factor[2];
};
/// The PawnInfoTable class represents a pawn hash table. It is basically
PawnInfo* get_pawn_info(const Position& pos);
private:
+ template<Color Us>
+ Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+
unsigned size;
PawnInfo* entries;
};
//// Inline functions
////
-inline Value PawnInfo::mg_value() const {
- return Value(mgValue);
-}
-
-inline Value PawnInfo::eg_value() const {
- return Value(egValue);
+inline Score PawnInfo::pawns_value() const {
+ return value;
}
inline Bitboard PawnInfo::passed_pawns() const {
return Value(qsStormValue[c]);
}
+inline ScaleFactor PawnInfo::scale_factor(Color c) const {
+ return ScaleFactor(factor[c]);
+}
+
inline int PawnInfo::file_is_half_open(Color c, File f) const {
return (halfOpenFiles[c] & (1 << int(f)));
}