X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=0e3e3abbb0a8b57c129bf62f39d901fe1ff2a16d;hp=33a8f523da763ba9b8347e51962d0b3f350072ba;hb=4c1a8ff9da057987e34936af8743a4d179a472dc;hpb=ef014e110098db03e9380f09bd2e92cf02bf760d diff --git a/src/main.cpp b/src/main.cpp index 33a8f523..0e3e3abb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,15 +49,33 @@ public: if (!pos.pos_is_ok()) { return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN"); } + + bool invert = (pos.side_to_move() == BLACK); + + HashProbeMove *root_move = response->add_move(); + root_move->set_move(MOVE_NONE); + ProbeMove(pos.key(), invert, root_move); + + MoveList moves(pos); + for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) { + HashProbeMove *move = response->add_move(); + move->set_move(em->move); + ProbeMove(pos.key_after(em->move), !invert, move); + } + + return Status::OK; + } + + void ProbeMove(const int64_t key, bool invert, HashProbeMove* response) { bool found; - TTEntry *entry = TT.probe(pos.key(), found); + TTEntry *entry = TT.probe(key, found); response->set_found(found); if (found) { Value value = entry->value(); Value eval = entry->eval(); Bound bound = entry->bound(); - if (pos.side_to_move() == BLACK) { + if (invert) { value = -value; eval = -eval; if (bound == BOUND_UPPER) { @@ -67,13 +85,12 @@ public: } } - response->set_move(entry->move()); + response->set_pv_move(entry->move()); response->set_depth(entry->depth()); response->set_eval(eval); response->set_value(value); - response->set_bound(HashProbeResponse::ValueBound(bound)); + response->set_bound(HashProbeMove::ValueBound(bound)); } - return Status::OK; } };