Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);
void id_loop(Position& pos);
- bool check_is_dangerous(Position &pos, Move move, Value futilityBase, Value beta, Value *bValue);
+ bool check_is_dangerous(Position &pos, Move move, Value futilityBase, Value beta);
bool connected_moves(const Position& pos, Move m1, Move m2);
Value value_to_tt(Value v, int ply);
Value value_from_tt(Value v, int ply);
&& move != ttMove
&& !pos.is_capture_or_promotion(move)
&& ss->eval + PawnValueMidgame / 4 < beta
- && !check_is_dangerous(pos, move, futilityBase, beta, &bestValue))
+ && !check_is_dangerous(pos, move, futilityBase, beta))
continue;
// Check for legality only before to do the move
// bestValue is updated only when returning false because in that case move
// will be pruned.
- bool check_is_dangerous(Position &pos, Move move, Value futilityBase, Value beta, Value *bestValue)
+ bool check_is_dangerous(Position &pos, Move move, Value futilityBase, Value beta)
{
Bitboard b, occ, oldAtt, newAtt, kingAtt;
- Square from, to, ksq, victimSq;
+ Square from, to, ksq;
Piece pc;
Color them;
- Value futilityValue, bv = *bestValue;
from = from_sq(move);
to = to_sq(move);
them = ~pos.side_to_move();
ksq = pos.king_square(them);
kingAtt = pos.attacks_from<KING>(ksq);
- pc = pos.piece_on(from);
+ pc = pos.piece_moved(move);
occ = pos.occupied_squares() & ~(1ULL << from) & ~(1ULL << ksq);
oldAtt = pos.attacks_from(pc, from, occ);
// Rule 3. Creating new double threats with checks
b = pos.pieces(them) & newAtt & ~oldAtt & ~(1ULL << ksq);
-
while (b)
{
- victimSq = pop_1st_bit(&b);
- futilityValue = futilityBase + PieceValueEndgame[pos.piece_on(victimSq)];
-
// Note that here we generate illegal "double move"!
- if ( futilityValue >= beta
- && pos.see_sign(make_move(from, victimSq)) >= 0)
+ if (futilityBase + PieceValueEndgame[pos.piece_on(pop_1st_bit(&b))] >= beta)
return true;
-
- if (futilityValue > bv)
- bv = futilityValue;
}
- // Update bestValue only if check is not dangerous (because we will prune the move)
- *bestValue = bv;
return false;
}
pos.do_move(m, *st++);
while ( (tte = TT.probe(pos.key())) != NULL
- && tte->move() != MOVE_NONE
- && pos.is_pseudo_legal(tte->move())
- && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces())
+ && (m = tte->move()) != MOVE_NONE // Local copy, TT entry could change
+ && pos.is_pseudo_legal(m)
+ && pos.pl_move_is_legal(m, pos.pinned_pieces())
&& ply < MAX_PLY
&& (!pos.is_draw<false>() || ply < 2))
{
- pv.push_back(tte->move());
- pos.do_move(tte->move(), *st++);
+ pv.push_back(m);
+ pos.do_move(m, *st++);
ply++;
}
pv.push_back(MOVE_NONE);
lock_grab(Threads.splitLock);
assert(is_searching);
- SplitPoint* sp = splitPoint;
+ SplitPoint* sp = curSplitPoint;
lock_release(Threads.splitLock);
Threads[master].wake_up();
}
}
- // In helpful master concept a master can help only a sub-tree of its split
- // point, and because here is all finished is not possible master is booked.
- assert(!is_searching);
}