Add ratio minimum empty intersection and better ratio thresholds to unsettled stone clearer

anoek · anoek · commit c5d146edddcc · 2024-06-23T14:20:18.000-06:00
diff --git a/Makefile b/Makefile
@@ -41,9 +41,11 @@ publish push: publish_npm publish_docs upload_to_cdn notify
 
 beta: beta_npm upload_to_cdn
 
-beta_npm: build
+beta_npm: build publish-beta
+
+publish-beta:
+	make -C engine/ publish-beta
 	yarn publish --tag beta ./
-	cd engine; yarn publish --tag beta ./
 
 notify:
 	MSG=`git log -1 --pretty="%B" | sed s/\"//g | sed s/\'//g `; \
diff --git a/README.md b/README.md
@@ -16,10 +16,10 @@ To import into an application targeting the web:
 import { ... } from "goban";
 ```
 
-To import into an application targeting node:
+To import into an application targeting node, use the [goban-engine](https://www.npmjs.com/package/goban-engine) package:
 
 ```
-import { ... } from "goban/lib/engine";
+import { ... } from "goban-engine";
 ```
 
 # Documentation
diff --git a/engine/Makefile b/engine/Makefile
@@ -4,4 +4,4 @@ all:
 	@echo "To publish use make [publish|publish-beta]"
 
 publish-beta:
-	yarn publish --tag beta ./
+	yarn publish --no-git-tag-version --tag beta ./
diff --git a/engine/package.json b/engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "goban-engine",
-    "version": "0.8.1-beta.2",
+    "version": "0.8.1-beta.3",
     "description": "",
     "main": "goban-engine.js",
     "types": "goban-engine.d.ts",
diff --git a/src/engine/autoscore.ts b/src/engine/autoscore.ts
@@ -408,11 +408,16 @@ export function autoscore(
             let amount_of_territory = 0;
             let number_of_possible_eyes = 0; // could be false eyes, but we'll count them at this stage
             group.foreachNeighboringEmptyString((empty_intersections) => {
+                /*
                 const { x, y } = empty_intersections.intersections[0];
                 stage_log(
-                    `Group at ${encodePrettyXCoordinate(x)}${height - y} with color
-                    ${group.color} has ${empty_intersections.intersections.length} empty intersections and is territory = ${empty_intersections.is_territory}`,
+                    `Group at ${encodePrettyXCoordinate(x)}${height - y} with color ${
+                        group.color
+                    } has ${
+                        empty_intersections.intersections.length
+                    } empty intersections and is territory = ${empty_intersections.is_territory}`,
                 );
+                */
                 if (empty_intersections.is_territory) {
                     number_of_possible_eyes++;
                     amount_of_territory += empty_intersections.intersections.length;
@@ -460,16 +465,16 @@ export function autoscore(
          * Consider unsettled groups. Count the unsettled stones along with
          * their neighboring stones
          */
-        const groups = new StoneStringBuilder(
+        const unsettled_intersection_groups = new StoneStringBuilder(
             new BoardState({
                 board: is_settled,
                 removal: makeMatrix(width, height, false),
             }),
         );
 
-        debug_groups("Initial groups", groups);
+        debug_groups("Settlement intersection groups", unsettled_intersection_groups);
 
-        groups.foreachGroup((group) => {
+        unsettled_intersection_groups.foreachGroup((group) => {
             // if this group is a settled group, ignore it, we don't care about those
             const pt = group.intersections[0];
             if (is_settled[pt.y][pt.x]) {
@@ -488,8 +493,12 @@ export function autoscore(
                 0, // white
             ];
             let total_ownership_estimate = 0;
+            let total_ownership_tally = 0;
 
             const already_tallied = makeMatrix(width, height, 0);
+            let tally_ct = 0;
+
+            /** Tallies the surrounding stones */
             function tally_edge(x: number, y: number) {
                 if (x < 0 || x >= width || y < 0 || y >= height) {
                     return;
@@ -511,54 +520,103 @@ export function autoscore(
                 tally_edge(x + 1, y);
                 tally_edge(x, y - 1);
                 tally_edge(x, y + 1);
-
-                total_ownership_estimate +=
-                    black_plays_first_ownership[y][x] + white_plays_first_ownership[y][x];
+                total_ownership_estimate += average_ownership[y][x];
+                tally_ct += 1;
+
+                total_ownership_tally +=
+                    board[y][x] === JGOFNumericPlayerColor.BLACK
+                        ? 1
+                        : board[y][x] === JGOFNumericPlayerColor.WHITE
+                          ? -1
+                          : 0;
             });
 
-            const average_color_estimate = total_ownership_estimate / group.intersections.length;
+            //const average_color_estimate =
+            //    total_ownership_estimate / (group.intersections.length * 2);
+            //const average_color_estimate = total_ownership_estimate / tally_ct;
+            const average_color_estimate = total_ownership_tally / tally_ct;
 
             let color_judgement: JGOFNumericPlayerColor;
 
+            // We need to have a lot of empty intersections compared to the
+            // stones we're considering in order for this to usually make sense
+            const required_empty_intersections = 8;
+            const ratio_threshold = 1.5; // if one color has 1.5 times the stones of the other
+
+            if (contained[0] < required_empty_intersections) {
+                const { x, y } = group.intersections[0];
+                stage_log(
+                    `${encodePrettyXCoordinate(x)}${height - y} Not enough empty intersections to judge color ${contained}`,
+                );
+                return;
+            }
+
+            const pretty_coord =
+                encodePrettyXCoordinate(group.intersections[0].x) +
+                (height - group.intersections[0].y);
+
             const total = [
                 surrounding[0] + contained[0],
                 surrounding[1] + contained[1],
                 surrounding[2] + contained[2],
             ];
             if (average_color_estimate > 0.5) {
+                stage_log(
+                    `${pretty_coord} Average color estimate is black (${average_color_estimate})`,
+                );
                 color_judgement = JGOFNumericPlayerColor.BLACK;
-            } else if (total_ownership_estimate < -0.5) {
+            } else if (average_color_estimate < -0.5) {
+                stage_log(
+                    `${pretty_coord} Average color estimate is white (${average_color_estimate})`,
+                );
                 color_judgement = JGOFNumericPlayerColor.WHITE;
             } else {
-                if (total[JGOFNumericPlayerColor.BLACK] > total[JGOFNumericPlayerColor.WHITE]) {
+                if (
+                    total[JGOFNumericPlayerColor.BLACK] >
+                    total[JGOFNumericPlayerColor.WHITE] * ratio_threshold
+                ) {
                     color_judgement = JGOFNumericPlayerColor.BLACK;
+                    stage_log(
+                        `${pretty_coord} Average color estimate is black (${
+                            total[JGOFNumericPlayerColor.BLACK]
+                        } black stones vs ${total[JGOFNumericPlayerColor.WHITE]})`,
+                    );
                 } else if (
-                    total[JGOFNumericPlayerColor.WHITE] > total[JGOFNumericPlayerColor.BLACK]
+                    total[JGOFNumericPlayerColor.WHITE] >
+                    total[JGOFNumericPlayerColor.BLACK] * ratio_threshold
                 ) {
+                    stage_log(
+                        `${pretty_coord} Average color estimate is white (${
+                            total[JGOFNumericPlayerColor.WHITE]
+                        } white stones vs ${total[JGOFNumericPlayerColor.BLACK]})`,
+                    );
                     color_judgement = JGOFNumericPlayerColor.WHITE;
                 } else {
                     color_judgement = JGOFNumericPlayerColor.EMPTY;
+                    stage_log(`${pretty_coord} Average color estimate is empty`);
                 }
             }
 
-            group.map((point) => {
-                const x = point.x;
-                const y = point.y;
-                if (board[y][x] && board[y][x] !== color_judgement) {
-                    const stone_color =
-                        board[y][x] === JGOFNumericPlayerColor.BLACK ? "black" : "white";
-                    const judgement_color =
-                        color_judgement === JGOFNumericPlayerColor.BLACK ? "black" : "white";
-
-                    remove(
-                        x,
-                        y,
-                        `clearing unsettled ${stone_color} stones within assumed ${judgement_color} territory `,
-                    );
-                    is_settled[y][x] = 1;
-                    settled[y][x] = color_judgement;
-                }
-            });
+            if (color_judgement !== JGOFNumericPlayerColor.EMPTY) {
+                group.map((point) => {
+                    const x = point.x;
+                    const y = point.y;
+                    if (board[y][x] && board[y][x] !== color_judgement) {
+                        const stone_color =
+                            board[y][x] === JGOFNumericPlayerColor.BLACK ? "black" : "white";
+                        const judgement_color =
+                            color_judgement === JGOFNumericPlayerColor.BLACK ? "black" : "white";
+
+                        remove(
+                            x,
+                            y,
+                            `clearing unsettled ${stone_color} stones within assumed ${judgement_color} territory `,
+                        );
+                        is_settled[y][x] = 1;
+                        settled[y][x] = color_judgement;
+                    }
+                });
+            }
         });
 
         const removal_diff = removal.map((row, y) =>
@@ -774,7 +832,7 @@ export function autoscore(
         }
         //debug_boolean_board("Sealed", sealed, "s");
 
-        const print_final_ownership_string = false;
+        const print_final_ownership_string = true;
         // aid while correcting and forming the test files
         if (print_final_ownership_string) {
             let ownership_string = '\n  "correct_ownership": [\n';
diff --git a/test/autoscore_test_files/corner_test_1.json b/test/autoscore_test_files/corner_test_1.json
diff --git a/test/autoscore_test_files/corner_test_2.json b/test/autoscore_test_files/corner_test_2.json
@@ -0,0 +1,63 @@
+{
+  "game_id": 17247,
+  "board": [
+    "             ",
+    "bb           ",
+    "Wbbbbb  bbb  ",
+    "WWWWWWbbWbWb ",
+    "      WWWWWb ",
+    "WW        Wb ",
+    "bbW        Wb",
+    "bW WWbbb  WWb",
+    "bWWbbbWW  Wbb",
+    "bbWWb     Wb ",
+    "  bW W  WWb  ",
+    "bWbbWW   Wb b",
+    " W bbW   WWb "
+  ],
+  "black": [
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0, -1.0,  1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [ 1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [ 1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 1.0,  1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0,  1.0],
+    [ 1.0, -1.0,  1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0,  1.0],
+    [-0.1, -1.0,  0.0,  1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0]
+  ],
+  "white": [
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0, -1.0,  1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0]
+  ],
+  "correct_ownership": [
+    "BBBBBBBBBBBBB",
+    "BBBBBBBBBBBBB",
+    "WBBBBBBBBBBBB",
+    "WWWWWWBBWBWBB",
+    "WWWWWWWWWWWBB",
+    "WWWWWWWWWWWBB",
+    "BBWWWWWWWWWWB",
+    "BWWWWWWWWWWWB",
+    "BWWWWWWWWWWBB",
+    "BBWWWWWWWWWBB",
+    "  BWWWWWWWBBB",
+    "BWBBWWWWWWBBB",
+    " W BBWWWWWWBB"
+  ]
+}
diff --git a/test/autoscore_test_files/corner_test_3.json b/test/autoscore_test_files/corner_test_3.json
@@ -0,0 +1,63 @@
+{
+  "game_id": 17247,
+  "board": [
+    "             ",
+    "bb           ",
+    "Wbbbbb  bbb  ",
+    "WWWWWWbbWbWb ",
+    "      WWWWWb ",
+    "WW        Wb ",
+    "bbW        Wb",
+    "bW WWbbb  WWb",
+    "bWWbbbWW  Wbb",
+    "bbWWb     Wb ",
+    " bbW W  WWb  ",
+    " WbbWW   Wb b",
+    "   bbW   WWb "
+  ],
+  "black": [
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0, -1.0,  1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [ 1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [ 1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 0.5,  1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0,  1.0],
+    [-0.0, -0.8,  1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0,  1.0],
+    [ 0.2,  0.3,  0.6,  1.0,  1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0]
+  ],
+  "white": [
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [ 1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0, -1.0,  1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 0.9,  0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [ 0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0],
+    [ 0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 0.9,  0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0],
+    [ 0.5,  0.9,  0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  0.9,  0.9,  1.0],
+    [ 0.1, -0.8,  0.9,  0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  0.9,  1.0],
+    [-0.1, -0.2,  0.4,  0.9,  0.9, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,  1.0,  1.0]
+  ],
+  "correct_ownership": [
+    "BBBBBBBBBBBBB",
+    "BBBBBBBBBBBBB",
+    "WBBBBBBBBBBBB",
+    "WWWWWWBBWBWBB",
+    "WWWWWWWWWWWBB",
+    "WWWWWWWWWWWBB",
+    "BBWWWWWWWWWWB",
+    "BWWWWWWWWWWWB",
+    "BWWWWWWWWWWBB",
+    "BBWWWWWWWWWBB",
+    " BBWWWWWWWBBB",
+    " WBBWWWWWWBBB",
+    "   BBWWWWWWBB"
+  ]
+}
diff --git a/test/autoscore_test_files/corner_test_4.json b/test/autoscore_test_files/corner_test_4.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "goban-engine",`
`3`		`- "version": "0.8.1-beta.2",`
	`3`	`+ "version": "0.8.1-beta.3",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "goban-engine.js",`
`6`	`6`	`"types": "goban-engine.d.ts",`