@renju-note/quintet 0.8.0 → 0.9.2

package/README.md

@@ -4,6 +4,8 @@ Renju mate solver compilable to WebAssemby
 
 ## Run
 
+### VCF
+
 ```
 $ cargo build --release --example solve_vcf
 
@@ -37,6 +39,43 @@ Elapsed: 1.414262ms
 H5,I6,E6,H9,F5,E5,C8,D7,C11,C9,C14,C13,D13
 ```
 
+### VCT
+
+```
+$ cargo build --release --example solve_vct_dfpn
+
+$ ./target/release/examples/solve_vct_dfpn x H8,I9,H7,J8,F8,H9,G9,H10,G11,F10,I10,G10,I8,J9,E10,K9,L9,G8,J10,K7,L6,K8,K6,L10,I7,J6,M9,I5,H4,F7,
+G6,E6,D5,F5,G4
+Player: White
+
+Board:
+
+15 . . . . . . . . . . . . . . .
+14 . . . . . . . . . . . . . . .
+13 . . . . . . . . . . . . . . .
+12 . . . . . . . . . . . . . . .
+11 . . . . . . o . . . . . . . .
+10 . . . . o x x x o o . x . . .
+ 9 . . . . . . o x x x x o o . .
+ 8 . . . . . o x o o x x . . . .
+ 7 . . . . . x . o o . x . . . .
+ 6 . . . . x . o . . x o o . . .
+ 5 . . . o . x . . x . . . . . .
+ 4 . . . . . . o o . . . . . . .
+ 3 . . . . . . . . . . . . . . .
+ 2 . . . . . . . . . . . . . . .
+ 1 . . . . . . . . . . . . . . .
+   A B C D E F G H I J K L M N O
+
+Solving...
+
+Elapsed: 8.763508458s
+23 times
+K11,K10,N12,M11,N8,H5,H6,L8,J5,J7,M5,L4,M6,K5,N5,L7,J4,G7,K3,L2,M4,M3,M8,M7,N7,I6,F3,G5,G3,O1,N2,K2,F4,F6,F1,F2,J3,J2,I3,H3,N4,N6,N1,N3,K4
+```
+
+Original game: https://www.renju.net/media/games.php?gameid=92337
+
 ## Release
 
 ```

package/package.json

@@ -4,7 +4,7 @@
     "yubessy <yubessy0@gmail.com>"
   ],
   "description": "Renju mate solver compilable to WebAssemby",
-  "version": "0.8.0",
+  "version": "0.9.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/quintet.d.ts

@@ -4,18 +4,26 @@
 * @param {Uint8Array} blacks
 * @param {Uint8Array} whites
 * @param {boolean} black
-* @param {number} depth
+* @param {number} max_depth
 * @returns {Uint8Array | undefined}
 */
-export function solve_vcf(blacks: Uint8Array, whites: Uint8Array, black: boolean, depth: number): Uint8Array | undefined;
+export function solve_vcf(blacks: Uint8Array, whites: Uint8Array, black: boolean, max_depth: number): Uint8Array | undefined;
 /**
 * @param {Uint8Array} blacks
 * @param {Uint8Array} whites
 * @param {boolean} black
-* @param {number} depth
+* @param {number} max_depth
 * @returns {Uint8Array | undefined}
 */
-export function solve_vct(blacks: Uint8Array, whites: Uint8Array, black: boolean, depth: number): Uint8Array | undefined;
+export function solve_vct(blacks: Uint8Array, whites: Uint8Array, black: boolean, max_depth: number): Uint8Array | undefined;
+/**
+* @param {Uint8Array} blacks
+* @param {Uint8Array} whites
+* @param {boolean} black
+* @param {number} max_depth
+* @returns {Uint8Array | undefined}
+*/
+export function solve_vct_dfpn(blacks: Uint8Array, whites: Uint8Array, black: boolean, max_depth: number): Uint8Array | undefined;
 /**
 * @param {number} x
 * @param {number} y

package/quintet_bg.js

@@ -32,17 +32,17 @@ function getArrayU8FromWasm0(ptr, len) {
 * @param {Uint8Array} blacks
 * @param {Uint8Array} whites
 * @param {boolean} black
-* @param {number} depth
+* @param {number} max_depth
 * @returns {Uint8Array | undefined}
 */
-export function solve_vcf(blacks, whites, black, depth) {
+export function solve_vcf(blacks, whites, black, max_depth) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray8ToWasm0(blacks, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
         var ptr1 = passArray8ToWasm0(whites, wasm.__wbindgen_malloc);
         var len1 = WASM_VECTOR_LEN;
-        wasm.solve_vcf(retptr, ptr0, len0, ptr1, len1, black, depth);
+        wasm.solve_vcf(retptr, ptr0, len0, ptr1, len1, black, max_depth);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         let v2;
@@ -60,17 +60,45 @@ export function solve_vcf(blacks, whites, black, depth) {
 * @param {Uint8Array} blacks
 * @param {Uint8Array} whites
 * @param {boolean} black
-* @param {number} depth
+* @param {number} max_depth
 * @returns {Uint8Array | undefined}
 */
-export function solve_vct(blacks, whites, black, depth) {
+export function solve_vct(blacks, whites, black, max_depth) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray8ToWasm0(blacks, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
         var ptr1 = passArray8ToWasm0(whites, wasm.__wbindgen_malloc);
         var len1 = WASM_VECTOR_LEN;
-        wasm.solve_vct(retptr, ptr0, len0, ptr1, len1, black, depth);
+        wasm.solve_vct(retptr, ptr0, len0, ptr1, len1, black, max_depth);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        let v2;
+        if (r0 !== 0) {
+            v2 = getArrayU8FromWasm0(r0, r1).slice();
+            wasm.__wbindgen_free(r0, r1 * 1);
+        }
+        return v2;
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
+}
+
+/**
+* @param {Uint8Array} blacks
+* @param {Uint8Array} whites
+* @param {boolean} black
+* @param {number} max_depth
+* @returns {Uint8Array | undefined}
+*/
+export function solve_vct_dfpn(blacks, whites, black, max_depth) {
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        var ptr0 = passArray8ToWasm0(blacks, wasm.__wbindgen_malloc);
+        var len0 = WASM_VECTOR_LEN;
+        var ptr1 = passArray8ToWasm0(whites, wasm.__wbindgen_malloc);
+        var len1 = WASM_VECTOR_LEN;
+        wasm.solve_vct_dfpn(retptr, ptr0, len0, ptr1, len1, black, max_depth);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         let v2;