mirror of
https://github.com/sockspls/badfish
synced 2025-05-01 09:13:08 +00:00
Revert previous patch
It seems a regression at 15+0.05: ELO: -4.82 +-2.1 (95%) LOS: 0.0% Total: 40000 W: 7181 L: 7736 D: 25083 bench: 8331357
This commit is contained in:
parent
917944e9c5
commit
c376ffce0f
3 changed files with 10 additions and 15 deletions
|
@ -140,15 +140,6 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
|
|||
}
|
||||
|
||||
|
||||
/// quiet_moves() returns a pointer to the beginning of moves array. It
|
||||
/// is used to access already tried quiet moves when updating history.
|
||||
|
||||
const ExtMove* MovePicker::quiet_moves() const {
|
||||
return stage == KILLERS_S1 ? killers
|
||||
: stage == QUIETS_1_S1 || stage == QUIETS_2_S1 ? moves : NULL;
|
||||
}
|
||||
|
||||
|
||||
/// score() assign a numerical move ordering score to each move in a move list.
|
||||
/// The moves with highest scores will be picked first.
|
||||
template<>
|
||||
|
|
|
@ -88,7 +88,6 @@ public:
|
|||
MovePicker(const Position&, Move, const HistoryStats&, PieceType);
|
||||
MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
|
||||
|
||||
const ExtMove* quiet_moves() const;
|
||||
template<bool SpNode> Move next_move();
|
||||
|
||||
private:
|
||||
|
|
|
@ -484,6 +484,7 @@ namespace {
|
|||
assert(PvNode || (alpha == beta - 1));
|
||||
assert(depth > DEPTH_ZERO);
|
||||
|
||||
Move quietsSearched[64];
|
||||
StateInfo st;
|
||||
const TTEntry *tte;
|
||||
SplitPoint* splitPoint;
|
||||
|
@ -493,7 +494,7 @@ namespace {
|
|||
Value bestValue, value, ttValue, eval, nullValue, futilityValue;
|
||||
bool inCheck, givesCheck, pvMove, singularExtensionNode, improving;
|
||||
bool captureOrPromotion, dangerous, doFullDepthSearch;
|
||||
int moveCount;
|
||||
int moveCount, quietCount;
|
||||
|
||||
// Step 1. Initialize node
|
||||
Thread* thisThread = pos.this_thread();
|
||||
|
@ -514,7 +515,7 @@ namespace {
|
|||
goto moves_loop;
|
||||
}
|
||||
|
||||
moveCount = 0;
|
||||
moveCount = quietCount = 0;
|
||||
bestValue = -VALUE_INFINITE;
|
||||
ss->currentMove = threatMove = (ss+1)->excludedMove = bestMove = MOVE_NONE;
|
||||
ss->ply = (ss-1)->ply + 1;
|
||||
|
@ -900,6 +901,8 @@ moves_loop: // When in check and at SpNode search starts from here
|
|||
|
||||
pvMove = PvNode && moveCount == 1;
|
||||
ss->currentMove = move;
|
||||
if (!SpNode && !captureOrPromotion && quietCount < 64)
|
||||
quietsSearched[quietCount++] = move;
|
||||
|
||||
// Step 14. Make the move
|
||||
pos.do_move(move, st, ci, givesCheck);
|
||||
|
@ -1074,9 +1077,11 @@ moves_loop: // When in check and at SpNode search starts from here
|
|||
// played non-capture moves.
|
||||
Value bonus = Value(int(depth) * int(depth));
|
||||
History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus);
|
||||
|
||||
for (const ExtMove* em = mp.quiet_moves(); em && em->move != bestMove; ++em)
|
||||
History.update(pos.moved_piece(em->move), to_sq(em->move), -bonus);
|
||||
for (int i = 0; i < quietCount - 1; ++i)
|
||||
{
|
||||
Move m = quietsSearched[i];
|
||||
History.update(pos.moved_piece(m), to_sq(m), -bonus);
|
||||
}
|
||||
|
||||
if (is_ok((ss-1)->currentMove))
|
||||
Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
|
||||
|
|
Loading…
Add table
Reference in a new issue