X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a5ed56ec3b77cba9d195e24ed705c0c18793f5b2;hb=4a7f980c9970e4f2ad26b43a8e43a620841ce315;hp=4be9aaf3fac5727e1db8833d8acbab4d4929275c;hpb=027ba2704dfbc26e671ca3f0a0db1b01c3becff3;p=stockfish

diff --git a/src/main.cpp b/src/main.cpp
index 4be9aaf3..a5ed56ec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -54,8 +54,7 @@ public:
 		bool invert = (pos.side_to_move() == BLACK);
 		Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack<StateInfo>);
 
-		HashProbeLine *root_line = response->add_line();
-		ProbeMove(&pos, setup_states.get(), invert, root_line);
+		ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
 
 		MoveList<LEGAL> moves(pos);
 		for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
@@ -108,15 +107,18 @@ public:
 			}
 
 			response->set_depth(entry->depth());
-			response->set_eval(eval);
-			response->set_value(value);
+			FillValue(eval, response->mutable_eval());
+			FillValue(value, response->mutable_value());
 			response->set_bound(HashProbeLine::ValueBound(bound));
 
 			// Follow the PV until we hit an illegal move.
 			std::stack<Move> pv;
+			std::set<Key> seen;
 			while (found && is_ok(entry->move())) {
 				FillMove(entry->move(), response->add_pv());
+				if (seen.count(pos->key())) break;
 				pv.push(entry->move());
+				seen.insert(pos->key());
 				setup_states->push(StateInfo());
 				pos->do_move(entry->move(), setup_states->top(), pos->gives_check(entry->move(), CheckInfo(*pos)));
 				entry = TT.probe(pos->key(), found);
@@ -129,6 +131,16 @@ public:
 			}
 		}
 	}
+
+	void FillValue(Value value, HashProbeScore* score) {
+		if (abs(value) < VALUE_MATE - MAX_PLY) {
+			score->set_score_type(HashProbeScore::SCORE_CP);
+			score->set_score_cp(value * 100 / PawnValueEg);
+		} else {
+			score->set_score_type(HashProbeScore::SCORE_MATE);
+			score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2);
+		}
+	}
 };
 	
 void rpc_thread()