@scrabble-solver/solver 2.8.5 → 2.8.7

package/build/PatternsFiller.js

@@ -9,7 +9,7 @@ class PatternsFiller {
     }
     fill(pattern, tiles) {
         const patterns = [];
-        if (pattern.getNumberOfEmptyCells() > tiles.length) {
+        if (pattern.getEmptyCellsCount() > tiles.length) {
             return [];
         }
         const onPatternFound = (newPattern) => patterns.push(newPattern);

package/build/PatternsGenerator.d.ts

@@ -5,18 +5,18 @@ declare class PatternsGenerator {
     generate(board: Board): Pattern[];
     generateHorizontal(board: Board): HorizontalPattern[];
     generateVertical(board: Board): VerticalPattern[];
-    generatePatterns<P extends Pattern>({ board, getNthVector, numberOfVectors, PatternModel, }: {
+    generatePatterns<P extends Pattern>({ board, getNthVector, vectorsCount, PatternModel, }: {
         board: Board;
         getNthVector: (index: number) => Cell[];
-        numberOfVectors: number;
         PatternModel: new (parameters: {
             board: Board;
             cells: Cell[];
         }) => P;
+        vectorsCount: number;
     }): P[];
-    generateVectors({ getNthVector, numberOfVectors, }: {
+    generateVectors({ getNthVector, vectorsCount, }: {
         getNthVector: (index: number) => Cell[];
-        numberOfVectors: number;
+        vectorsCount: number;
     }): Cell[][];
     generateCellsPatterns<P extends Pattern>({ board, cells, PatternModel, }: {
         board: Board;

package/build/PatternsGenerator.js

@@ -12,25 +12,25 @@ class PatternsGenerator {
         return this.generatePatterns({
             board,
             getNthVector: (index) => board.getRow(index),
-            numberOfVectors: this.config.boardHeight,
             PatternModel: types_1.HorizontalPattern,
+            vectorsCount: this.config.boardHeight,
         });
     }
     generateVertical(board) {
         return this.generatePatterns({
             board,
             getNthVector: (index) => board.getColumn(index),
-            numberOfVectors: this.config.boardWidth,
             PatternModel: types_1.VerticalPattern,
+            vectorsCount: this.config.boardWidth,
         });
     }
-    generatePatterns({ board, getNthVector, numberOfVectors, PatternModel, }) {
-        return this.generateVectors({ getNthVector, numberOfVectors }).reduce((patterns, cells) => {
+    generatePatterns({ board, getNthVector, vectorsCount, PatternModel, }) {
+        return this.generateVectors({ getNthVector, vectorsCount }).reduce((patterns, cells) => {
             return patterns.concat(this.generateCellsPatterns({ board, PatternModel, cells }));
         }, []);
     }
-    generateVectors({ getNthVector, numberOfVectors, }) {
-        return Array(numberOfVectors)
+    generateVectors({ getNthVector, vectorsCount, }) {
+        return Array(vectorsCount)
             .fill(0)
             .map((_, index) => getNthVector(index));
     }

package/build/ScoresCalculator.js

@@ -18,7 +18,7 @@ class ScoresCalculator {
         return this.calculatePatternScoreWithCollisions(pattern) + this.calculateBonusScore(pattern);
     }
     calculateBonusScore(pattern) {
-        const areAllTilesUsed = pattern.getNumberOfEmptyCells() === this.config.maximumNumberOfCharacters;
+        const areAllTilesUsed = pattern.getEmptyCellsCount() === this.config.maximumCharactersCount;
         return areAllTilesUsed ? this.config.allTilesBonusScore : 0;
     }
     calculatePatternScoreWithCollisions(pattern) {

package/build/Solver.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@scrabble-solver/types");
-const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
+const getUniquePatterns_1 = __importDefault(require("./getUniquePatterns"));
 const PatternsFiller_1 = __importDefault(require("./PatternsFiller"));
 const PatternsGenerator_1 = __importDefault(require("./PatternsGenerator"));
 const ScoresCalculator_1 = __importDefault(require("./ScoresCalculator"));
@@ -17,11 +17,11 @@ class Solver {
     solve(board, tiles) {
         const patterns = this.patternsGenerator.generate(board);
         const filledPatterns = patterns.flatMap((pattern) => this.patternsFiller.fill(pattern, tiles));
-        const uniquePatterns = (0, uniqBy_1.default)(filledPatterns, (pattern) => JSON.stringify(pattern.toJson()));
+        const uniquePatterns = (0, getUniquePatterns_1.default)(filledPatterns);
         const results = uniquePatterns.map((pattern, index) => new types_1.Result({
             cells: pattern.cells,
+            collisions: pattern.getCollisions().map((collision) => collision.cells),
             id: index,
-            numberOfCollisions: pattern.getCollisions().length,
             points: this.scoresCalculator.calculate(pattern),
         }));
         return results;

package/build/getUniquePatterns.d.ts

@@ -0,0 +1,3 @@
+import { Pattern } from '@scrabble-solver/types';
+declare const getUniquePatterns: (patterns: Pattern[]) => Pattern[];
+export default getUniquePatterns;

package/build/getUniquePatterns.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const getPatternHash = (pattern) => {
+    return pattern.cells
+        .map((cell) => {
+        const blank = cell.tile.isBlank ? '!' : '';
+        const tile = cell.tile.character + blank;
+        // eslint-disable-next-line prefer-template
+        return cell.x + ',' + cell.y + ',' + tile;
+    })
+        .join('-');
+};
+const getUniquePatterns = (patterns) => {
+    const hashes = new Set();
+    const uniquePatterns = [];
+    for (const pattern of patterns) {
+        const hash = getPatternHash(pattern);
+        if (!hashes.has(hash)) {
+            hashes.add(hash);
+            uniquePatterns.push(pattern);
+        }
+    }
+    return uniquePatterns;
+};
+exports.default = getUniquePatterns;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -25,14 +25,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^2.0.0",
-    "@scrabble-solver/types": "^2.8.5",
-    "lodash": "^4.17.21"
+    "@scrabble-solver/types": "^2.8.7"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.8.5",
-    "@scrabble-solver/constants": "^2.8.5",
-    "@scrabble-solver/dictionaries": "^2.8.5",
-    "@types/lodash": "^4.14.186"
+    "@scrabble-solver/configs": "^2.8.7",
+    "@scrabble-solver/constants": "^2.8.7",
+    "@scrabble-solver/dictionaries": "^2.8.7"
   },
-  "gitHead": "79ba3664458e7dc8d805599a3cf3cd1faba86309"
+  "gitHead": "879bf9b68f27fa3d530d0582fd8fbbcd5c8b150b"
 }

package/src/PatternsFiller.ts

@@ -15,7 +15,7 @@ class PatternsFiller {
   public fill(pattern: Pattern, tiles: Tile[]): Pattern[] {
     const patterns: Pattern[] = [];
 
-    if (pattern.getNumberOfEmptyCells() > tiles.length) {
+    if (pattern.getEmptyCellsCount() > tiles.length) {
       return [];
     }
 

package/src/PatternsGenerator.test.ts

@@ -8,7 +8,7 @@ const board = Board.fromStringArray([' t ', 'do ', '   ']);
 const patternsGenerator = new PatternsGenerator({
   boardHeight: 3,
   boardWidth: 3,
-  maximumNumberOfCharacters: 7,
+  maximumCharactersCount: 7,
 } as Config);
 
 describe('PatternsGenerator', () => {
@@ -45,7 +45,7 @@ describe('PatternsGenerator', () => {
   it('generates vectors', () => {
     const vectors = patternsGenerator.generateVectors({
       getNthVector: () => [],
-      numberOfVectors: 3,
+      vectorsCount: 3,
     });
     expect(vectors.length).toBe(3);
     expect(vectors).toEqual([[], [], []]);

package/src/PatternsGenerator.ts

@@ -15,8 +15,8 @@ class PatternsGenerator {
     return this.generatePatterns({
       board,
       getNthVector: (index) => board.getRow(index),
-      numberOfVectors: this.config.boardHeight,
       PatternModel: HorizontalPattern,
+      vectorsCount: this.config.boardHeight,
     });
   }
 
@@ -24,35 +24,35 @@ class PatternsGenerator {
     return this.generatePatterns({
       board,
       getNthVector: (index) => board.getColumn(index),
-      numberOfVectors: this.config.boardWidth,
       PatternModel: VerticalPattern,
+      vectorsCount: this.config.boardWidth,
     });
   }
 
   public generatePatterns<P extends Pattern>({
     board,
     getNthVector,
-    numberOfVectors,
+    vectorsCount,
     PatternModel,
   }: {
     board: Board;
     getNthVector: (index: number) => Cell[];
-    numberOfVectors: number;
     PatternModel: new (parameters: { board: Board; cells: Cell[] }) => P;
+    vectorsCount: number;
   }): P[] {
-    return this.generateVectors({ getNthVector, numberOfVectors }).reduce<P[]>((patterns, cells) => {
+    return this.generateVectors({ getNthVector, vectorsCount }).reduce<P[]>((patterns, cells) => {
       return patterns.concat(this.generateCellsPatterns<P>({ board, PatternModel, cells }));
     }, []);
   }
 
   public generateVectors({
     getNthVector,
-    numberOfVectors,
+    vectorsCount,
   }: {
     getNthVector: (index: number) => Cell[];
-    numberOfVectors: number;
+    vectorsCount: number;
   }): Cell[][] {
-    return Array(numberOfVectors)
+    return Array(vectorsCount)
       .fill(0)
       .map((_, index) => getNthVector(index));
   }

package/src/ScoresCalculator.ts

@@ -13,7 +13,7 @@ class ScoresCalculator {
   }
 
   public calculateBonusScore(pattern: Pattern): number {
-    const areAllTilesUsed = pattern.getNumberOfEmptyCells() === this.config.maximumNumberOfCharacters;
+    const areAllTilesUsed = pattern.getEmptyCellsCount() === this.config.maximumCharactersCount;
     return areAllTilesUsed ? this.config.allTilesBonusScore : 0;
   }
 

package/src/Solver.ts

@@ -1,7 +1,7 @@
 import { Trie } from '@kamilmielnik/trie';
 import { Board, Config, Result, Tile } from '@scrabble-solver/types';
-import uniqBy from 'lodash/uniqBy';
 
+import getUniquePatterns from './getUniquePatterns';
 import PatternsFiller from './PatternsFiller';
 import PatternsGenerator from './PatternsGenerator';
 import ScoresCalculator from './ScoresCalculator';
@@ -22,13 +22,13 @@ class Solver {
   public solve(board: Board, tiles: Tile[]): Result[] {
     const patterns = this.patternsGenerator.generate(board);
     const filledPatterns = patterns.flatMap((pattern) => this.patternsFiller.fill(pattern, tiles));
-    const uniquePatterns = uniqBy(filledPatterns, (pattern) => JSON.stringify(pattern.toJson()));
+    const uniquePatterns = getUniquePatterns(filledPatterns);
     const results = uniquePatterns.map(
       (pattern, index) =>
         new Result({
           cells: pattern.cells,
+          collisions: pattern.getCollisions().map((collision) => collision.cells),
           id: index,
-          numberOfCollisions: pattern.getCollisions().length,
           points: this.scoresCalculator.calculate(pattern),
         }),
     );

package/src/getUniquePatterns.ts

@@ -0,0 +1,30 @@
+import { Pattern } from '@scrabble-solver/types';
+
+const getPatternHash = (pattern: Pattern): string => {
+  return pattern.cells
+    .map((cell) => {
+      const blank = cell.tile.isBlank ? '!' : '';
+      const tile = cell.tile.character + blank;
+      // eslint-disable-next-line prefer-template
+      return cell.x + ',' + cell.y + ',' + tile;
+    })
+    .join('-');
+};
+
+const getUniquePatterns = (patterns: Pattern[]): Pattern[] => {
+  const hashes = new Set<string>();
+  const uniquePatterns: Pattern[] = [];
+
+  for (const pattern of patterns) {
+    const hash = getPatternHash(pattern);
+
+    if (!hashes.has(hash)) {
+      hashes.add(hash);
+      uniquePatterns.push(pattern);
+    }
+  }
+
+  return uniquePatterns;
+};
+
+export default getUniquePatterns;