X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpiece.h;h=604a4b3ae14e77bfccac4c1a637fcfbf1415014a;hb=94a67c49b0238200bbd4b167d067f067ff4aad30;hp=59f22425372d4cf6de204f74a3d668322156b680;hpb=9d1e4d041d97d2a11a430a3bb6fa360fca31e69f;p=stockfish
diff --git a/src/piece.h b/src/piece.h
index 59f22425..604a4b3a 100644
--- a/src/piece.h
+++ b/src/piece.h
@@ -1,18 +1,18 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 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
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -21,56 +21,61 @@
#if !defined(PIECE_H_INCLUDED)
#define PIECE_H_INCLUDED
-////
+////
//// Includes
////
+#include
+
#include "color.h"
-#include "misc.h"
#include "square.h"
+#include "value.h"
-////
+////
//// Types
////
enum PieceType {
- NO_PIECE_TYPE = 0,
+ PIECE_TYPE_NONE = 0,
PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6
};
enum Piece {
- NO_PIECE = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6,
- BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14,
- EMPTY = 16, OUTSIDE = 17
+ PIECE_NONE_DARK_SQ = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6,
+ BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16
};
+ENABLE_OPERATORS_ON(PieceType);
+ENABLE_OPERATORS_ON(Piece);
+
////
-//// Constants and variables
+//// Constants
////
-const PieceType PieceTypeMin = PAWN;
-const PieceType PieceTypeMax = KING;
+/// Important: If the material values are changed, one must also
+/// adjust the piece square tables, and the method game_phase() in the
+/// Position class!
+///
+/// Values modified by Joona Kiiski
-extern const int SlidingArray[18];
-extern const SquareDelta Directions[16][16];
-extern const SquareDelta PawnPush[2];
+const Value PawnValueMidgame = Value(0x0C6);
+const Value PawnValueEndgame = Value(0x102);
+const Value KnightValueMidgame = Value(0x331);
+const Value KnightValueEndgame = Value(0x34E);
+const Value BishopValueMidgame = Value(0x344);
+const Value BishopValueEndgame = Value(0x359);
+const Value RookValueMidgame = Value(0x4F6);
+const Value RookValueEndgame = Value(0x4FE);
+const Value QueenValueMidgame = Value(0x9D9);
+const Value QueenValueEndgame = Value(0x9FE);
-////
+////
//// Inline functions
////
-inline Piece operator+ (Piece p, int i) { return Piece(int(p) + i); }
-inline void operator++ (Piece &p, int) { p = Piece(int(p) + 1); }
-inline Piece operator- (Piece p, int i) { return Piece(int(p) - i); }
-inline void operator-- (Piece &p, int) { p = Piece(int(p) - 1); }
-inline PieceType operator+ (PieceType p, int i) {return PieceType(int(p) + i);}
-inline void operator++ (PieceType &p, int) { p = PieceType(int(p) + 1); }
-inline PieceType operator- (PieceType p, int i) {return PieceType(int(p) - i);}
-inline void operator-- (PieceType &p, int) { p = PieceType(int(p) - 1); }
-
inline PieceType type_of_piece(Piece p) {
return PieceType(int(p) & 7);
}
@@ -83,51 +88,24 @@ inline Piece piece_of_color_and_type(Color c, PieceType pt) {
return Piece((int(c) << 3) | int(pt));
}
-inline Piece pawn_of_color(Color c) {
- return piece_of_color_and_type(c, PAWN);
-}
-
-inline Piece knight_of_color(Color c) {
- return piece_of_color_and_type(c, KNIGHT);
-}
-
-inline Piece bishop_of_color(Color c) {
- return piece_of_color_and_type(c, BISHOP);
-}
-
-inline Piece rook_of_color(Color c) {
- return piece_of_color_and_type(c, ROOK);
-}
-
-inline Piece queen_of_color(Color c) {
- return piece_of_color_and_type(c, QUEEN);
+inline SquareDelta pawn_push(Color c) {
+ return (c == WHITE ? DELTA_N : DELTA_S);
}
-inline Piece king_of_color(Color c) {
- return piece_of_color_and_type(c, KING);
+inline bool piece_type_is_ok(PieceType pt) {
+ return pt >= PAWN && pt <= KING;
}
-inline int piece_is_slider(Piece p) {
- return SlidingArray[int(p)];
+inline bool piece_is_ok(Piece p) {
+ return piece_type_is_ok(type_of_piece(p)) && color_is_ok(color_of_piece(p));
}
-inline int piece_type_is_slider(PieceType pt) {
- return SlidingArray[int(pt)];
+inline char piece_type_to_char(PieceType pt) {
+ return std::string(" PNBRQK")[pt];
}
-inline SquareDelta pawn_push(Color c) {
- return PawnPush[c];
+inline PieceType piece_type_from_char(char c) {
+ return PieceType(std::string(" PNBRQK").find(c));
}
-
-
-////
-//// Prototypes
-////
-
-extern char piece_type_to_char(PieceType pt, bool upcase = false);
-extern PieceType piece_type_from_char(char c);
-extern bool piece_is_ok(Piece pc);
-extern bool piece_type_is_ok(PieceType pt);
-
#endif // !defined(PIECE_H_INCLUDED)