kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-12 03:59:15 +00:00
Code Issues Releases Wiki Activity

Score root move list during first iteration

Browse source 
Use first iteration to get a proper startup score
and possibly detect an easy move.

After 5180 games:
Mod vs Orig 847 - 823 - 3510  ELO +1 (+- 5.5)

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-02-26 18:29:22 +01:00
parent 204efb109b
commit ce2845d333
1 changed files with 10 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/search.cpp
View file

@ -298,7 +298,6 @@ namespace {
void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount); void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
void update_killers(Move m, Move killers[]); void update_killers(Move m, Move killers[]);
void update_gains(const Position& pos, Move move, Value before, Value after); void update_gains(const Position& pos, Move move, Value before, Value after);
void qsearch_scoring(Position& pos, MoveStack* mlist, MoveStack* last);
int current_search_time(); int current_search_time();
std::string value_to_uci(Value v); std::string value_to_uci(Value v);
@ -601,7 +600,7 @@ namespace {
Value value, alpha, beta; Value value, alpha, beta;
Move bestMove, easyMove; Move bestMove, easyMove;
// Moves to search are verified, scored and sorted // Moves to search are verified and copied
Rml.init(pos, searchMoves); Rml.init(pos, searchMoves);
// Initialize FIXME move before Rml.init() // Initialize FIXME move before Rml.init()
@ -623,11 +622,6 @@ namespace {
return MOVE_NONE; return MOVE_NONE;
} }
// Is one move significantly better than others after initial scoring ?
if ( Rml.size() == 1
|| Rml[0].pv_score > Rml[1].pv_score + EasyMoveMargin)
easyMove = Rml[0].pv[0];
// Iterative deepening loop // Iterative deepening loop
while (++depth <= PLY_MAX && (!MaxDepth || depth <= MaxDepth) && !StopRequest) while (++depth <= PLY_MAX && (!MaxDepth || depth <= MaxDepth) && !StopRequest)
{ {
@ -696,8 +690,10 @@ namespace {
if (UseLogFile) if (UseLogFile)
LogFile << pretty_pv(pos, depth, value, current_search_time(), Rml[0].pv) << endl; LogFile << pretty_pv(pos, depth, value, current_search_time(), Rml[0].pv) << endl;
// Drop the easy move if differs from the new best move // Init easyMove after first iteration or drop if differs from the best move
if (bestMove != easyMove) if (depth == 1 && (Rml.size() == 1 || Rml[0].pv_score > Rml[1].pv_score + EasyMoveMargin))
easyMove = bestMove;
else if (bestMove != easyMove)
easyMove = MOVE_NONE; easyMove = MOVE_NONE;
if (UseTimeManagement && !StopRequest) if (UseTimeManagement && !StopRequest)
@ -1032,7 +1028,9 @@ split_point_start: // At split points actual search starts from here
<< " currmovenumber " << moveCount << endl; << " currmovenumber " << moveCount << endl;
} }
isPvMove = (PvNode && moveCount <= (Root ? MultiPV : 1)); // At Root and at first iteration do a PV search on all the moves
// to score root moves. Otherwise only the first one is the PV.
isPvMove = (PvNode && moveCount <= (Root ? MultiPV + 1000 * (depth <= ONE_PLY) : 1));
moveIsCheck = pos.move_is_check(move, ci); moveIsCheck = pos.move_is_check(move, ci);
captureOrPromotion = pos.move_is_capture_or_promotion(move); captureOrPromotion = pos.move_is_capture_or_promotion(move);
@ -1501,26 +1499,6 @@ split_point_start: // At split points actual search starts from here
} }
// qsearch_scoring() scores each move of a list using a qsearch() evaluation,
// it is used in RootMoveList to get an initial scoring.
void qsearch_scoring(Position& pos, MoveStack* mlist, MoveStack* last) {
SearchStack ss[PLY_MAX_PLUS_2];
StateInfo st;
memset(ss, 0, 4 * sizeof(SearchStack));
ss[0].eval = ss[0].evalMargin = VALUE_NONE;
for (MoveStack* cur = mlist; cur != last; cur++)
{
ss[0].currentMove = cur->move;
pos.do_move(cur->move, st);
cur->score = -qsearch<PV>(pos, ss+1, -VALUE_INFINITE, VALUE_INFINITE, DEPTH_ZERO, 1);
pos.undo_move(cur->move);
}
}
// check_is_dangerous() tests if a checking move can be pruned in qsearch(). // check_is_dangerous() tests if a checking move can be pruned in qsearch().
// bestValue is updated only when returning false because in that case move // bestValue is updated only when returning false because in that case move
// will be pruned. // will be pruned.
@ -2559,11 +2537,8 @@ split_point_start: // At split points actual search starts from here
clear(); clear();
bestMoveChanges = 0; bestMoveChanges = 0;
// Generate all legal moves and score them // Generate all legal moves and add them to RootMoveList
MoveStack* last = generate<MV_LEGAL>(pos, mlist); MoveStack* last = generate<MV_LEGAL>(pos, mlist);
qsearch_scoring(pos, mlist, last);
// Add each move to the RootMoveList's vector
for (MoveStack* cur = mlist; cur != last; cur++) for (MoveStack* cur = mlist; cur != last; cur++)
{ {
// If we have a searchMoves[] list then verify cur->move // If we have a searchMoves[] list then verify cur->move
@ -2576,10 +2551,9 @@ split_point_start: // At split points actual search starts from here
RootMove rm; RootMove rm;
rm.pv[0] = cur->move; rm.pv[0] = cur->move;
rm.pv[1] = MOVE_NONE; rm.pv[1] = MOVE_NONE;
rm.pv_score = Value(cur->score); rm.pv_score = -VALUE_INFINITE;
push_back(rm); push_back(rm);
} }
sort();
} }
} // namespace } // namespace