@logic-pad/core 0.1.4 → 0.1.6

package/assets/logic-core.global.d.ts

@@ -1801,7 +1801,7 @@ declare global {
   export declare class BanPatternBTModule extends BTModule {
     instr: BanPatternRule;
     constructor(instr: BanPatternRule);
-    checkGlobal(_: BTGridData): CheckResult | false;
+    checkGlobal(grid: BTGridData): CheckResult | false;
     checkLocal(grid: BTGridData, positions: Position$1[]): CheckResult | false;
   }
   export declare class CellCountBTModule extends BTModule {
@@ -1939,7 +1939,6 @@ declare global {
   }
   export declare class DartBTModule extends BTModule {
     instr: DartSymbol;
-    private cachedCheckResult?;
     constructor(instr: DartSymbol);
     checkGlobal(grid: BTGridData): CheckResult | false;
     private buildCheckAndRating;

package/dist/data/solver/backtrack/backtrackWorker.js

@@ -218,13 +218,13 @@ function solveNormal(input, solutionFn) {
 }
 function solveUnderclued(input) {
     let grid = input;
-    let count = 0;
+    // let count = 0;
     const possibles = array(grid.width, grid.height, () => ({
         dark: false,
         light: false,
     }));
     function search(x, y, tile, color) {
-        count++;
+        // count++;
         // console.log(`Trying (${x}, ${y}) with ${color}`);
         const newGrid = grid.setTile(x, y, tile.withColor(color));
         // Solve
@@ -263,7 +263,7 @@ function solveUnderclued(input) {
                 grid = grid.setTile(x, y, tile.withColor(Color.Light));
         }
     }
-    console.log(`Solve count: ${count}`);
+    // console.log(`Solve count: ${count}`);
     return grid;
 }
 function solve(grid, solutionFn) {
@@ -278,16 +278,15 @@ function solve(grid, solutionFn) {
 }
 onmessage = e => {
     const grid = Serializer.parseGrid(e.data);
-    console.time('Solve time');
+    // console.time('Solve time');
     let count = 0;
     solve(grid, solution => {
-        if (count === 0)
-            console.timeLog('Solve time', 'First solution');
+        // if (count === 0) console.timeLog('Solve time', 'First solution');
         postMessage(Serializer.stringifyGrid(solution));
         count += 1;
         return count < 2;
     });
-    console.timeEnd('Solve time');
+    // console.timeEnd('Solve time');
     postMessage(null);
 };
 // make typescript happy

package/dist/data/solver/backtrack/rules/banPattern.d.ts

@@ -4,6 +4,6 @@ import BTModule, { BTGridData, CheckResult } from '../data.js';
 export default class BanPatternBTModule extends BTModule {
     instr: BanPatternRule;
     constructor(instr: BanPatternRule);
-    checkGlobal(_: BTGridData): CheckResult | false;
+    checkGlobal(grid: BTGridData): CheckResult | false;
     checkLocal(grid: BTGridData, positions: Position[]): CheckResult | false;
 }

package/dist/data/solver/backtrack/rules/banPattern.js

@@ -10,8 +10,24 @@ export default class BanPatternBTModule extends BTModule {
         });
         this.instr = instr;
     }
-    checkGlobal(_) {
-        // TODO: Impl this properly
+    checkGlobal(grid) {
+        for (const pattern of this.instr.cache) {
+            for (let y = 0; y <= grid.height - pattern.height; y++) {
+                for (let x = 0; x <= grid.width - pattern.width; x++) {
+                    let match = true;
+                    for (const tile of pattern.elements) {
+                        const t = grid.getTile(x + tile.x, y + tile.y);
+                        if (t !== colorToBTTile(tile.color)) {
+                            match = false;
+                            break;
+                        }
+                    }
+                    if (match) {
+                        return false;
+                    }
+                }
+            }
+        }
         return { tilesNeedCheck: null, ratings: null };
     }
     checkLocal(grid, positions) {

package/dist/data/solver/backtrack/symbols/dart.d.ts

@@ -2,7 +2,6 @@ import DartSymbol from '../../../symbols/dartSymbol.js';
 import BTModule, { BTGridData, CheckResult } from '../data.js';
 export default class DartBTModule extends BTModule {
     instr: DartSymbol;
-    private cachedCheckResult?;
     constructor(instr: DartSymbol);
     checkGlobal(grid: BTGridData): CheckResult | false;
     private buildCheckAndRating;

package/dist/data/solver/backtrack/symbols/dart.js

@@ -9,12 +9,6 @@ export default class DartBTModule extends BTModule {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "cachedCheckResult", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.instr = instr;
     }
     checkGlobal(grid) {
@@ -38,9 +32,7 @@ export default class DartBTModule extends BTModule {
         }
         if (completed + empty < this.instr.number)
             return false;
-        if (!this.cachedCheckResult)
-            this.cachedCheckResult = this.buildCheckAndRating(grid);
-        return this.cachedCheckResult;
+        return this.buildCheckAndRating(grid);
     }
     buildCheckAndRating(grid) {
         const tilesNeedCheck = IntArray2D.create(grid.width, grid.height);

package/dist/data/solver/underclued/undercluedSolver.js

@@ -26,14 +26,14 @@ export default class UndercluedSolver extends Solver {
             const solved = await new Promise(resolve => {
                 worker.addEventListener('message', e => {
                     const solution = Serializer.parseGrid(e.data);
-                    console.timeEnd('Solve time');
+                    // console.timeEnd('Solve time');
                     if (solution.resetTiles().equals(solution))
                         resolve(null);
                     else
                         resolve(solution);
                 });
                 worker.postMessage(Serializer.stringifyGrid(grid));
-                console.time('Solve time');
+                // console.time('Solve time');
             });
             yield solved;
             if (solved) {

package/dist/data/solver/underclued/undercluedWorker.js

@@ -70,18 +70,20 @@ function computeSolution(initialGrid) {
     let anyNewGrid;
     while (assumptions.length > 0 || lastValidGrid.length === 0) {
         [currentGrid, assumptions, anyNewGrid] = getValidGrid(currentGrid, assumptions, canAssump);
-        console.log(currentGrid.tiles
-            .map(row => row
-            .map(t => {
-            const color = t.color === Color.Light ? 'w' : 'b';
-            if (t.color === Color.Gray)
-                return 'n';
-            if (!t.exists)
-                return '.';
-            return t.fixed ? color.toUpperCase() : color;
-        })
-            .join(''))
-            .join('\n'));
+        // console.log(
+        //   currentGrid.tiles
+        //     .map(row =>
+        //       row
+        //         .map(t => {
+        //           const color = t.color === Color.Light ? 'w' : 'b';
+        //           if (t.color === Color.Gray) return 'n';
+        //           if (!t.exists) return '.';
+        //           return t.fixed ? color.toUpperCase() : color;
+        //         })
+        //         .join('')
+        //     )
+        //     .join('\n')
+        // );
         if (!anyNewGrid) {
             break;
         }
@@ -105,18 +107,20 @@ function computeSolution(initialGrid) {
         const coords = posToCoords(i, solutionGrid.width);
         solutionGrid = solutionGrid.setTile(coords[0], coords[1], tile => tile.withColor(color));
     });
-    console.log(solutionGrid.tiles
-        .map(row => row
-        .map(t => {
-        const color = t.color === Color.Light ? 'w' : 'b';
-        if (t.color === Color.Gray)
-            return 'n';
-        if (!t.exists)
-            return '.';
-        return t.fixed ? color.toUpperCase() : color;
-    })
-        .join(''))
-        .join('\n'));
+    // console.log(
+    //   solutionGrid.tiles
+    //     .map(row =>
+    //       row
+    //         .map(t => {
+    //           const color = t.color === Color.Light ? 'w' : 'b';
+    //           if (t.color === Color.Gray) return 'n';
+    //           if (!t.exists) return '.';
+    //           return t.fixed ? color.toUpperCase() : color;
+    //         })
+    //         .join('')
+    //     )
+    //     .join('\n')
+    // );
     return solutionGrid;
 }
 onmessage = e => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logic-pad/core",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "files": [
     "dist",