Update libblokusduo

Author: irori

docs/blokus.js

@@ -7,7 +7,7 @@ export default class WorkerBackend {
     this.worker = new Worker('hm5move.js');
     this.worker.addEventListener('message', (e) => {
       let move = new Move(e.data.move);
-      console.log(e.data.nps + ' nps');
+      console.log(`${move.fourcc()} (${e.data.nps} nps)`);
       this.handler(move);
     });
   }

docs/hm5move.js

@@ -9,7 +9,7 @@ export class Move {
         this.m = x << 4 | y! | piece_id! << 8;
       else
         this.m = x;
-    } else if (x == '----') {
+    } else if (x == '0000') {
       this.m = 0xffff;
     } else {
       let xy = parseInt(x.substring(0, 2), 16);
@@ -28,7 +28,7 @@ export class Move {
 
   fourcc() {
     if (this.isPass())
-      return '----';
+      return '0000';
     return ((this.m & 0xff) + 0x11).toString(16) +
       String.fromCharCode(117 - this.blockId()) +
       this.direction();

docs/hm5move.wasm

@@ -1,7 +1,7 @@
 
 test("Move", function(){
     ok(Move.PASS.isPass());
-    ok((new Move("----")).isPass());
+    ok((new Move("0000")).isPass());
     var m = new Move(3, 5, 0x12);
     same(m.x(), 3);
     same(m.y(), 5);
@@ -39,7 +39,7 @@ test("Board constructor", function(){
 
 test("first move", function(){
     var b = new Board();
-    ok(b.isValidMove(new Move("----")));
+    ok(b.isValidMove(new Move("0000")));
     ok(b.isValidMove(new Move("66t0")));
     ok(b.isValidMove(new Move("55t0")));
     ok(!b.isValidMove(new Move("44t0")));
@@ -120,8 +120,8 @@ test("end game", function(){
     checkMove(new Move("B6g0"));
     checkMove(new Move("8Ej2"));
     checkMove(new Move("81f6"));
-    checkMove(new Move("----"));
+    checkMove(new Move("0000"));
     checkMove(new Move("63a0"));
-    checkMove(new Move("----"));
+    checkMove(new Move("0000"));
     ok(!b.canMove());
 });

src/backend.ts

@@ -1,34 +1,38 @@
+#include <emscripten.h>
 #include <stdlib.h>
 #include <time.h>
 
+#include <string_view>
+
 #include "blokusduo.h"
 using namespace blokusduo;
 
-extern "C" const char* hm5move(const char* pathstr, int max_depth,
-                               int time_limit);
-extern "C" int getVisitedNodes();
-
-Move com_move(const Board& b, int max_depth, int time_ms) {
-  Move move;
-  int score = 100;
-
-  move = search::opening_move(b);
-  if (move == Move::invalid()) {
-    search::SearchResult r;
-    if (b.turn() < 25)
-      r = search::negascout(b, max_depth, time_ms / 2, time_ms);
-    else if (b.turn() < 27)
-      r = search::wld(b, 1000);
-    else
-      r = search::perfect(b);
-    move = r.first;
-    score = r.second;
+EM_JS(unsigned, clock_ms, (), { return performance.now(); });
+
+Move com_move(const Board& b, int max_depth, int limit_ms) {
+  Move move = search::opening_move(b);
+  if (move.is_valid()) return move;
+
+  unsigned start_ms = clock_ms();
+  search::SearchResult r;
+  if (b.turn() < 25) {
+    r = search::negascout(
+        b, max_depth, [start_ms, limit_ms](int depth, search::SearchResult r) {
+          unsigned now = clock_ms();
+          printf("%d> %s %d nodes %d ms\n", depth, r.first.code().c_str(),
+                 search::visited_nodes, now - start_ms);
+          return now < start_ms + limit_ms;
+        });
+  } else if (b.turn() < 27) {
+    r = search::wld(b);
+  } else {
+    r = search::perfect(b);
   }
-
-  return move;
+  return r.first;
 }
 
-const char* hm5move(const char* path, int max_depth, int time_limit) {
+extern "C"
+const char* hm5move(const char* path, int max_depth, int limit_ms) {
   static std::string fourcc;
   static bool initialized = false;
   if (!initialized) {
@@ -38,17 +42,17 @@ const char* hm5move(const char* path, int max_depth, int time_limit) {
 
   Board b;
   while (*path) {
-    Move m(path);
+    Move m(std::string_view(path, 4));
     path += 4;
     if (*path == '/') path++;
-    if (m == Move::invalid() || !b.is_valid_move(m))
-      return "XXXX invalid move ";
+    if (!m.is_valid() || !b.is_valid_move(m)) return "XXXX invalid move ";
     b.play_move(m);
   }
   search::visited_nodes = 0;
-  Move m = com_move(b, max_depth, time_limit);
-  fourcc = m.fourcc();
+  Move m = com_move(b, max_depth, limit_ms);
+  fourcc = m.code();
   return fourcc.c_str();
 }
 
+extern "C"
 int getVisitedNodes() { return search::visited_nodes; }

src/move.ts

@@ -2,7 +2,7 @@ var hm5move = Module.cwrap('hm5move', 'string', ['string', 'number'])
 var getVisitedNodes = Module.cwrap('getVisitedNodes', 'number')
 
 function isValidPath(path) {
-  return path.search(/^((----|[1-9a-e]{2}[a-u][0-7])\/?)*$/) >= 0;
+  return path.search(/^((0000|[1-9a-e]{2}[a-u][0-7])\/?)*$/) >= 0;
 }
 
 function depth(level) {
@@ -21,11 +21,11 @@ function limit(level, player) {
 
   switch (level) {
   case 2:
-    return 1000 * mult;
+    return 300 * mult;
   case 3:
-    return 10000 * mult;
+    return 3000 * mult;
   }
-  return 1000 * mult;
+  return 300 * mult;
 }  
 
 function handle(data) {