-
Notifications
You must be signed in to change notification settings - Fork 0
Transform OptiConnect: Elite AI with Chess-Style Timers #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
86df37b
Initial plan
Copilot 16d4641
Phase 1-3: Remove difficulty system, add chess timers, and enhance AI
Copilot 53af21a
Update README documentation for elite AI and timer system
Copilot 48312cc
Fix code review issues: improve opening book validation and use constant
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # Test files | ||
| test-*.html | ||
| test-*.js | ||
|
|
||
| # macOS | ||
| .DS_Store | ||
|
|
||
| # Editor files | ||
| *.swp | ||
| *.swo | ||
| *~ | ||
| .vscode/ | ||
| .idea/ | ||
|
|
||
| # Logs | ||
| *.log |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -15,6 +15,19 @@ const MAX_TT_SIZE = 1000000; // Max entries in transposition table | |||||
| const BOARD_HEIGHT = TOTAL_ROWS + 1; // Extra row for overflow detection | ||||||
| const BOARD_WIDTH = TOTAL_COLUMNS; | ||||||
|
|
||||||
| // Opening book - prioritize center column | ||||||
| const OPENING_BOOK = { | ||||||
| '': 3, // First move - always play center column | ||||||
| }; | ||||||
| const MAX_OPENING_MOVES = 2; // Only use opening book for first 2 moves | ||||||
|
|
||||||
| // Column ordering for move ordering (center columns first for better alpha-beta pruning) | ||||||
| const COLUMN_ORDER = [3, 2, 4, 1, 5, 0, 6]; | ||||||
|
|
||||||
| // Position evaluation weights | ||||||
| const CENTER_COLUMN_WEIGHT = 3; | ||||||
| const CENTER_ADJACENT_WEIGHT = 2; | ||||||
|
|
||||||
| // Initialize Zobrist hashing table (random 64-bit values for each position and player) | ||||||
| const zobristTable = []; | ||||||
| function initZobrist() { | ||||||
|
|
@@ -239,6 +252,53 @@ GameState.prototype.getPlayerForChipAt = function(col, row) { | |||||
| return player; | ||||||
| } | ||||||
|
|
||||||
| // Evaluate position heuristically for non-terminal positions | ||||||
| GameState.prototype.evaluatePosition = function(player) { | ||||||
| let score = 0; | ||||||
|
|
||||||
| // Center control - pieces in center columns are more valuable | ||||||
| for (let row = 0; row < this.bitboard.heights[3]; row++) { | ||||||
| if (this.board[3][row] === player) { | ||||||
| score += CENTER_COLUMN_WEIGHT; | ||||||
| } else if (this.board[3][row] !== undefined) { | ||||||
| score -= CENTER_COLUMN_WEIGHT; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Adjacent to center also valuable | ||||||
| for (let col of [2, 4]) { | ||||||
| for (let row = 0; row < this.bitboard.heights[col]; row++) { | ||||||
| if (this.board[col][row] === player) { | ||||||
| score += CENTER_ADJACENT_WEIGHT; | ||||||
| } else if (this.board[col][row] !== undefined) { | ||||||
| score -= CENTER_ADJACENT_WEIGHT; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // Normalize score to be within minimax range | ||||||
| return score * 0.1; | ||||||
| } | ||||||
|
|
||||||
| // Get a simple board state hash for opening book lookup | ||||||
| function getBoardStateKey(gameState) { | ||||||
| let key = ''; | ||||||
| let moveCount = 0; | ||||||
| for (let col = 0; col < TOTAL_COLUMNS; col++) { | ||||||
| moveCount += gameState.board[col].length; | ||||||
| } | ||||||
|
|
||||||
| // Only use opening book for first few moves | ||||||
| if (moveCount > MAX_OPENING_MOVES) return null; | ||||||
|
|
||||||
| for (let col = 0; col < TOTAL_COLUMNS; col++) { | ||||||
| for (let row = 0; row < gameState.board[col].length; row++) { | ||||||
| key += col + '' + gameState.board[col][row]; | ||||||
|
Comment on lines
+294
to
+296
|
||||||
| } | ||||||
| } | ||||||
| return key; | ||||||
| } | ||||||
|
|
||||||
| // listen for messages from the main thread | ||||||
| self.addEventListener('message', function(e) { | ||||||
| switch(e.data.messageType) { | ||||||
|
|
@@ -285,27 +345,40 @@ function makeComputerMove(maxDepth) { | |||||
| let isWinImminent = false; | ||||||
| let isLossImminent = false; | ||||||
|
|
||||||
| for (let depth = 0; depth <= maxDepth; depth++) { | ||||||
| const origin = new GameState(currentGameState); | ||||||
| const isTopLevel = (depth === maxDepth); | ||||||
|
|
||||||
| // Alpha-beta search with initial bounds | ||||||
| const tentativeCol = think(origin, 2, depth, isTopLevel, -Infinity, Infinity); | ||||||
|
|
||||||
| if (origin.score === HUMAN_WIN_SCORE) { | ||||||
| // AI realizes it can lose, thinks all moves suck now, keep move picked at previous depth | ||||||
| // this solves the "apathy" problem | ||||||
| isLossImminent = true; | ||||||
| break; | ||||||
| } else if (origin.score === COMPUTER_WIN_SCORE) { | ||||||
| // AI knows how to win, no need to think deeper, use this move | ||||||
| // this solves the "cocky" problem | ||||||
| col = tentativeCol; | ||||||
| isWinImminent = true; | ||||||
| break; | ||||||
| } else { | ||||||
| // go with this move, for now at least | ||||||
| col = tentativeCol; | ||||||
| // Check opening book first | ||||||
| const boardKey = getBoardStateKey(currentGameState); | ||||||
| if (boardKey !== null && boardKey in OPENING_BOOK) { | ||||||
| const openingCol = OPENING_BOOK[boardKey]; | ||||||
| // Verify move is valid | ||||||
| if (currentGameState.bitboard.heights[openingCol] < TOTAL_ROWS) { | ||||||
| col = openingCol; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| if (col === undefined) { | ||||||
| // Use iterative deepening with fixed high depth | ||||||
| for (let depth = 0; depth <= maxDepth; depth++) { | ||||||
| const origin = new GameState(currentGameState); | ||||||
| const isTopLevel = (depth === maxDepth); | ||||||
|
|
||||||
| // Alpha-beta search with initial bounds | ||||||
| const tentativeCol = think(origin, 2, depth, isTopLevel, -Infinity, Infinity); | ||||||
|
|
||||||
| if (origin.score === HUMAN_WIN_SCORE) { | ||||||
| // AI realizes it can lose, thinks all moves suck now, keep move picked at previous depth | ||||||
| // this solves the "apathy" problem | ||||||
| isLossImminent = true; | ||||||
| break; | ||||||
| } else if (origin.score === COMPUTER_WIN_SCORE) { | ||||||
| // AI knows how to win, no need to think deeper, use this move | ||||||
| // this solves the "cocky" problem | ||||||
| col = tentativeCol; | ||||||
| isWinImminent = true; | ||||||
| break; | ||||||
| } else { | ||||||
| // go with this move, for now at least | ||||||
| col = tentativeCol; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -350,13 +423,14 @@ function think(node, player, recursionsRemaining, isTopLevel, alpha, beta) { | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| let col; | ||||||
| let scoreSet = false; | ||||||
| const childNodes = []; | ||||||
| let bestMove = -1; | ||||||
|
|
||||||
| // consider each column as a potential move | ||||||
| for (col = 0; col < TOTAL_COLUMNS; col++) { | ||||||
| // Use column ordering for better alpha-beta pruning (center columns first) | ||||||
| for (let colIdx = 0; colIdx < COLUMN_ORDER.length; colIdx++) { | ||||||
| const col = COLUMN_ORDER[colIdx]; | ||||||
|
|
||||||
| if(isTopLevel) { | ||||||
| self.postMessage({ | ||||||
| messageType: 'progress', | ||||||
|
|
@@ -376,6 +450,10 @@ function think(node, player, recursionsRemaining, isTopLevel, alpha, beta) { | |||||
| // no game stopping win and there are still recursions to make, think deeper | ||||||
| const nextPlayer = (player === 1) ? 2 : 1; | ||||||
| think(childNode, nextPlayer, recursionsRemaining - 1, false, alpha, beta); | ||||||
| } else if (!childNode.isWin() && recursionsRemaining === 0) { | ||||||
| // At leaf node, apply heuristic evaluation | ||||||
| const heuristicScore = childNode.evaluatePosition(2); // Evaluate for computer | ||||||
|
||||||
| const heuristicScore = childNode.evaluatePosition(2); // Evaluate for computer | |
| const heuristicScore = childNode.evaluatePosition(player); // Evaluate for current player |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The opening book currently only contains an entry for the empty board state (first move). The MAX_OPENING_MOVES constant is set to 2, suggesting the opening book should be used for the first 2 moves, but there's no entry defined for the second move. Either remove the MAX_OPENING_MOVES constant and use a simple check for empty board, or add actual second-move entries to the opening book to match the intended design.