kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Retire total_piece_count()

Browse source 
We really don't need to uglify in this way
our nice count() API with this ad-hoc hack.

So remove the hack and use the already
existing infrastructure.

No functional change.

Resolves #134
This commit is contained in:
Marco Costalba 2014-11-30 20:35:22 +00:00 • committed by Joona Kiiski
parent c014444f09
commit 314d446518
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/position.h
View file

@ -24,9 +24,9 @@
#include <cstddef> #include <cstddef>
#include "bitboard.h" #include "bitboard.h"
#include "bitcount.h"
#include "types.h" #include "types.h"
/// The checkInfo struct is initialized at c'tor time and keeps info used /// The checkInfo struct is initialized at c'tor time and keeps info used
/// to detect if a move gives check. /// to detect if a move gives check.
class Position; class Position;
@ -100,7 +100,6 @@ public:
bool empty(Square s) const; bool empty(Square s) const;
template<PieceType Pt> int count(Color c) const; template<PieceType Pt> int count(Color c) const;
template<PieceType Pt> const Square* list(Color c) const; template<PieceType Pt> const Square* list(Color c) const;
int total_piece_count() const;
// Castling // Castling
int can_castle(Color c) const; int can_castle(Color c) const;
@ -358,10 +357,6 @@ inline int Position::rule50_count() const {
return st->rule50; return st->rule50;
} }
inline int Position::total_piece_count() const {
return HasPopCnt ? popcount<Full>(pieces()) : pieceCount[WHITE][ALL_PIECES];
}
inline bool Position::opposite_bishops() const { inline bool Position::opposite_bishops() const {
return pieceCount[WHITE][BISHOP] == 1 return pieceCount[WHITE][BISHOP] == 1
@ -412,8 +407,7 @@ inline void Position::put_piece(Square s, Color c, PieceType pt) {
byColorBB[c] |= s; byColorBB[c] |= s;
index[s] = pieceCount[c][pt]++; index[s] = pieceCount[c][pt]++;
pieceList[c][pt][index[s]] = s; pieceList[c][pt][index[s]] = s;
if (!HasPopCnt) pieceCount[c][ALL_PIECES]++;
pieceCount[WHITE][ALL_PIECES]++;
} }
inline void Position::move_piece(Square from, Square to, Color c, PieceType pt) { inline void Position::move_piece(Square from, Square to, Color c, PieceType pt) {
@ -444,8 +438,7 @@ inline void Position::remove_piece(Square s, Color c, PieceType pt) {
index[lastSquare] = index[s]; index[lastSquare] = index[s];
pieceList[c][pt][index[lastSquare]] = lastSquare; pieceList[c][pt][index[lastSquare]] = lastSquare;
pieceList[c][pt][pieceCount[c][pt]] = SQ_NONE; pieceList[c][pt][pieceCount[c][pt]] = SQ_NONE;
if (!HasPopCnt) pieceCount[c][ALL_PIECES]--;
pieceCount[WHITE][ALL_PIECES]--;
} }
#endif // #ifndef POSITION_H_INCLUDED #endif // #ifndef POSITION_H_INCLUDED

9
src/search.cpp
View file

@ -205,7 +205,7 @@ void Search::think() {
else else
{ {
// Check Tablebases at root // Check Tablebases at root
int piecesCnt = RootPos.total_piece_count(); int piecesCnt = RootPos.count<ALL_PIECES>(WHITE) + RootPos.count<ALL_PIECES>(BLACK);
TBCardinality = Options["SyzygyProbeLimit"]; TBCardinality = Options["SyzygyProbeLimit"];
TBProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY; TBProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY;
if (TBCardinality > Tablebases::TBLargest) if (TBCardinality > Tablebases::TBLargest)
@ -470,6 +470,7 @@ namespace {
bool inCheck, givesCheck, singularExtensionNode, improving; bool inCheck, givesCheck, singularExtensionNode, improving;
bool captureOrPromotion, dangerous, doFullDepthSearch; bool captureOrPromotion, dangerous, doFullDepthSearch;
int moveCount, quietCount; int moveCount, quietCount;
int piecesCnt;
// Step 1. Initialize node // Step 1. Initialize node
Thread* thisThread = pos.this_thread(); Thread* thisThread = pos.this_thread();
@ -548,9 +549,11 @@ namespace {
} }
// Step 4a. Tablebase probe // Step 4a. Tablebase probe
piecesCnt = pos.count<ALL_PIECES>(WHITE) + pos.count<ALL_PIECES>(BLACK);
if ( !RootNode if ( !RootNode
&& pos.total_piece_count() <= TBCardinality && piecesCnt <= TBCardinality
&& ( pos.total_piece_count() < TBCardinality || depth >= TBProbeDepth ) && (piecesCnt < TBCardinality || depth >= TBProbeDepth)
&& pos.rule50_count() == 0) && pos.rule50_count() == 0)
{ {
int found, v = Tablebases::probe_wdl(pos, &found); int found, v = Tablebases::probe_wdl(pos, &found);