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

Revert "Implement bestValue in root_search."

Browse source 
This reverts commit 9a39f93f35254787b7b57980019dde276a89c48c.

Revert bestValue in root_search

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Joona Kiiski 2009-04-12 19:49:09 +03:00 • committed by Marco Costalba
parent 6f28bcd483
commit 6c4e36aab6
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/search.cpp
View file

@ -891,7 +891,7 @@ namespace {
Value root_search(Position &pos, SearchStack ss[], RootMoveList &rml, Value alpha, Value beta) { Value root_search(Position &pos, SearchStack ss[], RootMoveList &rml, Value alpha, Value beta) {
Value bestValue = -VALUE_INFINITE; //FIXME: Implement bestValue
Value oldAlpha = alpha; Value oldAlpha = alpha;
Value value; Value value;
Bitboard dcCandidates = pos.discovered_check_candidates(pos.side_to_move()); Bitboard dcCandidates = pos.discovered_check_candidates(pos.side_to_move());
@ -899,7 +899,7 @@ namespace {
// Loop through all the moves in the root move list // Loop through all the moves in the root move list
for (int i = 0; i < rml.move_count() && !AbortSearch; i++) for (int i = 0; i < rml.move_count() && !AbortSearch; i++)
{ {
if (alpha >= beta) { //Aspiration window failed high, ignore rest of the moves! if (alpha >= beta) {
rml.set_move_score(i, -VALUE_INFINITE); rml.set_move_score(i, -VALUE_INFINITE);
//Leave node-counters and beta-counters as they are. //Leave node-counters and beta-counters as they are.
continue; continue;
@ -982,7 +982,7 @@ namespace {
assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE); assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE);
if (value <= bestValue && i >= MultiPV) if (value <= alpha && i >= MultiPV)
rml.set_move_score(i, -VALUE_INFINITE); rml.set_move_score(i, -VALUE_INFINITE);
else else
{ {
@ -1018,12 +1018,8 @@ namespace {
LogFile << pretty_pv(pos, current_search_time(), Iteration, nodes_searched(), value, ss[0].pv) LogFile << pretty_pv(pos, current_search_time(), Iteration, nodes_searched(), value, ss[0].pv)
<< std::endl; << std::endl;
if (value > bestValue)
{
bestValue = value;
if (value > alpha) if (value > alpha)
alpha = value; alpha = value;
}
// Reset the global variable Problem to false if the value isn't too // Reset the global variable Problem to false if the value isn't too
// far below the final value from the last iteration. // far below the final value from the last iteration.
@ -1050,17 +1046,16 @@ namespace {
std::cout << std::endl; std::cout << std::endl;
} }
alpha = rml.get_move_score(Min(i, MultiPV-1)); alpha = rml.get_move_score(Min(i, MultiPV-1));
bestValue = alpha; //In MultiPV-mode bestValue and alpha are always same thing.
} }
} }
if (bestValue <= oldAlpha) if (alpha <= oldAlpha)
FailLow = true; FailLow = true;
else else
FailLow = false; FailLow = false;
} }
return bestValue; return alpha;
} }