LimitsType Limits;
std::vector<RootMove> RootMoves;
Position RootPos;
- Color RootColor;
Time::point SearchTime;
StateStackPtr SetupStates;
}
static PolyglotBook book; // Defined static to initialize the PRNG only once
- RootColor = RootPos.side_to_move();
- TimeMgr.init(Limits, RootPos.game_ply(), RootColor);
+ TimeMgr.init(Limits, RootPos.game_ply(), RootPos.side_to_move());
int cf = Options["Contempt Factor"] * PawnValueEg / 100; // From centipawns
- DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
- DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
+ DrawValue[ RootPos.side_to_move()] = VALUE_DRAW - Value(cf);
+ DrawValue[~RootPos.side_to_move()] = VALUE_DRAW + Value(cf);
if (RootMoves.empty())
{
log << "\nSearching: " << RootPos.fen()
<< "\ninfinite: " << Limits.infinite
<< " ponder: " << Limits.ponder
- << " time: " << Limits.time[RootColor]
- << " increment: " << Limits.inc[RootColor]
+ << " time: " << Limits.time[RootPos.side_to_move()]
+ << " increment: " << Limits.inc[RootPos.side_to_move()]
<< " moves to go: " << Limits.movestogo
<< "\n" << std::endl;
}
&& abs(beta) < VALUE_MATE_IN_MAX_PLY
&& !pos.pawn_on_7th(pos.side_to_move()))
{
+ if ( depth <= ONE_PLY
+ && eval + razor_margin(3 * ONE_PLY) <= alpha)
+ return qsearch<NonPV, false>(pos, ss, alpha, beta, DEPTH_ZERO);
+
Value ralpha = alpha - razor_margin(depth);
Value v = qsearch<NonPV, false>(pos, ss, ralpha, ralpha+1, DEPTH_ZERO);
if (v <= ralpha)
StateInfo state[MAX_PLY_PLUS_6], *st = state;
const TTEntry* tte;
- int ply = 0;
- Move m = pv[0];
+ int ply = 1; // At root ply is 1...
+ Move m = pv[0]; // ...instead pv[] array starts from 0
+ Value expectedScore = score;
pv.clear();
do {
pv.push_back(m);
- assert(MoveList<LEGAL>(pos).contains(pv[ply]));
+ assert(MoveList<LEGAL>(pos).contains(pv[ply - 1]));
- pos.do_move(pv[ply++], *st++);
+ pos.do_move(pv[ply++ - 1], *st++);
tte = TT.probe(pos.key());
+ expectedScore = -expectedScore;
} while ( tte
+ && expectedScore == value_from_tt(tte->value(), ply)
&& pos.pseudo_legal(m = tte->move()) // Local copy, TT could change
&& pos.legal(m, pos.pinned_pieces(pos.side_to_move()))
&& ply < MAX_PLY
- && (!pos.is_draw() || ply < 2));
+ && (!pos.is_draw() || ply <= 2));
pv.push_back(MOVE_NONE); // Must be zero-terminating
- while (ply) pos.undo_move(pv[--ply]);
+ while (--ply) pos.undo_move(pv[ply - 1]);
}
StateInfo state[MAX_PLY_PLUS_6], *st = state;
const TTEntry* tte;
- int ply = 0;
+ int idx = 0; // Ply starts from 1, we need to start from 0
do {
tte = TT.probe(pos.key());
- if (!tte || tte->move() != pv[ply]) // Don't overwrite correct entries
- TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[ply], VALUE_NONE);
+ if (!tte || tte->move() != pv[idx]) // Don't overwrite correct entries
+ TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[idx], VALUE_NONE);
- assert(MoveList<LEGAL>(pos).contains(pv[ply]));
+ assert(MoveList<LEGAL>(pos).contains(pv[idx]));
- pos.do_move(pv[ply++], *st++);
+ pos.do_move(pv[idx++], *st++);
- } while (pv[ply] != MOVE_NONE);
+ } while (pv[idx] != MOVE_NONE);
- while (ply) pos.undo_move(pv[--ply]);
+ while (idx) pos.undo_move(pv[--idx]);
}