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

De-templetize Position::is_draw()

Browse source 
Now that we always check for repetition we don't
need a template anymore.

No functional change.
This commit is contained in:
Marco Costalba 2013-04-10 22:23:48 +02:00
parent 75221fcf5e
commit fe72c93141
3 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/position.cpp
View file

@ -1376,7 +1376,6 @@ Value Position::compute_non_pawn_material(Color c) const {
/// Position::is_draw() tests whether the position is drawn by material,
/// repetition, or the 50 moves rule. It does not detect stalemates, this
/// must be done by the search.
template<bool SkipRepetition>
bool Position::is_draw() const {
// Draw by material?
@ -1389,33 +1388,26 @@ bool Position::is_draw() const {
return true;
// Draw by repetition?
if (!SkipRepetition)
int i = 4, e = std::min(st->rule50, st->pliesFromNull);
if (i <= e)
{
int i = 4, e = std::min(st->rule50, st->pliesFromNull);
StateInfo* stp = st->previous->previous;
if (i <= e)
{
StateInfo* stp = st->previous->previous;
do {
stp = stp->previous->previous;
do {
stp = stp->previous->previous;
if (stp->key == st->key)
return true;
if (stp->key == st->key)
return true;
i += 2;
i += 2;
} while (i <= e);
}
} while (i <= e);
}
return false;
}
// Explicit template instantiations
template bool Position::is_draw<false>() const;
template bool Position::is_draw<true>() const;
/// Position::flip() flips position with the white and black sides reversed. This
/// is only useful for debugging especially for finding evaluation symmetry bugs.

2
src/position.h
View file

@ -179,7 +179,7 @@ public:
Thread* this_thread() const;
int64_t nodes_searched() const;
void set_nodes_searched(int64_t n);
template<bool SkipRepetition> bool is_draw() const;
bool is_draw() const;
// Position consistency check, for debugging
bool pos_is_ok(int* failedStep = NULL) const;

6
src/search.cpp
View file

@ -533,7 +533,7 @@ namespace {
if (!RootNode)
{
// Step 2. Check for aborted search and immediate draw
if (Signals.stop || pos.is_draw<false>() || ss->ply > MAX_PLY)
if (Signals.stop || pos.is_draw() || ss->ply > MAX_PLY)
return DrawValue[pos.side_to_move()];
// Step 3. Mate distance pruning. Even if we mate at the next move our score
@ -1129,7 +1129,7 @@ split_point_start: // At split points actual search starts from here
ss->ply = (ss-1)->ply + 1;
// Check for an instant draw or maximum ply reached
if (pos.is_draw<false>() || ss->ply > MAX_PLY)
if (pos.is_draw() || ss->ply > MAX_PLY)
return DrawValue[pos.side_to_move()];
// Decide whether or not to include checks, this fixes also the type of
@ -1579,7 +1579,7 @@ void RootMove::extract_pv_from_tt(Position& pos) {
&& pos.is_pseudo_legal(m = tte->move()) // Local copy, TT could change
&& pos.pl_move_is_legal(m, pos.pinned_pieces())
&& ply < MAX_PLY
&& (!pos.is_draw<false>() || ply < 2));
&& (!pos.is_draw() || ply < 2));
pv.push_back(MOVE_NONE); // Must be zero-terminating