Merge #684

featurecat · Sep 28, 2020 · b2221b1 · b2221b1
2 parents 6392c6b + 93f2813
commit b2221b1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git a/src/main/java/featurecat/lizzie/analysis/Leelaz.java b/src/main/java/featurecat/lizzie/analysis/Leelaz.java
@@ -739,7 +739,6 @@ public boolean isPondering() {
 
   public class WinrateStats {
     public double maxWinrate;
-    public double maxScoreMean;
     public int totalPlayouts;
 
     public WinrateStats(double maxWinrate, int totalPlayouts) {
@@ -767,9 +766,6 @@ public WinrateStats getWinrateStats() {
       stats.totalPlayouts = totalPlayouts;
 
       stats.maxWinrate = BoardData.getWinrateFromBestMoves(moves);
-      if (isKataGo) {
-        stats.maxScoreMean = BoardData.getScoreMeanFromBestMoves(moves);
-      }
     }
 
     return stats;

diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java
@@ -910,7 +910,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
-    double curSM = stats.maxScoreMean; // mean score on this move
     boolean validWinrate = (stats.totalPlayouts > 0); // and whether it was actually calculated
     if (!validWinrate) {
       curWR = Lizzie.board.getHistory().getData().winrate;
@@ -924,13 +923,11 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
     if (!validWinrate) {
       curWR = 100 - lastWR; // display last move's winrate for now (with color difference)
     }
-    double whiteWR, blackWR, blackSM;
+    double whiteWR, blackWR;
     if (Lizzie.board.getData().blackToPlay) {
       blackWR = curWR;
-      blackSM = curSM;
     } else {
       blackWR = 100 - curWR;
-      blackSM = -curSM;
     }
 
     whiteWR = 100 - blackWR;
@@ -1044,14 +1041,6 @@ private void drawMoveStatistics(Graphics2D g, int posX, int posY, int width, int
           winString,
           barPosxB + maxBarwidth - sw - 2 * strokeRadius,
           posY + barHeight - 2 * strokeRadius);
-      if (Lizzie.leelaz.isKataGo) {
-        String scoreString = String.format("%.1f", blackSM);
-        sw = g.getFontMetrics().stringWidth(scoreString);
-        g.drawString(
-            scoreString,
-            barPosxB + maxBarwidth / 2 - sw / 2 - strokeRadius,
-            posY + barHeight - 2 * strokeRadius);
-      }
 
       g.setColor(Color.GRAY);
       Stroke oldstroke = g.getStroke();

diff --git a/src/main/java/featurecat/lizzie/rules/Board.java b/src/main/java/featurecat/lizzie/rules/Board.java
@@ -1468,9 +1468,6 @@ public void updateWinrate() {
     Leelaz.WinrateStats stats = Lizzie.leelaz.getWinrateStats();
     if (stats.maxWinrate >= 0 && stats.totalPlayouts > history.getData().getPlayouts()) {
       history.getData().winrate = stats.maxWinrate;
-      if (Lizzie.leelaz.isKataGo) {
-        history.getData().scoreMean = stats.maxScoreMean;
-      }
       // we won't set playouts here. but setting winrate is ok... it shows the user that we are
       // computing. i think its fine.
     }