Pr700 pr750

src/chess/callbacks.h

@@ -69,6 +69,8 @@ struct ThinkingInfo {
   int hashfull = -1;
   // Win in centipawns.
   optional<int> score;
+  // Distance to mate.
+  optional<int> mate;
   // Number of successful TB probes (not the same as playouts ending in TB hit).
   int tb_hits = -1;
   // Best line found. Moves are from perspective of white player.

src/chess/position.h

@@ -82,6 +82,13 @@ class Position {
 };
 
 enum class GameResult { UNDECIDED, WHITE_WON, DRAW, BLACK_WON };
+enum class CertaintyTrigger { NONE, TB_HIT, TWO_FOLD, TERMINAL, NORMAL };
+
+struct CertaintyResult {
+public:
+	GameResult gameResult;
+	CertaintyTrigger trigger;
+};
 
 class PositionHistory {
  public:

src/chess/uciloop.cc

@@ -247,7 +247,13 @@ void UciLoop::SendInfo(const std::vector<ThinkingInfo>& infos) {
     if (info.seldepth >= 0) res += " seldepth " + std::to_string(info.seldepth);
     if (info.time >= 0) res += " time " + std::to_string(info.time);
     if (info.nodes >= 0) res += " nodes " + std::to_string(info.nodes);
-    if (info.score) res += " score cp " + std::to_string(*info.score);
+
+    // If mate display mate, otherwise if score display score.
+    if (info.mate) {
+      res += " score mate " + std::to_string(*info.mate);
+    } else if (info.score) {
+      res += " score cp " + std::to_string(*info.score);
+    }
     if (info.hashfull >= 0) res += " hashfull " + std::to_string(info.hashfull);
     if (info.nps >= 0) res += " nps " + std::to_string(info.nps);
     if (info.tb_hits >= 0) res += " tbhits " + std::to_string(info.tb_hits);

src/engine.cc

@@ -350,6 +350,7 @@ void EngineController::Go(const GoParams& params) {
           if (info.multipv <= 1) {
             ponder_info = info;
             if (ponder_info.score) ponder_info.score = -*ponder_info.score;
+            if (ponder_info.mate) ponder_info.mate = -*ponder_info.mate;
             if (ponder_info.depth > 1) ponder_info.depth--;
             if (ponder_info.seldepth > 1) ponder_info.seldepth--;
             ponder_info.pv.clear();

src/mcts/node.cc

@@ -28,6 +28,7 @@
 #include "mcts/node.h"
 
 #include <algorithm>
+#include <bitset>
 #include <cassert>
 #include <cmath>
 #include <cstring>
@@ -160,9 +161,58 @@ float Edge::GetP() const {
   return ret;
 }
 
+void Edge::MakeTerminal(GameResult result) {
+  certainty_state_ |= kTerminalMask | kCertainMask | kUpperBound | kLowerBound;
+  certainty_state_ &= kGameResultClear;
+  if (result == GameResult::WHITE_WON) {
+    certainty_state_ |= kGameResultWin;
+  } else if (result == GameResult::BLACK_WON) {
+    certainty_state_ |= kGameResultLoss;
+  }
+}
+
+void Edge::MakeCertain(CertaintyResult certaintyresult) {
+  certainty_state_ |= kCertainMask | kUpperBound | kLowerBound;
+  certainty_state_ &= kGameResultClear;
+  if (certaintyresult.gameResult == GameResult::WHITE_WON) {
+    certainty_state_ |= kGameResultWin;
+  } else if (certaintyresult.gameResult == GameResult::BLACK_WON) {
+    certainty_state_ |= kGameResultLoss;
+  }
+  if (certaintyresult.trigger == CertaintyTrigger::TB_HIT) certainty_state_ |= kTBHit;
+  if (certaintyresult.trigger == CertaintyTrigger::TWO_FOLD) certainty_state_ |= kTwoFold;
+}
+
+void Edge::MakeCertain(int q, CertaintyTrigger trigger) {
+  certainty_state_ |= kCertainMask | kUpperBound | kLowerBound;
+  certainty_state_ &= kGameResultClear;
+  if (q == 1) {
+    certainty_state_ |= kGameResultWin;
+  } else if (q == -1) {
+    certainty_state_ |= kGameResultLoss;
+  }
+  if (trigger == CertaintyTrigger::TB_HIT) certainty_state_ |= kTBHit;
+  if (trigger == CertaintyTrigger::TWO_FOLD) certainty_state_ |= kTwoFold;
+}
+void Edge::SetEQ(int eq) {
+  certainty_state_ &= kGameResultClear;
+  if (eq == 1) {
+    certainty_state_ |= kGameResultWin;
+  } else if (eq == -1) {
+    certainty_state_ |= kGameResultLoss;
+  }
+}
+
+int Edge::GetEQ() const {
+  if (certainty_state_ & kGameResultLoss) return -1;
+  if (certainty_state_ & kGameResultWin) return 1;
+  return 0;
+}
+
 std::string Edge::DebugString() const {
   std::ostringstream oss;
-  oss << "Move: " << move_.as_string() << " p_: " << p_ << " GetP: " << GetP();
+  oss << "Move: " << move_.as_string() << " p_: " << p_ << " GetP: " << GetP()
+      << " Certainty:" << std::bitset<8>(certainty_state_);
   return oss.str();
 }
 
@@ -197,39 +247,51 @@ void Node::CreateEdges(const MoveList& moves) {
 Node::ConstIterator Node::Edges() const { return {edges_, &child_}; }
 Node::Iterator Node::Edges() { return {edges_, &child_}; }
 
+void Node::RecomputeNfromChildren() {
+  if (n_ > 1) {
+    uint32_t visits = 1;
+    for (const auto& child : Edges()) visits += child.GetN();
+    n_ = visits;
+  }
+  assert(n_in_flight_ == 0);
+}
+
 float Node::GetVisitedPolicy() const { return visited_policy_; }
 
+float Node::GetQ() const {
+  // Currently all certain edges have a corresponding node (PR700) and
+  // that nodes q_ is set correctly. If we later allow edges to become
+  // certain without creating the node (PR487 through look-ahead-search),
+  // we need to revisit this getter or adapt search.
+  // if (parent_) {
+  //   auto edge = parent_->GetEdgeToNode(this);
+  //   if (edge->IsCertain()) return (float)edge->GetEQ();
+  // }
+  return q_;
+}
+
 Edge* Node::GetEdgeToNode(const Node* node) const {
   assert(node->parent_ == this);
   assert(node->index_ < edges_.size());
   return &edges_[node->index_];
 }
 
-Edge* Node::GetOwnEdge() const { return GetParent()->GetEdgeToNode(this); }
+Edge* Node::GetOwnEdge() const {
+  if (GetParent()) {
+    return GetParent()->GetEdgeToNode(this);
+  } else
+    return nullptr;
+}
 
 std::string Node::DebugString() const {
   std::ostringstream oss;
-  oss << " Term:" << is_terminal_ << " This:" << this << " Parent:" << parent_
-      << " Index:" << index_ << " Child:" << child_.get()
-      << " Sibling:" << sibling_.get() << " Q:" << q_ << " N:" << n_
-      << " N_:" << n_in_flight_ << " Edges:" << edges_.size();
+  oss << " This:" << this << " Parent:" << parent_ << " Index:" << index_
+      << " Child:" << child_.get() << " Sibling:" << sibling_.get()
+      << " Q:" << q_ << " N:" << n_ << " N_:" << n_in_flight_
+      << " Edges:" << edges_.size();
   return oss.str();
 }
 
-void Node::MakeTerminal(GameResult result) {
-  is_terminal_ = true;
-  if (result == GameResult::DRAW) {
-    q_ = 0.0f;
-    d_ = 1.0f;
-  } else if (result == GameResult::WHITE_WON) {
-    q_ = 1.0f;
-    d_ = 0.0f;
-  } else if (result == GameResult::BLACK_WON) {
-    q_ = -1.0f;
-    d_ = 0.0f;
-  }
-}
-
 bool Node::TryStartScoreUpdate() {
   if (n_ == 0 && n_in_flight_ > 0) return false;
   ++n_in_flight_;
@@ -388,6 +450,13 @@ void NodeTree::MakeMove(Move move) {
   current_head_->ReleaseChildrenExceptOne(new_head);
   current_head_ =
       new_head ? new_head : current_head_->CreateSingleChildNode(move);
+  // If certain and no children, reset node (so that n_ =  0).
+  if (current_head_->IsCertain() && !current_head_->HasChildren())
+    TrimTreeAtHead();
+  // Clear certainty flag but keep bounds.
+  if (current_head_->GetParent())
+    current_head_->GetOwnEdge()->ClearCertaintyState();
+  current_head_->RecomputeNfromChildren();
   history_.Append(move);
 }
 
@@ -430,10 +499,19 @@ bool NodeTree::ResetToPosition(const std::string& starting_fen,
   // previously searched position, which means that the current_head_ might
   // retain old n_ and q_ (etc) data, even though its old children were
   // previously trimmed; we need to reset current_head_ in that case.
-  // Also, if the current_head_ is terminal, reset that as well to allow forced
-  // analysis of WDL hits, or possibly 3 fold or 50 move "draws", etc.
-  if (!seen_old_head || current_head_->IsTerminal()) TrimTreeAtHead();
-
+  // Also, if the current_head_ is certain and has no children, reset that
+  // as well to allow forced analysis of WDL hits, or possibly 2 or 3 fold
+  // or 50 move "draws", etc.
+  if (!seen_old_head ||
+      (current_head_->IsCertain() && !current_head_->HasChildren()))
+    TrimTreeAtHead();
+  // Certainty Propagation: No need to trim the head for certain nodes with
+  // children (these became certain through backpropagation), just resetting
+  // certainty state except bounds, and recomputing N suffices. TrimTreeAtHead
+  // sets n_ to 0 this remains 0 after RecomputeNfromChildren.
+  if (current_head_->GetParent())
+    current_head_->GetOwnEdge()->ClearCertaintyState();
+  current_head_->RecomputeNfromChildren();
   return seen_old_head;
 }