feat: migrate computer to async

loks0n · Apr 2, 2023 · 1f2c9c8 · 1f2c9c8
1 parent 4c1ca50
commit 1f2c9c8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -45,11 +45,11 @@ const strongComputer = ComputerFactory.alphaBeta({
 while (draughts.status === DraughtsStatus.PLAYING) {
   console.log(`${draughts.asciiBoard()}`);
   console.log(`to_move = ${draughts.player}`);
-  const move =
-    draughts.player === DraughtsPlayer.LIGHT
-      ? weakComputer(draughts)
-      : strongComputer(draughts);
 
+  const computerPlayer =
+    draughts.player === DraughtsPlayer.LIGHT ? weakComputer : strongComputer;
+
+  const move = await computerPlayer(draughts);
   if (move) draughts.move(move);
 }
 

diff --git a/examples/basic.ts b/examples/basic.ts
@@ -21,11 +21,11 @@ const strongComputer = ComputerFactory.alphaBeta({
 while (draughts.status === DraughtsStatus.PLAYING) {
   console.log(`${draughts.asciiBoard()}`);
   console.log(`to_move = ${draughts.player}`);
-  const move =
-    draughts.player === DraughtsPlayer.LIGHT
-      ? weakComputer(draughts)
-      : strongComputer(draughts);
 
+  const computerPlayer =
+    draughts.player === DraughtsPlayer.LIGHT ? weakComputer : strongComputer;
+
+  const move = await computerPlayer(draughts);
   if (move) draughts.move(move);
 }
 

diff --git a/src/computer/alpha-beta.ts b/src/computer/alpha-beta.ts
@@ -10,30 +10,28 @@ export type AlphaBetaOptions<T extends Bitboard, E> = {
   quiescence?: boolean;
 };
 
-export function alphaBeta<T extends Bitboard, E>({
+export async function alphaBeta<T extends Bitboard, E>({
   options: { maxDepth, evaluationFunction, quiescence = true },
   engine,
-}: DraughtsComputerStrategyArgs<
-  T,
-  E,
-  AlphaBetaOptions<T, E>
->): DraughtsEngineMove<T> {
+}: DraughtsComputerStrategyArgs<T, E, AlphaBetaOptions<T, E>>): Promise<
+  DraughtsEngineMove<T>
+> {
   let recordEvaluation = Number.NEGATIVE_INFINITY;
   let recordMove: DraughtsEngineMove<T> | undefined;
 
   for (const move of engine.moves) {
     const next = engine.clone();
     next.move(move);
 
-    const evaluation = -alphaBetaSearch({
+    const evaluation = -(await alphaBetaSearch({
       data: {
         engine: next,
         alpha: Number.NEGATIVE_INFINITY,
         beta: Number.POSITIVE_INFINITY,
         depth: maxDepth - 1,
       },
-      options: { evaluationFunction, quiescence: quiescence },
-    });
+      options: { evaluationFunction, quiescence },
+    }));
     if (evaluation >= recordEvaluation) {
       recordEvaluation = evaluation;
       recordMove = move;
@@ -65,7 +63,7 @@ type AlphaBetaSearchArguments<T extends Bitboard, E> = {
   options: Omit<AlphaBetaOptions<T, E>, 'maxDepth'>;
 };
 
-function alphaBetaSearch<T extends Bitboard, E>({
+async function alphaBetaSearch<T extends Bitboard, E>({
   data: { engine, alpha, beta, depth },
   options: { evaluationFunction, quiescence },
 }: AlphaBetaSearchArguments<T, E>) {
@@ -81,15 +79,15 @@ function alphaBetaSearch<T extends Bitboard, E>({
     const next = engine.clone();
     next.move(move);
 
-    const evaluation = -alphaBetaSearch({
+    const evaluation = -(await alphaBetaSearch({
       data: {
         engine: next,
         alpha: -beta,
         beta: -alpha,
         depth: depth - 1,
       },
       options: { evaluationFunction, quiescence: quiescence },
-    });
+    }));
     if (evaluation >= beta) return beta;
     alpha = Math.max(evaluation, alpha);
   }
@@ -108,7 +106,7 @@ interface QuiescenceSearchArguments<T extends Bitboard, E> {
   };
 }
 
-function quiescenceSearch<T extends Bitboard, E>({
+async function quiescenceSearch<T extends Bitboard, E>({
   data: { engine, alpha, beta },
   options: { evaluationFunction },
 }: QuiescenceSearchArguments<T, E>) {
@@ -121,10 +119,11 @@ function quiescenceSearch<T extends Bitboard, E>({
     const next = engine.clone();
     next.move(move);
 
-    const nextEvaluation = -quiescenceSearch({
+    const nextEvaluation = -(await quiescenceSearch({
       data: { engine: next, alpha: -beta, beta: -alpha },
       options: { evaluationFunction },
-    });
+    }));
+
     if (nextEvaluation >= beta) return beta;
     alpha = Math.max(nextEvaluation, alpha);
   }

diff --git a/src/computer/computer.ts b/src/computer/computer.ts
@@ -16,11 +16,11 @@ export type DraughtsComputerStrategyArgs<T extends Bitboard, E, O> = {
 
 export type DraughtsComputerStrategy<T extends Bitboard, E, O> = (
   args: DraughtsComputerStrategyArgs<T, E, O>
-) => DraughtsEngineMove<T>;
+) => Promise<DraughtsEngineMove<T>>;
 
 export type DraughtsComputer<T extends Bitboard, E> = (
   game: DraughtsGame1D<T, E>
-) => DraughtsMove1D;
+) => Promise<DraughtsMove1D>;
 
 export type DraughtsComputerArguments<T extends Bitboard, E, O> = {
   adapter: DraughtsAdapter1D<T>;
@@ -34,8 +34,8 @@ export const DraughtsComputerFactory = {
     strategy,
     options,
   }: DraughtsComputerArguments<T, E, O>): DraughtsComputer<T, E> {
-    return (game) => {
-      const engineMove = strategy({
+    return async (game) => {
+      const engineMove = await strategy({
         options,
         engine: game.engine,
       });

diff --git a/src/computer/random.ts b/src/computer/random.ts
@@ -1,9 +1,11 @@
 import { Bitboard, DraughtsEngineMove } from '../core/engine';
 import { DraughtsComputerStrategyArgs } from './computer';
 
-export function random<T extends Bitboard, E>({
+export async function random<T extends Bitboard, E>({
   engine,
-}: DraughtsComputerStrategyArgs<T, E, undefined>): DraughtsEngineMove<T> {
+}: DraughtsComputerStrategyArgs<T, E, undefined>): Promise<
+  DraughtsEngineMove<T>
+> {
   if (engine.moves.length === 0) throw new Error('no valid moves');
 
   const randomIndex = Math.floor(Math.random() * engine.moves.length);