Option to report mcts triple ko prob in gtp and analysis

Author: lightvector

cpp/command/analysis.cpp

@@ -35,6 +35,7 @@ struct AnalyzeRequest {
   bool includeMovesOwnershipStdev;
   bool includePolicy;
   bool includePVVisits;
+  bool includeNoResultValue;
 
   bool reportDuringSearch;
   double reportDuringSearchEvery;
@@ -238,6 +239,7 @@ int MainCmds::analysis(const vector<string>& args) {
     "includeOwnershipStdev",
     "includePolicy",
     "includePVVisits",
+    "includeNoResultValue",
     "reportDuringSearchEvery",
     "firstReportDuringSearchAfter",
     "priority",
@@ -323,6 +325,7 @@ int MainCmds::analysis(const vector<string>& args) {
       request->includeOwnership,request->includeOwnershipStdev,
       request->includeMovesOwnership,request->includeMovesOwnershipStdev,
       request->includePVVisits,
+      request->includeNoResultValue,
       ret
     );
 
@@ -618,6 +621,7 @@ int MainCmds::analysis(const vector<string>& args) {
       rbase.includeMovesOwnershipStdev = false;
       rbase.includePolicy = false;
       rbase.includePVVisits = false;
+      rbase.includeNoResultValue = false;
       rbase.reportDuringSearch = false;
       rbase.reportDuringSearchEvery = 1e30;
       rbase.firstReportDuringSearchAfter = 1e30;
@@ -1027,6 +1031,11 @@ int MainCmds::analysis(const vector<string>& args) {
         if(!suc)
           continue;
       }
+      if(input.find("includeNoResultValue") != input.end()) {
+        bool suc = parseBoolean(input, "includeNoResultValue", rbase.includeNoResultValue, "Must be a boolean");
+        if(!suc)
+          continue;
+      }
       if(input.find("reportDuringSearchEvery") != input.end()) {
         bool suc = parseDouble(input, "reportDuringSearchEvery", rbase.reportDuringSearchEvery, 0.001, 1000000.0, "Must be number of seconds from 0.001 to 1000000.0");
         if(!suc)
@@ -1171,6 +1180,7 @@ int MainCmds::analysis(const vector<string>& args) {
           newRequest->includeMovesOwnershipStdev = rbase.includeMovesOwnershipStdev;
           newRequest->includePolicy = rbase.includePolicy;
           newRequest->includePVVisits = rbase.includePVVisits;
+          newRequest->includeNoResultValue = rbase.includeNoResultValue;
           newRequest->reportDuringSearch = rbase.reportDuringSearch;
           newRequest->reportDuringSearchEvery = rbase.reportDuringSearchEvery;
           newRequest->firstReportDuringSearchAfter = rbase.firstReportDuringSearchAfter;

cpp/command/contribute.cpp

@@ -273,7 +273,7 @@ static void runAndUploadSingleGame(
 
       // Usual analysis response fields
       ret["turnNumber"] = hist.moveHistory.size();
-      search->getAnalysisJson(perspective,analysisPVLen,preventEncore,true,alwaysIncludeOwnership,false,false,false,false,ret);
+      search->getAnalysisJson(perspective,analysisPVLen,preventEncore,true,alwaysIncludeOwnership,false,false,false,false,false,ret);
       std::cout << ret.dump() + "\n" << std::flush; // no endl due to race conditions
     }
 

cpp/command/evalsgf.cpp

@@ -642,6 +642,7 @@ int MainCmds::evalsgf(const vector<string>& args) {
       bool includeMovesOwnershipStdev = false;
       bool includePVVisits = true;
       nlohmann::json ret;
+      bool includeNoResultValue = false;
       bool suc = search->getAnalysisJson(
         perspective,
         analysisPVLen,
@@ -652,6 +653,7 @@ int MainCmds::evalsgf(const vector<string>& args) {
         includeMovesOwnership,
         includeMovesOwnershipStdev,
         includePVVisits,
+        includeNoResultValue,
         ret
       );
       if(suc) {

cpp/command/gtp.cpp

@@ -734,6 +734,7 @@ struct GTPEngine {
     bool showMovesOwnershipStdev = false;
     bool showPVVisits = false;
     bool showPVEdgeVisits = false;
+    bool showNoResultValue = false;
     double secondsPerReport = TimeControls::UNLIMITED_TIME_DEFAULT;
     vector<int> avoidMoveUntilByLocBlack;
     vector<int> avoidMoveUntilByLocWhite;
@@ -875,6 +876,8 @@ struct GTPEngine {
           out << " scoreStdev " << data.scoreStdev;
           out << " scoreLead " << lead;
           out << " scoreSelfplay " << scoreMean;
+          if(args.showNoResultValue)
+            out << " noResultValue " << data.noResultValue;
           out << " prior " << data.policyPrior;
           out << " lcb " << lcb;
           out << " utilityLcb " << utilityLcb;
@@ -1712,6 +1715,7 @@ static GTPEngine::AnalyzeArgs parseAnalyzeCommand(
   bool showMovesOwnershipStdev = false;
   bool showPVVisits = false;
   bool showPVEdgeVisits = false;
+  bool showNoResultValue = false;
   vector<int> avoidMoveUntilByLocBlack;
   vector<int> avoidMoveUntilByLocWhite;
   bool gotAvoidMovesBlack = false;
@@ -1852,6 +1856,9 @@ static GTPEngine::AnalyzeArgs parseAnalyzeCommand(
     else if(isKata && key == "pvEdgeVisits" && Global::tryStringToBool(value,showPVEdgeVisits)) {
       continue;
     }
+    else if(isKata && key == "noResultValue" && Global::tryStringToBool(value,showNoResultValue)) {
+      continue;
+    }
 
     parseFailed = true;
     break;
@@ -1872,6 +1879,7 @@ static GTPEngine::AnalyzeArgs parseAnalyzeCommand(
   args.showMovesOwnershipStdev = showMovesOwnershipStdev;
   args.showPVVisits = showPVVisits;
   args.showPVEdgeVisits = showPVEdgeVisits;
+  args.showNoResultValue = showNoResultValue;
   args.avoidMoveUntilByLocBlack = avoidMoveUntilByLocBlack;
   args.avoidMoveUntilByLocWhite = avoidMoveUntilByLocWhite;
   return args;

cpp/runcmdtests.sh

@@ -24,7 +24,7 @@ echo -e 'genmove_debug b\ngenmove_debug w\ngenmove_debug b' | ./katago gtp -conf
 echo tests/results/gtp/nologconfig
 echo -e 'genmove_debug b\ngenmove_debug w\ngenmove_debug b' | ./katago gtp -config configs/gtp_example.cfg -model tests/models/g170-b6c96-s175395328-d26788732.bin.gz -override-config "logFile=tests/results/gtp/nologconfig.log, logConfigContents=false, logDir=, logTimeStamp=false, maxVisits=100, maxPlayouts=10000, numSearchThreads=1, nnRandomize=false, nnRandSeed=forTesting, searchRandSeed=forTesting, forDeterministicTesting=true, cudaUseFP16 = false, trtUseFP16 = false, openclUseFP16 = false, cudaUseNHWC = false" 1> tests/results/gtp/nologconfig.stdout 2> tests/results/gtp/nologconfig.stderr
 echo tests/results/gtp/genmoveanalyze
-echo -e 'kata-genmove_analyze b\nkomi 5\nkata-genmove_analyze w rootInfo true\nkata-genmove_analyze b rootInfo true' | ./katago gtp -config configs/gtp_example.cfg -model models/b18c384nbt-uec.bin.gz -override-config "logFile=tests/results/gtp/genmoveanalyze.log, logConfigContents=false, logDir=, logTimeStamp=false, maxVisits=30, maxPlayouts=10000, numSearchThreads=1, nnRandomize=false, nnRandSeed=forTesting, searchRandSeed=forTesting, forDeterministicTesting=true, cudaUseFP16 = false, trtUseFP16 = false, openclUseFP16 = false, cudaUseNHWC = false, defaultBoardSize = 9" 1> tests/results/gtp/genmoveanalyze.stdout 2> tests/results/gtp/genmoveanalyze.stderr
+echo -e 'kata-genmove_analyze b\nkomi 5\nkata-genmove_analyze w rootInfo true\nkata-genmove_analyze b rootInfo true noResultValue true' | ./katago gtp -config configs/gtp_example.cfg -model models/b18c384nbt-uec.bin.gz -override-config "logFile=tests/results/gtp/genmoveanalyze.log, logConfigContents=false, logDir=, logTimeStamp=false, maxVisits=30, maxPlayouts=10000, numSearchThreads=1, nnRandomize=false, nnRandSeed=forTesting, searchRandSeed=forTesting, forDeterministicTesting=true, cudaUseFP16 = false, trtUseFP16 = false, openclUseFP16 = false, cudaUseNHWC = false, defaultBoardSize = 9" 1> tests/results/gtp/genmoveanalyze.stdout 2> tests/results/gtp/genmoveanalyze.stderr
 echo tests/results/gtp/searchcancellable
 echo -e 'kata-search_analyze b\nkata-genmove_analyze b\nkomi 5\nkata-search_analyze_cancellable w rootInfo true\nkata-search_cancellable w' | ./katago gtp -config configs/gtp_example.cfg -model models/b18c384nbt-uec.bin.gz -override-config "logFile=tests/results/gtp/searchcancellable.log, logConfigContents=false, logDir=, logTimeStamp=false, maxVisits=500, maxPlayouts=10000, numSearchThreads=1, nnRandomize=false, nnRandSeed=forTesting, searchRandSeed=forTesting, forDeterministicTesting=true, cudaUseFP16 = false, trtUseFP16 = false, openclUseFP16 = false, cudaUseNHWC = false, defaultBoardSize = 9" 1> tests/results/gtp/searchcancellable.stdout 2> tests/results/gtp/searchcancellable.stderr
 echo tests/results/gtp/humansl

cpp/search/analysisdata.cpp

@@ -10,6 +10,7 @@ AnalysisData::AnalysisData()
    resultUtility(0.0),
    scoreUtility(0.0),
    winLossValue(0.0),
+   noResultValue(0.0),
    policyPrior(0.0),
    scoreMean(0.0),
    scoreStdev(0.0),
@@ -41,6 +42,7 @@ AnalysisData::AnalysisData(const AnalysisData& other)
    resultUtility(other.resultUtility),
    scoreUtility(other.scoreUtility),
    winLossValue(other.winLossValue),
+   noResultValue(other.noResultValue),
    policyPrior(other.policyPrior),
    scoreMean(other.scoreMean),
    scoreStdev(other.scoreStdev),
@@ -72,6 +74,7 @@ AnalysisData::AnalysisData(AnalysisData&& other) noexcept
    resultUtility(other.resultUtility),
    scoreUtility(other.scoreUtility),
    winLossValue(other.winLossValue),
+   noResultValue(other.noResultValue),
    policyPrior(other.policyPrior),
    scoreMean(other.scoreMean),
    scoreStdev(other.scoreStdev),
@@ -108,6 +111,7 @@ AnalysisData& AnalysisData::operator=(const AnalysisData& other) {
   resultUtility = other.resultUtility;
   scoreUtility = other.scoreUtility;
   winLossValue = other.winLossValue;
+  noResultValue = other.noResultValue;
   policyPrior = other.policyPrior;
   scoreMean = other.scoreMean;
   scoreStdev = other.scoreStdev;
@@ -142,6 +146,7 @@ AnalysisData& AnalysisData::operator=(AnalysisData&& other) noexcept {
   resultUtility = other.resultUtility;
   scoreUtility = other.scoreUtility;
   winLossValue = other.winLossValue;
+  noResultValue = other.noResultValue;
   policyPrior = other.policyPrior;
   scoreMean = other.scoreMean;
   scoreStdev = other.scoreStdev;

cpp/search/analysisdata.h

@@ -17,6 +17,7 @@ struct AnalysisData {
   double resultUtility; //Utility from winloss result
   double scoreUtility; //Utility from score. Summing with resultUtility gives utility.
   double winLossValue; //From -1 to 1
+  double noResultValue; //From 0 to 1
   double policyPrior; //From 0 to 1
   double scoreMean; //In units of points
   double scoreStdev; //In units of points

cpp/search/search.h

@@ -407,6 +407,7 @@ struct Search {
     const Player perspective,
     int analysisPVLen, bool preventEncore, bool includePolicy,
     bool includeOwnership, bool includeOwnershipStdev, bool includeMovesOwnership, bool includeMovesOwnershipStdev, bool includePVVisits,
+    bool includeNoResultValue,
     nlohmann::json& ret
   ) const;
 

cpp/search/searchresults.cpp

@@ -919,6 +919,7 @@ AnalysisData Search::getAnalysisDataOfSingleChild(
     data.scoreUtility = getScoreUtility(parentScoreMean,parentScoreMean*parentScoreMean+parentScoreStdev*parentScoreStdev);
     data.resultUtility = fpuValue - data.scoreUtility;
     data.winLossValue = searchParams.winLossUtilityFactor == 1.0 ? parentWinLossValue + (fpuValue - parentUtility) : 0.0;
+    data.noResultValue = 0.0;
     // Make sure winloss values due to FPU don't go out of bounds for purposes of reporting to UI
     if(data.winLossValue < -1.0)
       data.winLossValue = -1.0;
@@ -940,6 +941,7 @@ AnalysisData Search::getAnalysisDataOfSingleChild(
     data.resultUtility = getResultUtility(winLossValueAvg, noResultValueAvg);
     data.scoreUtility = getScoreUtility(scoreMeanAvg, scoreMeanSqAvg);
     data.winLossValue = winLossValueAvg;
+    data.noResultValue = noResultValueAvg;
     data.scoreMean = scoreMeanAvg;
     data.scoreStdev = ScoreValue::getScoreStdev(scoreMeanAvg,scoreMeanSqAvg);
     data.lead = leadAvg;
@@ -1998,6 +2000,7 @@ bool Search::getAnalysisJson(
   bool includeMovesOwnership,
   bool includeMovesOwnershipStdev,
   bool includePVVisits,
+  bool includeNoResultValue,
   json& ret
 ) const {
   vector<AnalysisData> buf;
@@ -2047,6 +2050,8 @@ bool Search::getAnalysisJson(
     moveInfo["scoreSelfplay"] = Global::roundDynamic(scoreMean,OUTPUT_PRECISION);
     moveInfo["scoreLead"] = Global::roundDynamic(lead,OUTPUT_PRECISION);
     moveInfo["scoreStdev"] = Global::roundDynamic(data.scoreStdev,OUTPUT_PRECISION);
+    if(includeNoResultValue)
+      moveInfo["noResultValue"] = Global::roundDynamic(data.noResultValue,OUTPUT_PRECISION);
     moveInfo["prior"] = Global::roundDynamic(data.policyPrior,OUTPUT_PRECISION);
     if(humanOutput != NULL)
       moveInfo["humanPrior"] = Global::roundDynamic(std::max(0.0,(double)humanOutput->policyProbs[getPos(data.move)]),OUTPUT_PRECISION);

cpp/tests/analysis/basic.txt

@@ -2,4 +2,5 @@
 {"id":"foo","initialStones":[],"moves":[["W","C5"],["B","C6"]],"rules":"tromp-taylor","komi":4,"boardXSize":7,"boardYSize":7,"overrideSettings":{"maxVisits":10},"includeOwnership":true,"includePolicy":true}
 {"id":"foo","initialStones":[],"moves":[["W","C5"],["B","C6"],["W","C7"]],"rules":"tromp-taylor","komi":4,"boardXSize":7,"boardYSize":7,"overrideSettings":{"maxVisits":10},"includeOwnership":true,"includePolicy":true}
 {"id":"foo","initialStones":[],"moves":[["W","C5"],["B","C6"],["W","C7"]],"rules":"tromp-taylor","komi":4,"boardXSize":7,"boardYSize":7,"overrideSettings":{"maxVisits":20},"includeOwnership":true,"includeOwnershipStdev":true,"includePolicy":true}
+{"id":"foo","initialStones":[],"moves":[["B","E5"],["W","E3"],["B","F7"],["W","C6"],["B","D4"],["W","G4"],["B","D3"],["W","D7"],["B","H5"],["W","D2"],["B","B5"],["W","F6"],["B","F5"],["W","E6"],["B","G6"],["W","G7"],["B","C2"],["W","E2"],["B","G8"],["W","H7"],["B","E8"],["W","E7"],["B","F8"],["W","H8"],["B","G5"],["W","H3"],["B","D8"],["W","C8"],["B","H9"],["W","D9"],["B","J7"],["W","G9"],["B","F9"],["W","J6"],["B","H6"],["W","J8"],["B","J5"],["W","C9"],["B","J7"],["W","C5"],["B","B4"],["W","J6"],["B","H2"],["W","J2"],["B","G2"],["W","G3"],["B","J7"],["W","B6"],["B","H1"],["W","B2"],["B","C3"],["W","C1"],["B","B1"],["W","A1"],["B","B3"],["W","F4"],["B","J3"],["W","J4"],["B","F2"],["W","F1"],["B","E4"],["W","F3"],["B","H4"],["W","J3"],["B","D1"],["W","G1"],["B","E1"],["W","F1"],["B","D1"],["W","G1"],["B","E1"],["W","F1"]],"rules":"japanese","komi":6,"boardXSize":9,"boardYSize":9,"overrideSettings":{"maxVisits":5},"includeNoResultValue":true}