X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=0e3e3abbb0a8b57c129bf62f39d901fe1ff2a16d;hp=6c1aa034c318e9802c9e082d4db2394cc0ded307;hb=aeddcd2f3efca129edbbbf07fa82ed8f0cbcdb7a;hpb=5d7ad47c198c54e7a91876a6d8d8488a0c23a1ba

diff --git a/src/main.cpp b/src/main.cpp
index 6c1aa034..0e3e3abb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,23 +45,52 @@ public:
 	Status Probe(ServerContext* context,
 	             const HashProbeRequest* request,
 	             HashProbeResponse *response) {
-		std::cout << "fen=" << request->fen() << std::endl;
 		Position pos(request->fen(), /*isChess960=*/false, Threads.main());
 		if (!pos.pos_is_ok()) {
 			return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
 		}
-		std::cout << "parsed=" << pos.fen() << std::endl;
+
+		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<LEGAL> 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) {
-			response->set_move(entry->move());
-			response->set_value(entry->value());
-			response->set_eval(entry->eval());
+			Value value = entry->value();
+			Value eval = entry->eval();
+			Bound bound = entry->bound();
+
+			if (invert) {
+				value = -value;
+				eval = -eval;
+				if (bound == BOUND_UPPER) {
+					bound = BOUND_LOWER;
+				} else if (bound == BOUND_LOWER) {
+					bound = BOUND_UPPER;
+				}
+			}
+
+			response->set_pv_move(entry->move());
 			response->set_depth(entry->depth());
-			response->set_bound(entry->bound());
+			response->set_eval(eval);
+			response->set_value(value);
+			response->set_bound(HashProbeMove::ValueBound(bound));
 		}
-		return Status::OK;
 	}
 };