Show score in winrate graph even when pondering is off (ref. featurec…

…at#730, featurecat#808)
kaorahi · Nov 8, 2020 · 277a790 · 277a790
1 parent acdb8a8
commit 277a790
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java
@@ -911,7 +911,6 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
     Leelaz.WinrateStats stats = Lizzie.leelaz.getWinrateStats();
     double curWR = stats.maxWinrate; // winrate on this move
     boolean validWinrate = (stats.totalPlayouts > 0); // and whether it was actually calculated
-    boolean validScore = validWinrate;
     if (!validWinrate) {
       curWR = Lizzie.board.getHistory().getData().winrate;
       validWinrate = Lizzie.board.getHistory().getData().getPlayouts() > 0;
@@ -965,8 +964,11 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
     setPanelFont(g, (int) (min(width, height) * 0.2));
 
     String text = "";
+    MoveData bestMove = Utils.getBestMove();
+    boolean validScore = (bestMove != null);
     if (Lizzie.leelaz.isKataGo && validScore) {
-      double score = Lizzie.leelaz.scoreMean;
+      double score = bestMove.scoreMean;
+      double stdev = bestMove.scoreStdev;
       if (Lizzie.board.getHistory().isBlacksTurn()) {
         if (Lizzie.config.showKataGoBoardScoreMean) {
           score = score + Lizzie.board.getHistory().getGameInfo().getKomi();
@@ -988,7 +990,7 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
           text
               + resourceBundle.getString("LizzieFrame.katago.scoreStdev")
               + ": "
-              + String.format("%.1f", Lizzie.leelaz.scoreStdev)
+              + String.format("%.1f", stdev)
               + " ";
     }
     // Last move

diff --git a/src/main/java/featurecat/lizzie/gui/WinratePane.java b/src/main/java/featurecat/lizzie/gui/WinratePane.java
@@ -5,7 +5,9 @@
 
 import featurecat.lizzie.Lizzie;
 import featurecat.lizzie.analysis.Leelaz;
+import featurecat.lizzie.analysis.MoveData;
 import featurecat.lizzie.rules.BoardData;
+import featurecat.lizzie.util.Utils;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
@@ -135,7 +137,6 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
       curWR = Lizzie.board.getHistory().getData().winrate;
       validWinrate = Lizzie.board.getHistory().getData().getPlayouts() > 0;
     }
-    boolean validScore = validWinrate;
     if (Lizzie.frame.isPlayingAgainstLeelaz
         && Lizzie.frame.playerIsBlack == !Lizzie.board.getHistory().getData().blackToPlay) {
       validWinrate = false;
@@ -185,8 +186,11 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
     setPanelFont(g, (int) (min(width, height) * 0.2));
 
     String text = "";
+    MoveData bestMove = Utils.getBestMove();
+    boolean validScore = (bestMove != null);
     if (Lizzie.leelaz.isKataGo && validScore) {
-      double score = Lizzie.leelaz.scoreMean;
+      double score = bestMove.scoreMean;
+      double stdev = bestMove.scoreStdev;
       if (Lizzie.board.getHistory().isBlacksTurn()) {
         if (Lizzie.config.showKataGoBoardScoreMean) {
           score = score + Lizzie.board.getHistory().getGameInfo().getKomi();
@@ -208,7 +212,7 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
           text
               + LizzieMain.resourceBundle.getString("LizzieFrame.katago.scoreStdev")
               + ":"
-              + String.format("%.1f", Lizzie.leelaz.scoreStdev)
+              + String.format("%.1f", stdev)
               + " ";
     }
     // Last move

diff --git a/src/main/java/featurecat/lizzie/util/Utils.java b/src/main/java/featurecat/lizzie/util/Utils.java
@@ -4,6 +4,7 @@
 
 import featurecat.lizzie.Lizzie;
 import featurecat.lizzie.analysis.Leelaz;
+import featurecat.lizzie.analysis.MoveData;
 import featurecat.lizzie.gui.BoardRenderer;
 import featurecat.lizzie.rules.BoardData;
 import featurecat.lizzie.rules.BoardHistoryNode;
@@ -180,6 +181,11 @@ public static double actualScoreMean(double scoreMean) {
     return score;
   }
 
+  public static MoveData getBestMove() {
+    List<MoveData> bestMoves = Lizzie.board.getHistory().getData().bestMoves;
+    return (bestMoves.size() > 0) ? bestMoves.get(0) : null;
+  }
+
   public static Integer txtFieldValue(JTextField txt) {
     if (txt.getText().trim().isEmpty()
         || txt.getText().trim().length() >= String.valueOf(Integer.MAX_VALUE).length()) {