fix counting regression

Author: h908714124

src/main/java/com/bernd/LobbyController.java

@@ -90,6 +90,17 @@ private static int[][] createEmptyBoard(MatchRequest request) {
     for (int y = 0; y < dim; y++) {
       board[y] = new int[dim];
     }
+//    board = new int[][]{
+//        new int[]{0, 0, 0, 0, W, B, 0, 0, 0},
+//        new int[]{0, 0, 0, 0, W, B, 0, 0, 0},
+//        new int[]{0, 0, W, W, W, B, 0, 0, 0},
+//        new int[]{0, 0, W, B, B, B, 0, B, B},
+//        new int[]{W, 0, W, B, B, 0, B, W, W},
+//        new int[]{B, W, W, B, 0, B, W, W, 0},
+//        new int[]{B, B, B, B, W, B, W, 0, 0},
+//        new int[]{0, 0, 0, B, B, W, W, 0, 0},
+//        new int[]{0, 0, 0, B, W, W, W, 0, 0},
+//    };
     return board;
   }
 }

src/main/java/com/bernd/util/Util.java

@@ -33,7 +33,7 @@ public static String boardToString(int[][] board) {
   }
 
   public static boolean isEmpty(int color) {
-    return color == 0 || (color & REMOVED_B) != 0 || (color & REMOVED_W) != 0;
+    return (color & COLORS) == 0;
   }
 
   public static int unremove(int color) {
@@ -57,10 +57,16 @@ public static int toggleRemoved(int color) {
   }
 
   public static int getBaseColor(int color) {
-    if ((color & (B | TERRITORY_B | REMOVED_B)) != 0) {
+    if ((color & (B | REMOVED_B)) != 0) {
       return B;
     }
-    if ((color & (W | TERRITORY_W | REMOVED_W)) != 0) {
+    if ((color & (W | REMOVED_W)) != 0) {
+      return W;
+    }
+    if ((color & TERRITORY_B) != 0) {
+      return B;
+    }
+    if ((color & TERRITORY_W) != 0) {
       return W;
     }
     return 0;
@@ -81,6 +87,6 @@ public static int divUp(int i, int div) {
   }
 
   public static boolean isStone(int color) {
-    return (color & COLORS) != 0 && (color & MARKERS) == 0;
+    return (color & COLORS) != 0;
   }
 }

src/test/java/com/bernd/game/CountTest.java

@@ -190,7 +190,7 @@ void testNoBufferOverflow() {
 
   @Test
   void testCornerEyeCount() {
-    int b =  REMOVED_B;
+    int b = REMOVED_B;
     int w = TERRITORY_W;
     int k = TERRITORY_W | REMOVED_B;
     int t = TERRITORY_B;
@@ -270,6 +270,47 @@ void testCountAgain() {
     }, counted);
   }
 
+  @Test
+  void testTerritoryBorderRemoved() {
+    int b = TERRITORY_B;
+    int k = REMOVED_B;
+    int[][] position = new int[][]{
+        new int[]{W, B, b, b, b},
+        new int[]{W, B, b, b, b},
+        new int[]{W, B, b, b, b},
+        new int[]{B, B, b, k, k},
+        new int[]{B, b, B, W, W},
+    };
+    int[][] counted = Count.count(position);
+    assertArrayEquals(new int[][]{
+        new int[]{W, B, 0, 0, 0},
+        new int[]{W, B, 0, 0, 0},
+        new int[]{W, B, 0, 0, 0},
+        new int[]{B, B, 0, k, k},
+        new int[]{B, b, B, W, W},
+    }, counted);
+  }
+
+  @Test
+  void testResurrect() {
+    int b = TERRITORY_B;
+    int w = TERRITORY_B | REMOVED_W;
+    int k = REMOVED_B;
+    int[][] position = new int[][]{
+        new int[]{B, b, B, w},
+        new int[]{b, k, w, w},
+        new int[]{w, k, w, b},
+        new int[]{B, w, w, b}
+    };
+    int[][] counted = Count.count(position);
+    assertArrayEquals(new int[][]{
+        new int[]{B, b, B, w},
+        new int[]{b, B, w, w},
+        new int[]{w, B, w, b},
+        new int[]{B, w, w, b}
+    }, counted);
+  }
+
   static int[][] createEmptyBoard(int dim) {
     int[][] board = new int[dim][];
     for (int y = 0; y < dim; y++) {