From fe72c93141627c8109761da6546014a8d0461450 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Wed, 10 Apr 2013 22:23:48 +0200 Subject: [PATCH] De-templetize Position::is_draw() Now that we always check for repetition we don't need a template anymore. No functional change. --- src/position.cpp | 28 ++++++++++------------------ src/position.h | 2 +- src/search.cpp | 6 +++--- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/position.cpp b/src/position.cpp index 5193d20e..210a1ba9 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -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 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); + int i = 4, e = std::min(st->rule50, st->pliesFromNull); - if (i <= e) - { - 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() const; -template bool Position::is_draw() const; - /// Position::flip() flips position with the white and black sides reversed. This /// is only useful for debugging especially for finding evaluation symmetry bugs. diff --git a/src/position.h b/src/position.h index c41d31cf..7616eadc 100644 --- a/src/position.h +++ b/src/position.h @@ -179,7 +179,7 @@ public: Thread* this_thread() const; int64_t nodes_searched() const; void set_nodes_searched(int64_t n); - template bool is_draw() const; + bool is_draw() const; // Position consistency check, for debugging bool pos_is_ok(int* failedStep = NULL) const; diff --git a/src/search.cpp b/src/search.cpp index 529a6ffe..055ee877 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -533,7 +533,7 @@ namespace { if (!RootNode) { // Step 2. Check for aborted search and immediate draw - if (Signals.stop || pos.is_draw() || 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() || 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() || ply < 2)); + && (!pos.is_draw() || ply < 2)); pv.push_back(MOVE_NONE); // Must be zero-terminating -- 2.39.2