@cubingcenter/scrambler 0.6.3 → 0.8.0

package/dist-cjs/puzzles/cube3/solver/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookupCube3MoveTable = exports.loadCube3SolverTables = exports.loadCube3Phase2Tables = exports.loadCube3Phase1Tables = exports.generateCube3SolverTables = exports.generateCube3PruningTable = exports.generateCube3MoveTable = exports.generateCube3Phase2Tables = exports.generateCube3Phase1Tables = exports.checksum = exports.CUBE3_PHASE2_MOVES = exports.CUBE3_PHASE1_MOVES = exports.CUBE3_SOLVER_TABLE_METADATA = exports.moveCoordinate = exports.encodeUdSlice = exports.encodeUdEdgePermutation = exports.encodeSlicePermutation = exports.encodePermutation = exports.encodeEdgeOrientation = exports.encodeCube3Coordinates = exports.encodeCornerOrientation = exports.encodeCube3Coordinate = exports.decodeUdSlice = exports.decodeUdEdgePermutation = exports.decodeSlicePermutation = exports.decodePermutation = exports.decodeEdgeOrientation = exports.decodeCornerOrientation = exports.createRepresentativeStateForCoordinate = exports.CUBE3_COORDINATE_RANGES = exports.Cube3Phase1SearchError = exports.solveCube3Phase1 = exports.isCube3Phase1Solved = exports.encodeCube3Phase1Coordinates = exports.applyCube3Phase1Moves = exports.Cube3Phase2SearchError = exports.solveCube3State = exports.solveCube3Phase2 = exports.isCube3Phase2Solved = exports.encodeCube3Phase2Coordinates = exports.applyCube3Phase2Moves = void 0;
+exports.lookupCube3MoveTable = exports.loadCube3SolverTables = exports.loadCube3Phase2Tables = exports.loadCube3Phase1Tables = exports.generateCube3SolverTables = exports.generateCube3PruningTable = exports.generateCube3MoveTable = exports.generateCube3Phase2Tables = exports.generateCube3Phase1Tables = exports.checksum = exports.CUBE3_PHASE2_MOVES = exports.CUBE3_PHASE1_MOVES = exports.CUBE3_SOLVER_TABLE_METADATA = exports.moveCoordinate = exports.encodeUdSlice = exports.encodeUdEdgePermutation = exports.encodeSlicePermutation = exports.encodePermutation = exports.encodeEdgeOrientation = exports.encodeCube3Coordinates = exports.encodeCornerOrientation = exports.encodeCube3Coordinate = exports.decodeUdSlice = exports.decodeUdEdgePermutation = exports.decodeSlicePermutation = exports.decodePermutation = exports.decodeEdgeOrientation = exports.decodeCornerOrientation = exports.createRepresentativeStateForCoordinate = exports.CUBE3_COORDINATE_RANGES = exports.rotateCube3AlgorithmBySequence = exports.rotateCube3Algorithm = exports.invertCube3RotationSequence = exports.CUBE3_ROTATION_INVERSE = exports.CUBE3_ORIENTATIONS_24 = exports.Cube3Phase1SearchError = exports.solveCube3Phase1 = exports.isCube3Phase1Solved = exports.encodeCube3Phase1Coordinates = exports.collectCube3Phase1Solutions = exports.applyCube3Phase1Moves = exports.Cube3Phase2SearchError = exports.solveCube3State = exports.solveCube3Phase2 = exports.isCube3Phase2Solved = exports.encodeCube3Phase2Coordinates = exports.applyCube3Phase2Moves = void 0;
 var phase2_js_1 = require("./phase2.js");
 Object.defineProperty(exports, "applyCube3Phase2Moves", { enumerable: true, get: function () { return phase2_js_1.applyCube3Phase2Moves; } });
 Object.defineProperty(exports, "encodeCube3Phase2Coordinates", { enumerable: true, get: function () { return phase2_js_1.encodeCube3Phase2Coordinates; } });
@@ -10,10 +10,17 @@ Object.defineProperty(exports, "solveCube3State", { enumerable: true, get: funct
 Object.defineProperty(exports, "Cube3Phase2SearchError", { enumerable: true, get: function () { return phase2_js_1.Cube3Phase2SearchError; } });
 var phase1_js_1 = require("./phase1.js");
 Object.defineProperty(exports, "applyCube3Phase1Moves", { enumerable: true, get: function () { return phase1_js_1.applyCube3Phase1Moves; } });
+Object.defineProperty(exports, "collectCube3Phase1Solutions", { enumerable: true, get: function () { return phase1_js_1.collectCube3Phase1Solutions; } });
 Object.defineProperty(exports, "encodeCube3Phase1Coordinates", { enumerable: true, get: function () { return phase1_js_1.encodeCube3Phase1Coordinates; } });
 Object.defineProperty(exports, "isCube3Phase1Solved", { enumerable: true, get: function () { return phase1_js_1.isCube3Phase1Solved; } });
 Object.defineProperty(exports, "solveCube3Phase1", { enumerable: true, get: function () { return phase1_js_1.solveCube3Phase1; } });
 Object.defineProperty(exports, "Cube3Phase1SearchError", { enumerable: true, get: function () { return phase1_js_1.Cube3Phase1SearchError; } });
+var symmetry_js_1 = require("./symmetry.js");
+Object.defineProperty(exports, "CUBE3_ORIENTATIONS_24", { enumerable: true, get: function () { return symmetry_js_1.CUBE3_ORIENTATIONS_24; } });
+Object.defineProperty(exports, "CUBE3_ROTATION_INVERSE", { enumerable: true, get: function () { return symmetry_js_1.CUBE3_ROTATION_INVERSE; } });
+Object.defineProperty(exports, "invertCube3RotationSequence", { enumerable: true, get: function () { return symmetry_js_1.invertCube3RotationSequence; } });
+Object.defineProperty(exports, "rotateCube3Algorithm", { enumerable: true, get: function () { return symmetry_js_1.rotateCube3Algorithm; } });
+Object.defineProperty(exports, "rotateCube3AlgorithmBySequence", { enumerable: true, get: function () { return symmetry_js_1.rotateCube3AlgorithmBySequence; } });
 var coordinates_js_1 = require("./coordinates.js");
 Object.defineProperty(exports, "CUBE3_COORDINATE_RANGES", { enumerable: true, get: function () { return coordinates_js_1.CUBE3_COORDINATE_RANGES; } });
 Object.defineProperty(exports, "createRepresentativeStateForCoordinate", { enumerable: true, get: function () { return coordinates_js_1.createRepresentativeStateForCoordinate; } });

package/dist-cjs/puzzles/cube3/solver/node-loader.js

@@ -71,9 +71,16 @@ function readMoveTable(assetDirectory, entry) {
     if (buffer.length !== expectedBytes) {
         throw new Error(`Invalid byte size for ${entry.coordinate} move table.`);
     }
-    const values = new Int32Array(entry.range * entry.moves.length);
+    // Every coordinate fits in 16 bits (max range 40320): store half the
+    // bytes the int32 wire format uses. Checksums are order-sensitive FNV
+    // over the same numeric sequence, so they still match the manifest.
+    const values = new Uint16Array(entry.range * entry.moves.length);
     for (let index = 0; index < values.length; index += 1) {
-        values[index] = buffer.readInt32LE(index * 4);
+        const value = buffer.readInt32LE(index * 4);
+        if (value < 0 || value > 0xffff) {
+            throw new Error(`Move table value out of range for ${entry.coordinate}: ${value}.`);
+        }
+        values[index] = value;
     }
     const table = {
         coordinate: entry.coordinate,

package/dist-cjs/puzzles/cube3/solver/phase1.js

@@ -5,6 +5,7 @@ exports.solveCube3Phase1 = solveCube3Phase1;
 exports.encodeCube3Phase1Coordinates = encodeCube3Phase1Coordinates;
 exports.isCube3Phase1Solved = isCube3Phase1Solved;
 exports.applyCube3Phase1Moves = applyCube3Phase1Moves;
+exports.collectCube3Phase1Solutions = collectCube3Phase1Solutions;
 const moves_js_1 = require("../moves.js");
 const coordinates_js_1 = require("./coordinates.js");
 const tables_js_1 = require("./tables.js");
@@ -36,14 +37,7 @@ async function solveCube3Phase1(state, options = {}) {
     const maxDepth = options.maxDepth ?? 12;
     const start = encodeCube3Phase1Coordinates(state);
     const deadline = options.timeoutMs === undefined ? undefined : performance.now() + options.timeoutMs;
-    const context = {
-        tables,
-        jointTables,
-        maxDepth,
-        deadline,
-        visitedNodes: 0,
-        timedOut: false
-    };
+    const context = createPhase1SearchContext(tables, jointTables, maxDepth, deadline, options.maxNodes);
     if (await isCube3Phase1Solved(start, tables)) {
         return {
             moves: [],
@@ -85,6 +79,9 @@ async function solveCube3Phase1(state, options = {}) {
                 visitedNodes: context.visitedNodes
             };
         }
+        if (context.nodesExceeded) {
+            throw new Cube3Phase1SearchError(`3x3 Phase 1 node budget exceeded (${options.maxNodes} nodes).`, context.visitedNodes);
+        }
         if (context.timedOut) {
             throw new Cube3Phase1SearchError(`3x3 Phase 1 search timed out after ${options.timeoutMs}ms.`, context.visitedNodes);
         }
@@ -115,8 +112,17 @@ const PHASE1_MOVE_FACES = tables_js_1.CUBE3_PHASE1_MOVES.map((move) => {
 });
 function searchPhase1(cornerOrientation, edgeOrientation, udSlice, previousFace, previousPreviousFace, remainingDepth, path, context) {
     context.visitedNodes += 1;
-    if (context.deadline !== undefined && (context.visitedNodes & 1023) === 0 && performance.now() > context.deadline) {
+    if (context.nodeCap !== undefined &&
+        context.visitedNodes > context.nodeCap) {
+        context.nodesExceeded = true;
+    }
+    if (!context.nodesExceeded &&
+        context.deadline !== undefined &&
+        (context.visitedNodes & 1023) === 0 &&
+        performance.now() > context.deadline) {
         context.timedOut = true;
+    }
+    if (context.timedOut || context.nodesExceeded) {
         return false;
     }
     if (remainingDepth === 0) {
@@ -124,6 +130,68 @@ function searchPhase1(cornerOrientation, edgeOrientation, udSlice, previousFace,
             edgeOrientation === 0 &&
             udSlice === context.tables.moveTables.udSlice.solvedCoordinate;
     }
+    const moveCount = context.tables.phase1Moves.length;
+    const childCount = collectPhase1Children(cornerOrientation, edgeOrientation, udSlice, previousFace, previousPreviousFace, remainingDepth, context);
+    const slot = remainingDepth * moveCount;
+    const scratchMove = context.scratchMove;
+    const scratchCo = context.scratchCo;
+    const scratchEo = context.scratchEo;
+    const scratchUd = context.scratchUd;
+    for (let i = 0; i < childCount; i += 1) {
+        const moveIndex = scratchMove[slot + i];
+        const face = PHASE1_MOVE_FACES[moveIndex];
+        path.push(context.tables.phase1Moves[moveIndex]);
+        if (searchPhase1(scratchCo[slot + i], scratchEo[slot + i], scratchUd[slot + i], face, previousFace, remainingDepth - 1, path, context)) {
+            return true;
+        }
+        path.pop();
+        if (context.timedOut || context.nodesExceeded) {
+            return false;
+        }
+    }
+    return false;
+}
+/**
+ * Enumerates up to `limit` phase-1 solutions of exactly `depth` moves for
+ * the given state, most promising first (same ordered DFS as the search).
+ * Used to try several G1 landing states and keep the best phase-1+phase-2
+ * total — a slightly longer phase 1 often collapses phase 2.
+ */
+async function collectCube3Phase1Solutions(state, depth, options = {}) {
+    const tables = options.tables ?? await (0, tables_js_1.loadCube3Phase1Tables)();
+    const jointTables = options.jointTables ?? tables.jointTables;
+    const limit = options.limit ?? 32;
+    const deadline = options.timeoutMs === undefined ? undefined : performance.now() + options.timeoutMs;
+    const context = createPhase1SearchContext(tables, jointTables, depth, deadline, options.maxNodes);
+    const start = encodeCube3Phase1Coordinates(state);
+    const solutions = [];
+    searchPhase1Collect(start.cornerOrientation, start.edgeOrientation, start.udSlice, -1, -1, depth, [], solutions, limit, context);
+    return { solutions, visitedNodes: context.visitedNodes };
+}
+function createPhase1SearchContext(tables, jointTables, maxDepth, deadline, nodeCap) {
+    const scratchLevels = maxDepth + 1;
+    const scratchSize = scratchLevels * tables_js_1.CUBE3_PHASE1_MOVES.length;
+    return {
+        tables,
+        jointTables,
+        maxDepth,
+        deadline,
+        nodeCap,
+        visitedNodes: 0,
+        timedOut: false,
+        nodesExceeded: false,
+        scratchMove: new Int32Array(scratchSize),
+        scratchBound: new Int32Array(scratchSize),
+        scratchCo: new Int32Array(scratchSize),
+        scratchEo: new Int32Array(scratchSize),
+        scratchUd: new Int32Array(scratchSize)
+    };
+}
+/**
+ * Fills the scratch slot for `remainingDepth` with the surviving children
+ * in ascending lower-bound order (stable). Returns the child count.
+ */
+function collectPhase1Children(cornerOrientation, edgeOrientation, udSlice, previousFace, previousPreviousFace, remainingDepth, context) {
     const moveCount = context.tables.phase1Moves.length;
     const validMoves = PHASE1_VALID_MOVES[previousFace + 1][previousPreviousFace + 1];
     const coTable = context.tables.moveTables.cornerOrientation.values;
@@ -131,9 +199,17 @@ function searchPhase1(cornerOrientation, edgeOrientation, udSlice, previousFace,
     const udTable = context.tables.moveTables.udSlice.values;
     const coeoTable = context.tables.pruningTables.cornerOrientationEdgeOrientation.values;
     const udPruningTable = context.tables.pruningTables.udSlice.values;
+    const jointTables = context.jointTables;
     const coOffset = cornerOrientation * moveCount;
     const eoOffset = edgeOrientation * moveCount;
     const udOffset = udSlice * moveCount;
+    const slot = remainingDepth * moveCount;
+    const scratchMove = context.scratchMove;
+    const scratchBound = context.scratchBound;
+    const scratchCo = context.scratchCo;
+    const scratchEo = context.scratchEo;
+    const scratchUd = context.scratchUd;
+    let childCount = 0;
     for (let i = 0; i < validMoves.length; i += 1) {
         const moveIndex = validMoves[i];
         const nextCornerOrientation = coTable[coOffset + moveIndex];
@@ -146,7 +222,6 @@ function searchPhase1(cornerOrientation, edgeOrientation, udSlice, previousFace,
         if (nextLowerBound > remainingDepth - 1) {
             continue;
         }
-        const jointTables = context.jointTables;
         if (jointTables) {
             const udCoIndex = nextUdSlice * 2187 + nextCornerOrientation;
             const jc = (jointTables.jointUdCo[udCoIndex >> 1] >> ((udCoIndex & 1) << 2)) & 0x0f;
@@ -162,14 +237,81 @@ function searchPhase1(cornerOrientation, edgeOrientation, udSlice, previousFace,
                 continue;
             }
         }
+        scratchMove[slot + childCount] = moveIndex;
+        scratchBound[slot + childCount] = nextLowerBound;
+        scratchCo[slot + childCount] = nextCornerOrientation;
+        scratchEo[slot + childCount] = nextEdgeOrientation;
+        scratchUd[slot + childCount] = nextUdSlice;
+        childCount += 1;
+    }
+    // Stable insertion sort by bound (n <= 18; ties keep reference order).
+    for (let i = 1; i < childCount; i += 1) {
+        const move = scratchMove[slot + i];
+        const bound = scratchBound[slot + i];
+        const co = scratchCo[slot + i];
+        const eo = scratchEo[slot + i];
+        const ud = scratchUd[slot + i];
+        let j = i - 1;
+        while (j >= 0 && scratchBound[slot + j] > bound) {
+            scratchMove[slot + j + 1] = scratchMove[slot + j];
+            scratchBound[slot + j + 1] = scratchBound[slot + j];
+            scratchCo[slot + j + 1] = scratchCo[slot + j];
+            scratchEo[slot + j + 1] = scratchEo[slot + j];
+            scratchUd[slot + j + 1] = scratchUd[slot + j];
+            j -= 1;
+        }
+        scratchMove[slot + j + 1] = move;
+        scratchBound[slot + j + 1] = bound;
+        scratchCo[slot + j + 1] = co;
+        scratchEo[slot + j + 1] = eo;
+        scratchUd[slot + j + 1] = ud;
+    }
+    return childCount;
+}
+/**
+ * Ordered exact-depth DFS that collects solutions instead of stopping at
+ * the first one. Returns true when collection should stop (limit reached
+ * or timed out).
+ */
+function searchPhase1Collect(cornerOrientation, edgeOrientation, udSlice, previousFace, previousPreviousFace, remainingDepth, path, solutions, limit, context) {
+    context.visitedNodes += 1;
+    if (context.nodeCap !== undefined &&
+        context.visitedNodes > context.nodeCap) {
+        context.nodesExceeded = true;
+    }
+    if (!context.nodesExceeded &&
+        context.deadline !== undefined &&
+        (context.visitedNodes & 1023) === 0 &&
+        performance.now() > context.deadline) {
+        context.timedOut = true;
+    }
+    if (context.timedOut || context.nodesExceeded) {
+        return true;
+    }
+    if (remainingDepth === 0) {
+        if (cornerOrientation === 0 &&
+            edgeOrientation === 0 &&
+            udSlice === context.tables.moveTables.udSlice.solvedCoordinate) {
+            solutions.push([...path]);
+            return solutions.length >= limit;
+        }
+        return false;
+    }
+    const moveCount = context.tables.phase1Moves.length;
+    const childCount = collectPhase1Children(cornerOrientation, edgeOrientation, udSlice, previousFace, previousPreviousFace, remainingDepth, context);
+    const slot = remainingDepth * moveCount;
+    const scratchMove = context.scratchMove;
+    const scratchCo = context.scratchCo;
+    const scratchEo = context.scratchEo;
+    const scratchUd = context.scratchUd;
+    for (let i = 0; i < childCount; i += 1) {
+        const moveIndex = scratchMove[slot + i];
         const face = PHASE1_MOVE_FACES[moveIndex];
         path.push(context.tables.phase1Moves[moveIndex]);
-        if (searchPhase1(nextCornerOrientation, nextEdgeOrientation, nextUdSlice, face, previousFace, remainingDepth - 1, path, context)) {
-            return true;
-        }
+        const stop = searchPhase1Collect(scratchCo[slot + i], scratchEo[slot + i], scratchUd[slot + i], face, previousFace, remainingDepth - 1, path, solutions, limit, context);
         path.pop();
-        if (context.timedOut) {
-            return false;
+        if (stop) {
+            return true;
         }
     }
     return false;