X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpiece.cpp;h=84d12af107563c2809403c62b5d1ce16b031997d;hb=0363b5435847e66678cd3fa0d8a94e30b9a91663;hp=a4c2220daccfd3ae7c5bc077a8105d81fe3f938a;hpb=5dc23121215039938a9ef4e59ae934312774571c;p=stockfish
diff --git a/src/piece.cpp b/src/piece.cpp
index a4c2220d..84d12af1 100644
--- a/src/piece.cpp
+++ b/src/piece.cpp
@@ -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 .
*/
@@ -22,45 +22,36 @@
//// Includes
////
-#include
+#include
#include "piece.h"
+using namespace std;
-////
-//// Constants and variables
-////
+// Tables indexed by Piece
-const int SlidingArray[18] = {
- 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0
+const Value PieceValueMidgame[17] = {
+ VALUE_ZERO,
+ PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
+ RookValueMidgame, QueenValueMidgame,
+ VALUE_ZERO, VALUE_ZERO, VALUE_ZERO,
+ PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
+ RookValueMidgame, QueenValueMidgame,
+ VALUE_ZERO, VALUE_ZERO, VALUE_ZERO
};
-const SquareDelta Directions[16][16] = {
- {DELTA_ZERO},
- {DELTA_NW, DELTA_NE, DELTA_ZERO},
- {DELTA_SSW, DELTA_SSE, DELTA_SWW, DELTA_SEE,
- DELTA_NWW, DELTA_NEE, DELTA_NNW, DELTA_NNE, DELTA_ZERO},
- {DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
- {DELTA_S, DELTA_E, DELTA_W, DELTA_N, DELTA_ZERO},
- {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
- DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
- {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
- DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
- {DELTA_ZERO},
- {DELTA_ZERO},
- {DELTA_SW, DELTA_SE, DELTA_ZERO},
- {DELTA_SSW, DELTA_SSE, DELTA_SWW, DELTA_SEE,
- DELTA_NWW, DELTA_NEE, DELTA_NNW, DELTA_NNE, DELTA_ZERO},
- {DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
- {DELTA_S, DELTA_E, DELTA_W, DELTA_N, DELTA_ZERO},
- {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
- DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
- {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
- DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
-};
-
-const SquareDelta PawnPush[2] = {
- DELTA_N, DELTA_S
+const Value PieceValueEndgame[17] = {
+ VALUE_ZERO,
+ PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
+ RookValueEndgame, QueenValueEndgame,
+ VALUE_ZERO, VALUE_ZERO, VALUE_ZERO,
+ PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
+ RookValueEndgame, QueenValueEndgame,
+ VALUE_ZERO, VALUE_ZERO, VALUE_ZERO
+};
+
+const int SlidingArray[18] = {
+ 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0
};
@@ -68,28 +59,18 @@ const SquareDelta PawnPush[2] = {
//// Functions
////
-/// Translating piece types to/from English piece letters:
+/// Translating piece types to/from English piece letters
-static const char PieceChars[] = " pnbrqk";
+static const string PieceChars(" pnbrqk PNBRQK");
-char piece_type_to_char(PieceType pt, bool upcase = false) {
- return upcase? toupper(PieceChars[pt]) : PieceChars[pt];
-}
+char piece_type_to_char(PieceType pt, bool upcase) {
-PieceType piece_type_from_char(char c) {
- const char *ch = strchr(PieceChars, tolower(c));
- return ch? PieceType(ch - PieceChars) : NO_PIECE_TYPE;
+ return PieceChars[pt + int(upcase) * 7];
}
+PieceType piece_type_from_char(char c) {
-/// piece_is_ok() and piece_type_is_ok(), for debugging:
-
-bool piece_is_ok(Piece pc) {
- return
- piece_type_is_ok(type_of_piece(pc)) &&
- color_is_ok(color_of_piece(pc));
-}
+ size_t idx = PieceChars.find(c);
-bool piece_type_is_ok(PieceType pc) {
- return pc >= PAWN && pc <= KING;
+ return idx != string::npos ? PieceType(idx % 7) : PIECE_TYPE_NONE;
}