X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=6124246229696291b3cfa162ba7cc1f87e83c374;hp=afb456c9036bdd483181b2e3403ca423ce4eb056;hb=15e21911110f9d459c4fef2bb17903d97345d0b9;hpb=ccdb634b7722a300707b9348ac30ae2c4152da8a
diff --git a/src/pawns.h b/src/pawns.h
index afb456c9..61242462 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,7 +1,7 @@
/*
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-2014 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
@@ -17,126 +17,73 @@
along with this program. If not, see .
*/
-
-#if !defined(PAWNS_H_INCLUDED)
+#ifndef PAWNS_H_INCLUDED
#define PAWNS_H_INCLUDED
-////
-//// Includes
-////
-
-#include "bitboard.h"
-#include "value.h"
-
-////
-//// Types
-////
+#include "misc.h"
+#include "position.h"
+#include "types.h"
-/// PawnInfo is a class which contains various information about a pawn
-/// structure. Currently, it only includes a middle game and an end game
-/// pawn structure evaluation, and a bitboard of passed pawns. We may want
-/// to add further information in the future. A lookup to the pawn hash table
-/// (performed by calling the get_pawn_info method in a PawnInfoTable object)
-/// returns a pointer to a PawnInfo object.
-class Position;
+namespace Pawns {
-class PawnInfo {
+/// Pawns::Entry contains various information about a pawn structure. A lookup
+/// to the pawn hash table (performed by calling the probe function) returns a
+/// pointer to an Entry object.
- friend class PawnInfoTable;
+struct Entry {
-public:
- PawnInfo() { clear(); }
+ Score pawns_value() const { return value; }
+ 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]; }
- Value mg_value() const;
- Value eg_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;
- 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;
- int get_king_shelter(const Position& pos, Color c, Square ksq);
+ int semiopen_file(Color c, File f) const {
+ return semiopenFiles[c] & (1 << f);
+ }
-private:
- void clear();
- int updateShelter(const Position& pos, Color c, Square ksq);
+ int semiopen_side(Color c, File f, bool leftSide) const {
+ return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1));
+ }
- 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];
-};
+ int pawn_span(Color c) const {
+ return pawnSpan[c];
+ }
-/// The PawnInfoTable class represents a pawn hash table. It is basically
-/// just an array of PawnInfo objects and a few methods for accessing these
-/// objects. The most important method is get_pawn_info, which looks up a
-/// position in the table and returns a pointer to a PawnInfo object.
+ int pawns_on_same_color_squares(Color c, Square s) const {
+ return pawnsOnSquares[c][!!(DarkSquares & s)];
+ }
-class PawnInfoTable {
-
-public:
- PawnInfoTable(unsigned numOfEntries);
- ~PawnInfoTable();
- PawnInfo* get_pawn_info(const Position& pos);
+ template
+ Score king_safety(const Position& pos, Square ksq) {
+ return kingSquares[Us] == ksq && castlingRights[Us] == pos.can_castle(Us)
+ ? kingSafety[Us] : (kingSafety[Us] = do_king_safety(pos, ksq));
+ }
-private:
- typedef std::pair Values;
+ template
+ Score do_king_safety(const Position& pos, Square ksq);
template
- Values evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+ Value shelter_storm(const Position& pos, Square ksq);
- unsigned size;
- PawnInfo* entries;
+ Key key;
+ Score value;
+ 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 castlingRights[COLOR_NB];
+ int semiopenFiles[COLOR_NB];
+ int pawnSpan[COLOR_NB];
+ int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
};
+typedef HashTable Table;
-////
-//// Inline functions
-////
-
-inline Value PawnInfo::mg_value() const {
- return Value(mgValue);
-}
-
-inline Value PawnInfo::eg_value() const {
- return Value(egValue);
-}
-
-inline Bitboard PawnInfo::passed_pawns() const {
- return passedPawns;
-}
-
-inline Bitboard PawnInfo::pawn_attacks(Color c) const {
- return pawnAttacks[c];
-}
-
-inline Value PawnInfo::kingside_storm_value(Color c) const {
- return Value(ksStormValue[c]);
-}
-
-inline Value PawnInfo::queenside_storm_value(Color c) const {
- return Value(qsStormValue[c]);
-}
-
-inline int PawnInfo::file_is_half_open(Color c, File f) const {
- return (halfOpenFiles[c] & (1 << int(f)));
-}
-
-inline int PawnInfo::has_open_file_to_left(Color c, File f) const {
- return halfOpenFiles[c] & ((1 << int(f)) - 1);
-}
-
-inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
- return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
-}
+void init();
+Entry* probe(const Position& pos, Table& entries);
-inline int PawnInfo::get_king_shelter(const Position& pos, Color c, Square ksq) {
- return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq));
-}
+} // namespace Pawns
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED