Disable "Avoid Keep Variations" if it is 0 (ref. featurecat#772)

kaorahi · Oct 10, 2020 · 9cd6baf · 9cd6baf
1 parent 29507eb
commit 9cd6baf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/featurecat/lizzie/Config.java b/src/main/java/featurecat/lizzie/Config.java
@@ -449,6 +449,10 @@ public boolean showBranchNow() {
     return showBranch || showBestMovesTemporarily;
   }
 
+  public boolean useAvoidInAnalysis() {
+    return config.getJSONObject("leelaz").getInt("avoid-keep-variations") > 0;
+  }
+
   /**
    * Scans the current directory as well as the current PATH to find a reasonable default leelaz
    * binary.

diff --git a/src/main/java/featurecat/lizzie/analysis/Leelaz.java b/src/main/java/featurecat/lizzie/analysis/Leelaz.java
@@ -726,7 +726,10 @@ public void analyzeAvoid(String parameters) {
   public void ponder() {
     isPondering = true;
     startPonderTime = System.currentTimeMillis();
-    if (Lizzie.board.isAvoding && Lizzie.board.isKeepingAvoid && !isKataGo)
+    if (Lizzie.board.isAvoding
+        && Lizzie.board.isKeepingAvoid
+        && !isKataGo
+        && Lizzie.config.useAvoidInAnalysis())
       analyzeAvoid(
           "avoid b "
               + Lizzie.board.avoidCoords

diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java
@@ -1521,6 +1521,9 @@ public boolean openRightClickMenu(int x, int y) {
     if (isPlayingAgainstLeelaz) {
       return false;
     }
+    if (!Lizzie.config.useAvoidInAnalysis()) {
+      return false;
+    }
     if (Lizzie.leelaz.isPondering()) {
       Lizzie.leelaz.sendCommand("name");
     }

diff --git a/src/main/java/featurecat/lizzie/gui/LizzieMain.java b/src/main/java/featurecat/lizzie/gui/LizzieMain.java
@@ -738,6 +738,9 @@ public boolean openRightClickMenu(int x, int y) {
     if (isPlayingAgainstLeelaz) {
       return false;
     }
+    if (!Lizzie.config.useAvoidInAnalysis()) {
+      return false;
+    }
     if (Lizzie.leelaz.isPondering()) {
       Lizzie.leelaz.sendCommand("name");
     }