Do not fill value if we have no search info.

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 4be9aaf3fac5727e1db8833d8acbab4d4929275c..d20d8df4b3dc8af0eb5fe90d7f2c63b900b9dac2 100644 (file)
--- 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,20 @@ public:
                        }
 
                        response->set_depth(entry->depth());
-                       response->set_eval(eval);
-                       response->set_value(value);
+                       FillValue(eval, response->mutable_eval());
+                       if (entry->depth() > DEPTH_NONE) {
+                               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,20 +133,37 @@ 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()
-{
-       std::string server_address("0.0.0.0:50051");
-       HashProbeImpl service;
 
+class HashProbeThread {
+public:
+       HashProbeThread(const std::string &server_address) {
+               builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
+               builder.RegisterService(&service);
+               server = std::move(builder.BuildAndStart());
+               std::cout << "Server listening on " << server_address << std::endl;
+               std::thread([this]{ server->Wait(); }).detach();
+       }
+
+       void Shutdown() {
+               server->Shutdown();
+       }
+
+private:
+       HashProbeImpl service;
        ServerBuilder builder;
-       builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
-       builder.RegisterService(&service);
-       std::unique_ptr<Server> server(builder.BuildAndStart());
-       std::cout << "Server listening on " << server_address << std::endl;
-       server->Wait();
-}
+       std::unique_ptr<Server> server;
+};
 
 namespace PSQT {
   void init();
@@ -162,7 +183,7 @@ int main(int argc, char* argv[]) {
   Threads.set(Options["Threads"]);
   Search::clear(); // After threads are up
 
-  std::thread(&rpc_thread).detach();
+  HashProbeThread thr("0.0.0.0:50051");
 
   UCI::loop(argc, argv);