@logic-pad/core 0.2.1 → 0.2.2

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

@@ -2011,7 +2011,6 @@ declare global {
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
-    private getColor;
     private deltaCoordinate;
     validateSymbol(grid: GridData): State;
     copyWith({ x, y }: { x?: number; y?: number }): this;
@@ -2020,6 +2019,8 @@ declare global {
   export declare abstract class DirectionLinkerBTModule extends BTModule {
     instr: DirectionLinkerSymbol;
     constructor(instr: DirectionLinkerSymbol);
+    private initialPositions;
+    private getInitialPositions;
     checkGlobal(grid: BTGridData): CheckResult | false;
     protected abstract movePos(
       grid: BTGridData,
@@ -2127,6 +2128,8 @@ declare global {
       x: number,
       y: number
     ): Position$1 | null;
+    private getTileSafe;
+    checkGlobal(grid: BTGridData): false | CheckResult;
   }
   export declare class MinesweeperSymbol extends NumberSymbol {
     private static readonly CONFIGS;

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

@@ -50,7 +50,7 @@ class BacktrackSolver extends Solver {
                 });
                 worker.addEventListener('error', (e) => {
                     alert(`Error while solving!\n${e.message}`);
-                    fail(new Error(e.message));
+                    fail(e);
                 });
             });
             for await (const solution of iterator) {

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

@@ -4,6 +4,8 @@ import BTModule, { BTGridData, CheckResult } from '../data.js';
 export default abstract class DirectionLinkerBTModule extends BTModule {
     instr: DirectionLinkerSymbol;
     constructor(instr: DirectionLinkerSymbol);
+    private initialPositions;
+    private getInitialPositions;
     checkGlobal(grid: BTGridData): CheckResult | false;
     protected abstract movePos(grid: BTGridData, x: number, y: number): Position | null;
 }

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

@@ -1,4 +1,4 @@
-import BTModule, { BTTile, IntArray2D, createOneTileResult, } from '../data.js';
+import BTModule, { BTTile, IntArray2D, } from '../data.js';
 export default class DirectionLinkerBTModule extends BTModule {
     constructor(instr) {
         super();
@@ -8,31 +8,108 @@ export default class DirectionLinkerBTModule extends BTModule {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "initialPositions", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         this.instr = instr;
     }
+    getInitialPositions() {
+        if (this.instr.x % 1 !== 0 && this.instr.y % 1 !== 0)
+            return [
+                { x: Math.floor(this.instr.x), y: Math.floor(this.instr.y) },
+                { x: Math.ceil(this.instr.x), y: Math.ceil(this.instr.y) },
+                { x: Math.floor(this.instr.x), y: Math.ceil(this.instr.y) },
+                { x: Math.ceil(this.instr.x), y: Math.floor(this.instr.y) },
+            ];
+        else if (this.instr.x % 1 !== 0)
+            return [
+                { x: Math.floor(this.instr.x), y: this.instr.y },
+                { x: Math.ceil(this.instr.x), y: this.instr.y },
+            ];
+        else if (this.instr.y % 1 !== 0)
+            return [
+                { x: this.instr.x, y: Math.floor(this.instr.y) },
+                { x: this.instr.x, y: Math.ceil(this.instr.y) },
+            ];
+        else
+            return [{ x: this.instr.x, y: this.instr.y }];
+    }
     checkGlobal(grid) {
-        const thisX = Math.floor(this.instr.x);
-        const thisY = Math.floor(this.instr.y);
-        const tile = grid.getTile(thisX, thisY);
-        if (tile === BTTile.Empty)
-            return createOneTileResult(grid, { x: thisX, y: thisY });
+        if (this.initialPositions === null)
+            this.initialPositions = this.getInitialPositions();
         const tilesNeedCheck = IntArray2D.create(grid.width, grid.height);
         const ratings = [];
-        const queue = [{ x: thisX, y: thisY }];
+        let checkable = false;
+        for (const pos of this.initialPositions) {
+            const tile = grid.isInBound(pos.x, pos.y)
+                ? grid.getTile(pos.x, pos.y)
+                : BTTile.NonExist;
+            if (tile === BTTile.Empty) {
+                const oppoPos = this.movePos(grid, pos.x, pos.y);
+                if (oppoPos === null ||
+                    grid.getTile(oppoPos.x, oppoPos.y) === BTTile.NonExist)
+                    return false;
+                else {
+                    tilesNeedCheck.set(pos.x, pos.y, 1);
+                    ratings.push({ pos, score: 1 });
+                }
+            }
+            else if (tile === BTTile.NonExist) {
+                const oppoPos = this.movePos(grid, pos.x, pos.y);
+                if (oppoPos !== null &&
+                    grid.getTile(oppoPos.x, oppoPos.y) !== BTTile.NonExist) {
+                    return false;
+                }
+            }
+            else {
+                const oppoPos = this.movePos(grid, pos.x, pos.y);
+                if (oppoPos !== null) {
+                    const oppoTile = grid.getTile(oppoPos.x, oppoPos.y);
+                    if (oppoTile === BTTile.Empty) {
+                        tilesNeedCheck.set(pos.x, pos.y, 1);
+                        ratings.push({ pos, score: 1 });
+                    }
+                    else if (oppoTile === BTTile.NonExist)
+                        return false;
+                    else
+                        checkable = true;
+                }
+                else {
+                    return false;
+                }
+            }
+        }
+        if (!checkable) {
+            return { tilesNeedCheck, ratings };
+        }
+        const queue = this.initialPositions
+            .filter(pos => grid.isInBound(pos.x, pos.y) &&
+            grid.getTile(pos.x, pos.y) !== BTTile.NonExist)
+            .map(pos => {
+            const oppoPos = this.movePos(grid, pos.x, pos.y);
+            return {
+                pos,
+                color: grid.getTile(pos.x, pos.y),
+                oppoColor: grid.getTile(oppoPos.x, oppoPos.y),
+            };
+        });
         const visited = IntArray2D.create(grid.width, grid.height);
         // Visit all connected tiles
         while (queue.length > 0) {
             const curPos = queue.pop();
-            if (visited.get(curPos.x, curPos.y))
+            if (visited.get(curPos.pos.x, curPos.pos.y))
                 continue;
-            visited.set(curPos.x, curPos.y, 1);
-            const oppoPos = this.movePos(grid, curPos.x, curPos.y);
+            visited.set(curPos.pos.x, curPos.pos.y, 1);
+            const oppoPos = this.movePos(grid, curPos.pos.x, curPos.pos.y);
             if (oppoPos === null)
                 return false;
             const oppoTile = grid.getTile(oppoPos.x, oppoPos.y);
-            if (!(oppoTile === BTTile.Empty || oppoTile === tile))
+            if (!(oppoTile === BTTile.Empty || oppoTile === curPos.oppoColor))
                 return false;
-            for (const edge of grid.getEdges(curPos)) {
+            for (const edge of grid.getEdges(curPos.pos)) {
                 if (visited.get(edge.x, edge.y))
                     continue;
                 const edgeTile = grid.getTile(edge.x, edge.y);
@@ -40,8 +117,12 @@ export default class DirectionLinkerBTModule extends BTModule {
                     tilesNeedCheck.set(edge.x, edge.y, 1);
                     ratings.push({ pos: edge, score: 1 });
                 }
-                else if (edgeTile === tile) {
-                    queue.push(edge);
+                else if (edgeTile === curPos.color) {
+                    queue.push({
+                        pos: edge,
+                        color: curPos.color,
+                        oppoColor: curPos.oppoColor,
+                    });
                 }
             }
         }

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

@@ -1,9 +1,11 @@
 import { Position } from '../../../primitives.js';
 import LotusSymbol from '../../../symbols/lotusSymbol.js';
-import { BTGridData } from '../data.js';
+import { BTGridData, CheckResult } from '../data.js';
 import DirectionLinkerBTModule from './directionLinker.js';
 export default class LotusBTModule extends DirectionLinkerBTModule {
     instr: LotusSymbol;
     constructor(instr: LotusSymbol);
     protected movePos(grid: BTGridData, x: number, y: number): Position | null;
+    private getTileSafe;
+    checkGlobal(grid: BTGridData): false | CheckResult;
 }

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

@@ -1,4 +1,5 @@
 import { Orientation } from '../../../primitives.js';
+import { BTTile } from '../data.js';
 import DirectionLinkerBTModule from './directionLinker.js';
 export default class LotusBTModule extends DirectionLinkerBTModule {
     constructor(instr) {
@@ -33,4 +34,27 @@ export default class LotusBTModule extends DirectionLinkerBTModule {
         }
         return grid.isInBound(pos.x, pos.y) ? pos : null;
     }
+    getTileSafe(grid, x, y) {
+        return grid.isInBound(x, y) ? grid.getTile(x, y) : BTTile.NonExist;
+    }
+    checkGlobal(grid) {
+        if (this.instr.orientation === Orientation.DownLeft ||
+            this.instr.orientation === Orientation.DownRight ||
+            this.instr.orientation === Orientation.UpLeft ||
+            this.instr.orientation === Orientation.UpRight) {
+            if (this.instr.x % 1 === 0 || this.instr.y % 1 === 0)
+                if (this.instr.x % 1 !== 0 || this.instr.y % 1 !== 0) {
+                    if (this.getTileSafe(grid, Math.floor(this.instr.x), Math.floor(this.instr.y)) === BTTile.NonExist &&
+                        this.getTileSafe(grid, Math.ceil(this.instr.x), Math.ceil(this.instr.y)) === BTTile.NonExist &&
+                        this.getTileSafe(grid, Math.floor(this.instr.x), Math.ceil(this.instr.y)) === BTTile.NonExist &&
+                        this.getTileSafe(grid, Math.ceil(this.instr.x), Math.floor(this.instr.y)) === BTTile.NonExist) {
+                        return { tilesNeedCheck: null, ratings: null };
+                    }
+                    else {
+                        return false;
+                    }
+                }
+        }
+        return super.checkGlobal(grid);
+    }
 }

package/dist/data/symbols/directionLinkerSymbol.d.ts

@@ -24,7 +24,6 @@ export default class DirectionLinkerSymbol extends Symbol {
     get explanation(): string;
     get configs(): readonly AnyConfig[] | null;
     createExampleGrid(): GridData;
-    private getColor;
     private deltaCoordinate;
     validateSymbol(grid: GridData): State;
     copyWith({ x, y }: {

package/dist/data/symbols/directionLinkerSymbol.js

@@ -2,6 +2,20 @@ import { ConfigType } from '../config.js';
 import GridData from '../grid.js';
 import { Color, Direction, State } from '../primitives.js';
 import Symbol from './symbol.js';
+function getColor(c, grid) {
+    if (!grid.isPositionValid(c.x, c.y) || !grid.getTile(c.x, c.y).exists) {
+        return null;
+    }
+    return grid.getTile(c.x, c.y).color;
+}
+function makeTurtle(pos1, pos2, grid) {
+    return {
+        pos1,
+        color1: getColor(pos1, grid),
+        pos2,
+        color2: getColor(pos2, grid),
+    };
+}
 class DirectionLinkerSymbol extends Symbol {
     /**
      * **Darts count opposite color cells in that direction**
@@ -51,12 +65,6 @@ class DirectionLinkerSymbol extends Symbol {
     createExampleGrid() {
         return DirectionLinkerSymbol.EXAMPLE_GRID;
     }
-    getColor(c, grid) {
-        if (!grid.isPositionValid(c.x, c.y) || !grid.getTile(c.x, c.y).exists) {
-            return null;
-        }
-        return grid.getTile(c.x, c.y).color;
-    }
     deltaCoordinate(c, direction) {
         return {
             x: c.x + DirectionLinkerSymbol.directionDeltas[direction].dx,
@@ -73,49 +81,56 @@ class DirectionLinkerSymbol extends Symbol {
         // If the color of both are the opposite of the turtle, the turtle doesn't fire any other turtle
         // If no turtle remains, go to final state
         // Final state is State.Satisfied if no gray cell is found, State.Incomplete otherwise
-        const baseColor = grid.getTile(Math.round(this.x), Math.round(this.y)).color;
-        if (baseColor === Color.Gray) {
+        let checkedCouples = this.getInitialCheckedCouples(this.x, this.y, grid);
+        if (checkedCouples.some(({ color1, color2 }) => (color1 === null && color2 !== null) ||
+            (color1 !== null && color2 === null))) {
+            return State.Error;
+        }
+        if (checkedCouples.some(({ color1, color2 }) => color1 === Color.Gray || color2 === Color.Gray)) {
             return State.Incomplete;
         }
-        const checkedCouples = this.getInitialCheckedCouples(this.x, this.y);
-        const queue = checkedCouples.map(([p1, p2]) => [
-            { ...p1 },
-            { ...p2 },
-        ]);
+        checkedCouples = checkedCouples.filter(({ color1, color2 }) => color1 !== null && color2 !== null);
+        const queue = checkedCouples.slice();
         let grayFound = false;
         while (queue.length > 0) {
             const turtle = queue.shift();
-            const [c1, c2] = turtle;
-            const color1 = this.getColor(c1, grid);
-            const color2 = this.getColor(c2, grid);
-            const colorSet = new Set([color1, color2]);
-            if (colorSet.has(null) && !colorSet.has(baseColor)) {
-                colorSet.delete(null);
+            const { pos1, pos2, color1: baseColor1, color2: baseColor2 } = turtle;
+            const color1 = getColor(pos1, grid);
+            const color2 = getColor(pos2, grid);
+            if (color1 === Color.Gray || color2 === Color.Gray) {
+                grayFound = true;
             }
-            if (colorSet.size === 2 && !colorSet.has(Color.Gray)) {
-                return State.Error;
+            else if (color1 === null || color2 === null) {
+                if ((color1 === null && color2 === baseColor2) ||
+                    (color2 === null && color1 === baseColor1)) {
+                    return State.Error;
+                }
             }
-            if (colorSet.has(Color.Gray)) {
-                grayFound = true;
+            else if (color1 !== baseColor1 || color2 !== baseColor2) {
+                if (color1 === baseColor1 || color2 === baseColor2) {
+                    return State.Error;
+                }
             }
-            if (color1 === baseColor) {
+            if (color1 === baseColor1) {
                 const directions = Object.keys(this.linkedDirections);
                 for (const direction of directions) {
-                    const newTurtle = [
-                        this.deltaCoordinate(c1, direction),
-                        this.deltaCoordinate(c2, this.linkedDirections[direction]),
-                    ];
-                    if (checkedCouples.some(([c1, c2]) => c1.x === newTurtle[0].x &&
-                        c1.y === newTurtle[0].y &&
-                        c2.x === newTurtle[1].x &&
-                        c2.y === newTurtle[1].y) ||
-                        (c1.x === newTurtle[1].x &&
-                            c1.y === newTurtle[1].y &&
-                            c2.x === newTurtle[0].x &&
-                            c2.y === newTurtle[0].y)) {
+                    const newTurtle = {
+                        pos1: this.deltaCoordinate(pos1, direction),
+                        pos2: this.deltaCoordinate(pos2, this.linkedDirections[direction]),
+                        color1: baseColor1,
+                        color2: baseColor2,
+                    };
+                    if (checkedCouples.some(({ pos1, pos2 }) => pos1.x === newTurtle.pos1.x &&
+                        pos1.y === newTurtle.pos1.y &&
+                        pos2.x === newTurtle.pos2.x &&
+                        pos2.y === newTurtle.pos2.y) ||
+                        (pos1.x === newTurtle.pos2.x &&
+                            pos1.y === newTurtle.pos2.y &&
+                            pos2.x === newTurtle.pos1.x &&
+                            pos2.y === newTurtle.pos1.y)) {
                         continue;
                     }
-                    checkedCouples.push([newTurtle[0], newTurtle[1]]);
+                    checkedCouples.push(newTurtle);
                     queue.push(newTurtle);
                 }
             }
@@ -125,73 +140,50 @@ class DirectionLinkerSymbol extends Symbol {
     copyWith({ x, y }) {
         return new DirectionLinkerSymbol(x ?? this.x, y ?? this.y);
     }
-    getInitialCheckedCouples(x, y) {
+    getInitialCheckedCouples(x, y, grid) {
         // 1x1
         if (x % 1 === 0 && y % 1 === 0) {
-            return [
-                [
-                    { x, y },
-                    { x, y },
-                ],
-            ];
+            return [makeTurtle({ x, y }, { x, y }, grid)];
         }
         // 1x2
         if (x % 1 === 0) {
             return [
-                [
-                    { x, y: y - 0.5 },
-                    {
-                        x,
-                        y: y +
-                            (this.linkedDirections[Direction.Up] === Direction.Up &&
-                                this.linkedDirections[Direction.Down] === Direction.Down
-                                ? -0.5
-                                : 0.5),
-                    },
-                ],
+                makeTurtle({ x, y: y - 0.5 }, {
+                    x,
+                    y: y +
+                        (this.linkedDirections[Direction.Up] === Direction.Up &&
+                            this.linkedDirections[Direction.Down] === Direction.Down
+                            ? -0.5
+                            : 0.5),
+                }, grid),
             ];
         }
         // 2x1
         if (y % 1 === 0) {
             return [
-                [
-                    { x: x - 0.5, y },
-                    {
-                        x: x +
-                            (this.linkedDirections[Direction.Left] === Direction.Left &&
-                                this.linkedDirections[Direction.Right] === Direction.Right
-                                ? -0.5
-                                : 0.5),
-                        y,
-                    },
-                ],
+                makeTurtle({ x: x - 0.5, y }, {
+                    x: x +
+                        (this.linkedDirections[Direction.Left] === Direction.Left &&
+                            this.linkedDirections[Direction.Right] === Direction.Right
+                            ? -0.5
+                            : 0.5),
+                    y,
+                }, grid),
             ];
         }
         // 2x2
         if (this.linkedDirections[Direction.Left] === Direction.Left &&
             this.linkedDirections[Direction.Right] === Direction.Right) {
             return [
-                [
-                    { x: x - 0.5, y: y - 0.5 },
-                    { x: x - 0.5, y: y + 0.5 },
-                ],
-                [
-                    { x: x + 0.5, y: y - 0.5 },
-                    { x: x + 0.5, y: y + 0.5 },
-                ],
+                makeTurtle({ x: x - 0.5, y: y - 0.5 }, { x: x - 0.5, y: y + 0.5 }, grid),
+                makeTurtle({ x: x + 0.5, y: y - 0.5 }, { x: x + 0.5, y: y + 0.5 }, grid),
             ];
         }
         if (this.linkedDirections[Direction.Up] === Direction.Up &&
             this.linkedDirections[Direction.Down] === Direction.Down) {
             return [
-                [
-                    { x: x - 0.5, y: y - 0.5 },
-                    { x: x + 0.5, y: y - 0.5 },
-                ],
-                [
-                    { x: x - 0.5, y: y + 0.5 },
-                    { x: x + 0.5, y: y + 0.5 },
-                ],
+                makeTurtle({ x: x - 0.5, y: y - 0.5 }, { x: x + 0.5, y: y - 0.5 }, grid),
+                makeTurtle({ x: x - 0.5, y: y + 0.5 }, { x: x + 0.5, y: y + 0.5 }, grid),
             ];
         }
         else if ((this.linkedDirections[Direction.Up] === Direction.Left &&
@@ -199,21 +191,12 @@ class DirectionLinkerSymbol extends Symbol {
             (this.linkedDirections[Direction.Up] === Direction.Right &&
                 this.linkedDirections[Direction.Right] === Direction.Up)) {
             return [
-                [
-                    { x: x - 0.5, y: y - 0.5 },
-                    { x: x - 0.5, y: y - 0.5 },
-                ],
+                makeTurtle({ x: x - 0.5, y: y - 0.5 }, { x: x - 0.5, y: y - 0.5 }, grid),
             ];
         }
         return [
-            [
-                { x: x - 0.5, y: y - 0.5 },
-                { x: x + 0.5, y: y + 0.5 },
-            ],
-            [
-                { x: x - 0.5, y: y + 0.5 },
-                { x: x + 0.5, y: y - 0.5 },
-            ],
+            makeTurtle({ x: x - 0.5, y: y - 0.5 }, { x: x + 0.5, y: y + 0.5 }, grid),
+            makeTurtle({ x: x - 0.5, y: y + 0.5 }, { x: x + 0.5, y: y - 0.5 }, grid),
         ];
     }
 }

package/dist/data/symbols/lotusSymbol.js

@@ -1,6 +1,6 @@
 import { ConfigType } from '../config.js';
 import GridData from '../grid.js';
-import { Direction, Orientation } from '../primitives.js';
+import { Direction, Orientation, State } from '../primitives.js';
 import DirectionLinkerSymbol from './directionLinkerSymbol.js';
 class LotusSymbol extends DirectionLinkerSymbol {
     /**
@@ -67,6 +67,23 @@ class LotusSymbol extends DirectionLinkerSymbol {
         return Object.freeze(GridData.create(['wwbww', 'bwbwb', 'bwwwb', 'bwwwb']).addSymbol(new LotusSymbol(2, 2, Orientation.Up)));
     }
     validateSymbol(grid) {
+        if (this.orientation === Orientation.DownLeft ||
+            this.orientation === Orientation.DownRight ||
+            this.orientation === Orientation.UpLeft ||
+            this.orientation === Orientation.UpRight) {
+            if (this.x % 1 === 0 || this.y % 1 === 0)
+                if (this.x % 1 !== 0 || this.y % 1 !== 0) {
+                    if (!grid.getTile(Math.floor(this.x), Math.floor(this.y)).exists &&
+                        !grid.getTile(Math.ceil(this.x), Math.ceil(this.y)).exists &&
+                        !grid.getTile(Math.floor(this.x), Math.ceil(this.y)).exists &&
+                        !grid.getTile(Math.ceil(this.x), Math.floor(this.y)).exists) {
+                        return State.Satisfied;
+                    }
+                    else {
+                        return State.Error;
+                    }
+                }
+        }
         return super.validateSymbol(grid);
     }
     copyWith({ x, y, orientation, }) {

package/package.json

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