-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from skedwards88/cleanup
Relocate some logic
- Loading branch information
Showing
8 changed files
with
125 additions
and
124 deletions.
There are no files selected for viewing
This file contains 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
File renamed without changes.
File renamed without changes.
This file contains 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 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 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 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,22 @@ | ||
| // Returns a grid with the number of letters at each location in the grid | ||
| export function getLetterCountPerSquare(height, width, pieces) { | ||
| let grid = Array(height) | ||
| .fill(undefined) | ||
| .map(() => Array(width).fill(0)); | ||
|
|
||
| for (let piece of pieces) { | ||
| const letters = piece.letters; | ||
| let top = piece.boardTop ?? piece.dragGroupTop; | ||
| for (let rowIndex = 0; rowIndex < letters.length; rowIndex++) { | ||
| let left = piece.boardLeft ?? piece.dragGroupLeft; | ||
| for (let colIndex = 0; colIndex < letters[rowIndex].length; colIndex++) { | ||
| if (letters[rowIndex][colIndex]) { | ||
| grid[top][left]++; | ||
| } | ||
| left++; | ||
| } | ||
| top++; | ||
| } | ||
| } | ||
| return grid; | ||
| } |
This file contains 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,90 @@ | ||
| import {getGridFromPieces} from "../logic/getGridFromPieces"; | ||
| import {getWordsFromPieces} from "../logic/getWordsFromPieces"; | ||
| import {transposeGrid} from "@skedwards88/word_logic"; | ||
| import {isKnown} from "@skedwards88/word_logic"; | ||
| import {trie} from "../logic/trie"; | ||
|
|
||
| function getHorizontalValidityGrid({grid, originalWords}) { | ||
| // return a 2D array of bools indicating whether | ||
| // the position corresponds to a letter on the board | ||
| // that is part of a valid horizontal word | ||
| const height = grid.length; | ||
| const width = grid[0].length; | ||
|
|
||
| const horizontalValidityGrid = Array(height) | ||
| .fill(undefined) | ||
| .map(() => Array(width).fill(false)); | ||
|
|
||
| for (const [rowIndex, row] of grid.entries()) { | ||
| let word = ""; | ||
| let indexes = []; | ||
| for (const [columnIndex, letter] of row.entries()) { | ||
| if (letter != "") { | ||
| word += letter; | ||
| indexes.push(columnIndex); | ||
| } else { | ||
| if (word.length > 1) { | ||
| // If the word is one of the original words, always consider it valid (in case we updated the dictionary in the interim). | ||
| // Otherwise, check whether it is a word in the trie. | ||
| let isWord = originalWords.includes(word); | ||
| if (!isWord) { | ||
| ({isWord} = isKnown(word, trie)); | ||
| } | ||
| if (isWord) { | ||
| indexes.forEach( | ||
| (index) => (horizontalValidityGrid[rowIndex][index] = true), | ||
| ); | ||
| } | ||
| } | ||
| word = ""; | ||
| indexes = []; | ||
| } | ||
| } | ||
| // Also end the word if we reach the end of the row | ||
| if (word.length > 1) { | ||
| // If the word is one of the original words, always consider it valid (in case we updated the dictionary in the interim). | ||
| // Otherwise, check whether it is a word in the trie. | ||
| let isWord = originalWords.includes(word); | ||
| if (!isWord) { | ||
| ({isWord} = isKnown(word, trie)); | ||
| } | ||
| if (isWord) { | ||
| indexes.forEach( | ||
| (index) => (horizontalValidityGrid[rowIndex][index] = true), | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return horizontalValidityGrid; | ||
| } | ||
|
|
||
| export function getWordValidityGrids({ | ||
| pieces, | ||
| gridSize, | ||
| includeOriginalSolution = true, | ||
| }) { | ||
| const originalWords = includeOriginalSolution | ||
| ? getWordsFromPieces({ | ||
| pieces, | ||
| gridSize, | ||
| solution: true, | ||
| }) | ||
| : []; | ||
|
|
||
| const grid = getGridFromPieces({pieces, gridSize, solution: false}); | ||
|
|
||
| const horizontalValidityGrid = getHorizontalValidityGrid({ | ||
| grid, | ||
| originalWords, | ||
| }); | ||
|
|
||
| const transposedGrid = transposeGrid(grid); | ||
| const horizontalTransposedValidityGrid = getHorizontalValidityGrid({ | ||
| grid: transposedGrid, | ||
| originalWords, | ||
| }); | ||
| const verticalValidityGrid = transposeGrid(horizontalTransposedValidityGrid); | ||
|
|
||
| return [horizontalValidityGrid, verticalValidityGrid]; | ||
| } |