kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00
Code Issues Releases Wiki Activity

Retire useless piece_value_midgame() overloads

Browse source 
Directly access the table in the few call places.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-08-19 17:00:36 +01:00
parent 5bed82cd4e
commit 391e176274
3 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/position.cpp
View file

@ -889,7 +889,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
st->value += pst(us, promotion, to); st->value += pst(us, promotion, to);
// Update material // Update material
st->npMaterial[us] += piece_value_midgame(promotion); st->npMaterial[us] += PieceValueMidgame[promotion];
} }
} }
@ -962,7 +962,7 @@ void Position::do_capture_move(Key& key, PieceType capture, Color them, Square t
st->pawnKey ^= zobrist[them][PAWN][capsq]; st->pawnKey ^= zobrist[them][PAWN][capsq];
} }
else else
st->npMaterial[them] -= piece_value_midgame(capture); st->npMaterial[them] -= PieceValueMidgame[capture];
// Remove captured piece // Remove captured piece
clear_bit(&(byColorBB[them]), capsq); clear_bit(&(byColorBB[them]), capsq);
@ -1694,8 +1694,9 @@ Value Position::compute_non_pawn_material(Color c) const {
while (b) while (b)
{ {
assert(piece_on(first_1(b)) == piece_of_color_and_type(c, pt)); assert(piece_on(first_1(b)) == piece_of_color_and_type(c, pt));
pop_1st_bit(&b); pop_1st_bit(&b);
result += piece_value_midgame(pt); result += PieceValueMidgame[pt];
} }
} }
return result; return result;

4
src/position.h
View file

@ -377,11 +377,11 @@ inline bool Position::square_is_occupied(Square s) const {
} }
inline Value Position::midgame_value_of_piece_on(Square s) const { inline Value Position::midgame_value_of_piece_on(Square s) const {
return piece_value_midgame(piece_on(s)); return PieceValueMidgame[piece_on(s)];
} }
inline Value Position::endgame_value_of_piece_on(Square s) const { inline Value Position::endgame_value_of_piece_on(Square s) const {
return piece_value_endgame(piece_on(s)); return PieceValueEndgame[piece_on(s)];
} }
inline Color Position::side_to_move() const { inline Color Position::side_to_move() const {

24
src/value.h
View file

@ -163,28 +163,12 @@ inline Value value_mated_in(int ply) {
return -VALUE_MATE + ply; return -VALUE_MATE + ply;
} }
inline bool is_upper_bound(ValueType vt) { inline int is_upper_bound(ValueType vt) {
return (int(vt) & int(VALUE_TYPE_UPPER)) != 0; return vt & VALUE_TYPE_UPPER;
} }
inline bool is_lower_bound(ValueType vt) { inline int is_lower_bound(ValueType vt) {
return (int(vt) & int(VALUE_TYPE_LOWER)) != 0; return vt & VALUE_TYPE_LOWER;
}
inline Value piece_value_midgame(PieceType pt) {
return PieceValueMidgame[pt];
}
inline Value piece_value_endgame(PieceType pt) {
return PieceValueEndgame[pt];
}
inline Value piece_value_midgame(Piece p) {
return PieceValueMidgame[p];
}
inline Value piece_value_endgame(Piece p) {
return PieceValueEndgame[p];
} }
#endif // !defined(VALUE_H_INCLUDED) #endif // !defined(VALUE_H_INCLUDED)