HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-17 07:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Retire seeValues[] and move PieceValue[] out of Position

Browse Source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2011-06-26 10:16:31 +01:00
parent be2925b3c5
commit 351ef5c85b
6 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/position.cpp
View File

@@ -45,7 +45,7 @@ Key Position::zobExclusion;
Score Position::PieceSquareTable[16][64];
// Material values arrays, indexed by Piece
const Value Position::PieceValueMidgame[17] = {
const Value PieceValueMidgame[17] = {
VALUE_ZERO,
PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
RookValueMidgame, QueenValueMidgame, VALUE_ZERO,
@@ -54,7 +54,7 @@ const Value Position::PieceValueMidgame[17] = {
RookValueMidgame, QueenValueMidgame
};
const Value Position::PieceValueEndgame[17] = {
const Value PieceValueEndgame[17] = {
VALUE_ZERO,
PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
RookValueEndgame, QueenValueEndgame, VALUE_ZERO,
@@ -63,13 +63,6 @@ const Value Position::PieceValueEndgame[17] = {
RookValueEndgame, QueenValueEndgame
};
// Material values array used by SEE, indexed by PieceType
const Value Position::seeValues[] = {
VALUE_ZERO,
PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
RookValueMidgame, QueenValueMidgame, QueenValueMidgame*10
};
namespace {
@@ -1485,7 +1478,7 @@ int Position::see_sign(Move m) const {
// Early return if SEE cannot be negative because captured piece value
// is not less then capturing one. Note that king moves always return
// here because king midgame value is set to 0.
if (midgame_value_of_piece_on(to) >= midgame_value_of_piece_on(from))
if (piece_value_midgame(piece_on(to)) >= piece_value_midgame(piece_on(from)))
return 1;
return see(m);
@@ -1534,7 +1527,7 @@ int Position::see(Move m) const {
stm = opposite_color(color_of_piece_on(from));
stmAttackers = attackers & pieces_of_color(stm);
if (!stmAttackers)
return seeValues[capturedType];
return PieceValueMidgame[capturedType];
// The destination square is defended, which makes things rather more
// difficult to compute. We proceed by building up a "swap list" containing
@@ -1542,7 +1535,7 @@ int Position::see(Move m) const {
// destination square, where the sides alternately capture, and always
// capture with the least valuable piece. After each capture, we look for
// new X-ray attacks from behind the capturing piece.
swapList[0] = seeValues[capturedType];
swapList[0] = PieceValueMidgame[capturedType];
capturedType = type_of_piece_on(from);
do {
@@ -1563,7 +1556,7 @@ int Position::see(Move m) const {
// Add the new entry to the swap list
assert(slIndex < 32);
swapList[slIndex] = -swapList[slIndex - 1] + seeValues[capturedType];
swapList[slIndex] = -swapList[slIndex - 1] + PieceValueMidgame[capturedType];
slIndex++;
// Remember the value of the capturing piece, and change the side to