Removed distinction between Search and MateSearch. Eliminated jquery …

…fossil.
cosinekitty · Jun 30, 2016 · b580d15 · b580d15
1 parent feb577a
commit b580d15
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3,237 deletions.
diff --git a/demo/jquery.d.ts b/demo/jquery.d.ts
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -22,8 +22,7 @@
     ],
     "files": [
         "../src/flywheel.ts",
-        "./fwui.ts",
-        "./jquery.d.ts"
+        "./fwui.ts"
     ],
     "atom": {
         "rewriteTsconfig": true

diff --git a/src/flywheel.js b/src/flywheel.js
@@ -2007,7 +2007,7 @@ var Flywheel;
             for (var limit = 1; searching; ++limit) {
                 try {
                     var nextBestPath = new BestPath();
-                    nextBestPath.score = this.InternalMateSearch(board, limit, 0, nextBestPath, Score.NegInf, Score.PosInf);
+                    nextBestPath.score = this.InternalSearch(board, limit, 0, nextBestPath, Score.NegInf, Score.PosInf);
                     bestPath = nextBestPath; // search was not yet aborted via exception, so update best path
                     if (bestPath.score >= Score.ForcedWin) {
                         break;
@@ -2025,32 +2025,7 @@ var Flywheel;
             bestPath.nodes = this.nodesVisitedCounter;
             return bestPath;
         };
-        Thinker.prototype.MateSearch = function (board) {
-            // Search for a forced checkmate.
-            var bestPath = null;
-            var searching = true;
-            for (var limit = 1; searching; ++limit) {
-                try {
-                    var nextBestPath = new BestPath();
-                    nextBestPath.score = this.InternalMateSearch(board, limit, 0, nextBestPath, Score.NegInf, Score.PosInf);
-                    bestPath = nextBestPath; // search was not yet aborted via exception, so update best path
-                    if (bestPath.score >= Score.ForcedWin) {
-                        break;
-                    }
-                }
-                catch (ex) {
-                    if (ex instanceof SearchAbortedException) {
-                        searching = false; // This is not an error; it is the normal way a search is terminated.
-                    }
-                    else {
-                        throw ex; // This really is an error, so bubble the exception up!
-                    }
-                }
-            }
-            bestPath.nodes = this.nodesVisitedCounter;
-            return bestPath;
-        };
-        Thinker.MateSearchMoveRater = function (board, move) {
+        Thinker.MoveRater = function (board, move) {
             if (board.IsCurrentPlayerInCheck()) {
                 if (!board.CurrentPlayerCanMove()) {
                     // Put moves that cause checkmate to the very front.
@@ -2061,7 +2036,7 @@ var Flywheel;
             }
             return 0;
         };
-        Thinker.prototype.InternalMateSearch = function (board, limit, depth, bestPath, alpha, beta) {
+        Thinker.prototype.InternalSearch = function (board, limit, depth, bestPath, alpha, beta) {
             this.CheckSearchAborted(limit);
             ++this.nodesVisitedCounter;
             bestPath.Truncate();
@@ -2073,7 +2048,7 @@ var Flywheel;
                 }
                 return Score.Draw;
             }
-            var legal = board.LegalMoves(Thinker.MateSearchMoveRater);
+            var legal = board.LegalMoves(Thinker.MoveRater);
             if (legal.length === 0) {
                 // Either checkmate or stalemate, depending on whether the current player is in check.
                 // Postponement adjustment:
@@ -2096,7 +2071,7 @@ var Flywheel;
                 board.PushMove(move);
                 // Tricky: we negate the return value, flip and negate the alpha-beta window.
                 // This is a "negamax" search -- whatever is good for one player is bad for the other.
-                var score = -this.InternalMateSearch(board, limit, 1 + depth, currPath, -beta, -alpha);
+                var score = -this.InternalSearch(board, limit, 1 + depth, currPath, -beta, -alpha);
                 board.PopMove();
                 if (score > bestScore) {
                     bestScore = score;

diff --git a/src/flywheel.ts b/src/flywheel.ts
@@ -2106,7 +2106,7 @@ module Flywheel {
             for (var limit=1; searching; ++limit) {
                 try {
                     var nextBestPath:BestPath = new BestPath();
-                    nextBestPath.score = this.InternalMateSearch(board, limit, 0, nextBestPath, Score.NegInf, Score.PosInf);
+                    nextBestPath.score = this.InternalSearch(board, limit, 0, nextBestPath, Score.NegInf, Score.PosInf);
                     bestPath = nextBestPath;    // search was not yet aborted via exception, so update best path
                     if (bestPath.score >= Score.ForcedWin) {
                         break;
@@ -2123,31 +2123,7 @@ module Flywheel {
             return bestPath;
         }
 
-        public MateSearch(board:Board): BestPath {
-            // Search for a forced checkmate.
-            var bestPath:BestPath = null;
-            var searching = true;
-            for (var limit=1; searching; ++limit) {
-                try {
-                    var nextBestPath:BestPath = new BestPath();
-                    nextBestPath.score = this.InternalMateSearch(board, limit, 0, nextBestPath, Score.NegInf, Score.PosInf);
-                    bestPath = nextBestPath;    // search was not yet aborted via exception, so update best path
-                    if (bestPath.score >= Score.ForcedWin) {
-                        break;
-                    }
-                } catch (ex) {
-                    if (ex instanceof SearchAbortedException) {
-                        searching = false;  // This is not an error; it is the normal way a search is terminated.
-                    } else {
-                        throw ex;   // This really is an error, so bubble the exception up!
-                    }
-                }
-            }
-            bestPath.nodes = this.nodesVisitedCounter;
-            return bestPath;
-        }
-
-        private static MateSearchMoveRater(board:Board, move:Move):Score {
+        private static MoveRater(board:Board, move:Move):Score {
             if (board.IsCurrentPlayerInCheck()) {
                 if (!board.CurrentPlayerCanMove()) {
                     // Put moves that cause checkmate to the very front.
@@ -2159,7 +2135,7 @@ module Flywheel {
             return 0;
         }
 
-        private InternalMateSearch(
+        private InternalSearch(
             board:Board,
             limit:number,
             depth:number,
@@ -2182,7 +2158,7 @@ module Flywheel {
                 return Score.Draw;
             }
 
-            let legal:Move[] = board.LegalMoves(Thinker.MateSearchMoveRater);
+            let legal:Move[] = board.LegalMoves(Thinker.MoveRater);
             if (legal.length === 0) {
                 // Either checkmate or stalemate, depending on whether the current player is in check.
                 // Postponement adjustment:
@@ -2207,7 +2183,7 @@ module Flywheel {
                 board.PushMove(move);
                 // Tricky: we negate the return value, flip and negate the alpha-beta window.
                 // This is a "negamax" search -- whatever is good for one player is bad for the other.
-                let score:Score = -this.InternalMateSearch(board, limit, 1+depth, currPath, -beta, -alpha);
+                let score:Score = -this.InternalSearch(board, limit, 1+depth, currPath, -beta, -alpha);
                 board.PopMove();
 
                 if (score > bestScore) {

diff --git a/src/flyworker.js b/src/flyworker.js
diff --git a/src/flyworker.ts b/src/flyworker.ts
@@ -51,7 +51,7 @@ module FlyWorker {
             board.PushHistory(data.game);
             let thinker:Flywheel.Thinker = new Flywheel.Thinker();
             thinker.SetMaxSearchLimit(data.limit);
-            let bestPath:Flywheel.BestPath = thinker.MateSearch(board);
+            let bestPath:Flywheel.BestPath = thinker.Search(board);
             return Adapter.MakeSearchResponse(data, bestPath);
         }