@cubingcenter/scrambler 0.6.0 → 0.6.2

package/dist/puzzles/cube3/solver/generated-assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generated-assets.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/generated-assets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AASrB,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAejF;AAWD,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAiBjF;AAED,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAkBjF"}
+{"version":3,"file":"generated-assets.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/generated-assets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AASrB,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAejF;AAWD,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAkBjF;AAED,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAkBjF"}

package/dist/puzzles/cube3/solver/generated-assets.js

@@ -37,7 +37,8 @@ export async function loadGeneratedCube3Phase1Tables() {
             edgeOrientation: tables.pruningTables.edgeOrientation,
             udSlice: tables.pruningTables.udSlice,
             cornerOrientationEdgeOrientation: tables.pruningTables.cornerOrientationEdgeOrientation
-        }
+        },
+        jointTables: tables.jointTables
     };
 }
 export async function loadGeneratedCube3Phase2Tables() {

package/dist/puzzles/cube3/solver/node-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-loader.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/node-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAKV,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAuBrB,wBAAgB,8BAA8B,IAAI,iBAAiB,CAoClE"}
+{"version":3,"file":"node-loader.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/node-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAMV,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAkCrB,wBAAgB,8BAA8B,IAAI,iBAAiB,CAqClE"}

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

@@ -26,7 +26,29 @@ export function readGeneratedCube3SolverTables() {
             slicePermutation: readPruningTable(assetDirectory, manifest.pruningTables.slicePermutation),
             cornerPermutationSlicePermutation: readPruningTable(assetDirectory, manifest.pruningTables.cornerPermutationSlicePermutation),
             udEdgePermutationSlicePermutation: readPruningTable(assetDirectory, manifest.pruningTables.udEdgePermutationSlicePermutation)
+        },
+        jointTables: readJointTables(assetDirectory, manifest.jointTables)
+    };
+}
+function readJointTables(assetDirectory, entries) {
+    if (!entries?.udCo || !entries.udEo) {
+        return undefined;
+    }
+    const readJoint = (entry) => {
+        const buffer = readFileSync(path.join(assetDirectory, entry.file));
+        const expectedBytes = Math.ceil((entry.rangeA * entry.rangeB) / 2);
+        if (buffer.length !== expectedBytes) {
+            throw new Error(`Invalid byte size for ${entry.file}.`);
         }
+        const values = new Uint8Array(buffer);
+        if (checksum(values) !== entry.checksum) {
+            throw new Error(`Checksum mismatch for ${entry.file}.`);
+        }
+        return values;
+    };
+    return {
+        jointUdCo: readJoint(entries.udCo),
+        jointUdEo: readJoint(entries.udEo)
     };
 }
 function readManifest(assetDirectory) {

package/dist/puzzles/cube3/solver/pair-browser-loader.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Browser loader for the combined (cp x uep) pair pruning tables.
+ *
+ * Fetches the plain .bin files from the web assets base URL (the web sync
+ * script copies `generated/pair/` wholesale; compression variants are not
+ * used for the pair tables yet — the 55 MB dist table is the dominant
+ * download either way).
+ */
+import type { Cube3PairTables } from "./pair-tables-types.js";
+export declare function loadBrowserPairTables(baseUrl?: string): Promise<Cube3PairTables | undefined>;
+//# sourceMappingURL=pair-browser-loader.d.ts.map

package/dist/puzzles/cube3/solver/pair-browser-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pair-browser-loader.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/pair-browser-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,wBAAwB,CAAC;AAmB5E,wBAAsB,qBAAqB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CA6DlG"}

package/dist/puzzles/cube3/solver/pair-browser-loader.js

@@ -0,0 +1,93 @@
+/**
+ * Browser loader for the combined (cp x uep) pair pruning tables.
+ *
+ * Fetches the plain .bin files from the web assets base URL (the web sync
+ * script copies `generated/pair/` wholesale; compression variants are not
+ * used for the pair tables yet — the 55 MB dist table is the dominant
+ * download either way).
+ */
+import { buildDenseMin, checksumBytes } from "./pair-tables-types.js";
+const PAIR_DIR = "puzzles/cube3/solver/generated/pair";
+function resolveBaseUrl(provided) {
+    if (provided) {
+        return provided.replace(/\/$/, "");
+    }
+    if (typeof document !== "undefined") {
+        const script = document.currentScript;
+        if (script?.src) {
+            const base = new URL(".", script.src).href;
+            return base.replace(/\/$/, "");
+        }
+    }
+    return ".";
+}
+export async function loadBrowserPairTables(baseUrl) {
+    const resolvedBase = resolveBaseUrl(baseUrl);
+    const manifest = await fetchManifest(resolvedBase);
+    if (manifest === undefined) {
+        return undefined;
+    }
+    const fetchBin = async (file, expectedBytes, expectedChecksum) => {
+        const url = `${resolvedBase}/${PAIR_DIR}/${file}`;
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`Failed to load pair table ${url}: ${response.status} ${response.statusText}`);
+        }
+        const buffer = await response.arrayBuffer();
+        if (buffer.byteLength !== expectedBytes) {
+            throw new Error(`Invalid byte size for ${file}.`);
+        }
+        const values = new Uint8Array(buffer);
+        const actual = checksumBytes(values);
+        if (actual !== expectedChecksum) {
+            throw new Error(`Checksum mismatch for ${file}: expected ${expectedChecksum}, received ${actual}.`);
+        }
+        return values;
+    };
+    const fetchU16 = async (file, count, expectedChecksum) => {
+        const values = new Uint16Array(count);
+        const buffer = await fetchBin(file, count * 2, expectedChecksum);
+        for (let index = 0; index < count; index += 1) {
+            values[index] = buffer[index * 2] | (buffer[index * 2 + 1] << 8);
+        }
+        return values;
+    };
+    const fetchU32 = async (file, count, expectedChecksum) => {
+        const values = new Uint32Array(count);
+        const buffer = await fetchBin(file, count * 4, expectedChecksum);
+        for (let index = 0; index < count; index += 1) {
+            values[index] =
+                buffer[index * 4] |
+                    (buffer[index * 4 + 1] << 8) |
+                    (buffer[index * 4 + 2] << 16) |
+                    (buffer[index * 4 + 3] << 24);
+        }
+        return values;
+    };
+    const canonCpMin = await fetchU16("phase2-pair-canoncpmin.bin", 40320, manifest.checksums.canonCpMin);
+    const canonTauStart = await fetchU32("phase2-pair-canonctaustart.bin", 40321, manifest.checksums.canonTauStart);
+    const canonTaus = await fetchBin("phase2-pair-canonctaus.bin", canonTauStart[40320], manifest.checksums.canonTaus);
+    const conjEp = await fetchU16("phase2-pair-conjep.bin", 16 * 40320, manifest.checksums.conjEp);
+    const dist = await fetchBin("phase2-pair-dist.bin", manifest.tableBytes, manifest.checksums.dist);
+    return {
+        denseMin: buildDenseMin(canonCpMin, manifest.nMinima),
+        canonCpMin,
+        canonTauStart,
+        canonTaus,
+        conjEp,
+        dist,
+        nMinima: manifest.nMinima,
+        maxDepth: manifest.maxDepth
+    };
+}
+async function fetchManifest(baseUrl) {
+    const url = `${baseUrl}/${PAIR_DIR}/phase2-pair-manifest.json`;
+    const response = await fetch(url);
+    if (response.status === 404) {
+        return undefined;
+    }
+    if (!response.ok) {
+        throw new Error(`Failed to load pair table manifest from ${url}: ${response.status} ${response.statusText}`);
+    }
+    return await response.json();
+}

package/dist/puzzles/cube3/solver/pair-node-loader.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Node loader for the combined (cp x uep) pair pruning tables.
+ */
+import type { Cube3PairTables } from "./pair-tables-types.js";
+export declare function loadNodePairTables(): Cube3PairTables | undefined;
+//# sourceMappingURL=pair-node-loader.d.ts.map

package/dist/puzzles/cube3/solver/pair-node-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pair-node-loader.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/pair-node-loader.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,wBAAwB,CAAC;AAK5E,wBAAgB,kBAAkB,IAAI,eAAe,GAAG,SAAS,CAwDhE"}

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

@@ -0,0 +1,79 @@
+/**
+ * Node loader for the combined (cp x uep) pair pruning tables.
+ */
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+import { buildDenseMin, checksumBytes } from "./pair-tables-types.js";
+const PAIR_DIR = "puzzles/cube3/solver/generated/pair";
+export function loadNodePairTables() {
+    const dir = resolvePairDirectory();
+    if (dir === undefined) {
+        return undefined;
+    }
+    const manifest = JSON.parse(readFileSync(path.join(dir, "phase2-pair-manifest.json"), "utf8"));
+    const readBin = (file, expectedBytes, expectedChecksum) => {
+        const buffer = readFileSync(path.join(dir, file));
+        if (buffer.length !== expectedBytes) {
+            throw new Error(`Invalid byte size for ${file}.`);
+        }
+        const values = new Uint8Array(buffer);
+        const actual = checksumBytes(values);
+        if (actual !== expectedChecksum) {
+            throw new Error(`Checksum mismatch for ${file}: expected ${expectedChecksum}, received ${actual}.`);
+        }
+        return values;
+    };
+    const readU16 = (file, count, expectedChecksum) => {
+        const values = new Uint16Array(count);
+        const buffer = readBin(file, count * 2, expectedChecksum);
+        for (let index = 0; index < count; index += 1) {
+            values[index] = buffer[index * 2] | (buffer[index * 2 + 1] << 8);
+        }
+        return values;
+    };
+    const readU32 = (file, count, expectedChecksum) => {
+        const values = new Uint32Array(count);
+        const buffer = readBin(file, count * 4, expectedChecksum);
+        for (let index = 0; index < count; index += 1) {
+            values[index] =
+                buffer[index * 4] |
+                    (buffer[index * 4 + 1] << 8) |
+                    (buffer[index * 4 + 2] << 16) |
+                    (buffer[index * 4 + 3] << 24);
+        }
+        return values;
+    };
+    const canonCpMin = readU16("phase2-pair-canoncpmin.bin", 40320, manifest.checksums.canonCpMin);
+    const canonTauStart = readU32("phase2-pair-canonctaustart.bin", 40321, manifest.checksums.canonTauStart);
+    const canonTaus = readBin("phase2-pair-canonctaus.bin", canonTauStart[40320], manifest.checksums.canonTaus);
+    const conjEp = readU16("phase2-pair-conjep.bin", 16 * 40320, manifest.checksums.conjEp);
+    const dist = readBin("phase2-pair-dist.bin", manifest.tableBytes, manifest.checksums.dist);
+    return {
+        denseMin: buildDenseMin(canonCpMin, manifest.nMinima),
+        canonCpMin,
+        canonTauStart,
+        canonTaus,
+        conjEp,
+        dist,
+        nMinima: manifest.nMinima,
+        maxDepth: manifest.maxDepth
+    };
+}
+function resolvePairDirectory() {
+    const envDirectory = process.env.CUBINGCENTER_SCRAMBLER_TABLES_DIR;
+    if (envDirectory && existsSync(path.join(envDirectory, "pair", "phase2-pair-manifest.json"))) {
+        return path.join(envDirectory, "pair");
+    }
+    const cwd = process.cwd();
+    const candidates = [
+        path.join(cwd, "src", PAIR_DIR),
+        path.join(cwd, "dist", PAIR_DIR),
+        path.join(cwd, "dist-cjs", PAIR_DIR)
+    ];
+    for (const candidate of candidates) {
+        if (existsSync(path.join(candidate, "phase2-pair-manifest.json"))) {
+            return candidate;
+        }
+    }
+    return undefined;
+}

package/dist/puzzles/cube3/solver/pair-tables-types.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Pair-table types shared by the node and browser loaders.
+ */
+export interface Cube3PairTables {
+    /** Dense index of the distinct cp-orbit minima (canonCpMin value -> 0..nMinima-1). */
+    denseMin: Uint16Array;
+    /** Canonical cp-orbit minimum per corner permutation (40320). */
+    canonCpMin: Uint16Array;
+    /** Offsets into canonTaus per corner permutation (40321). */
+    canonTauStart: Uint32Array;
+    /** The slice-16 group indices achieving each cp minimum. */
+    canonTaus: Uint8Array;
+    /** Conjugation transforms of the UD-edge permutation (16 * 40320). */
+    conjEp: Uint16Array;
+    /** 4-bit packed pair distances (nMinima * 40320 nibbles). */
+    dist: Uint8Array;
+    nMinima: number;
+    maxDepth: number;
+}
+export interface PairManifest {
+    nMinima: number;
+    tableBytes: number;
+    maxDepth: number;
+    checksums: {
+        dist: number;
+        canonCpMin: number;
+        canonTauStart: number;
+        canonTaus: number;
+        conjEp: number;
+    };
+}
+export declare function checksumBytes(values: Uint8Array): number;
+/**
+ * Builds the dense class map (first-appearance order, matching exp3-gen).
+ */
+export declare function buildDenseMin(canonCpMin: Uint16Array, expectedCount: number): Uint16Array;
+//# sourceMappingURL=pair-tables-types.d.ts.map

package/dist/puzzles/cube3/solver/pair-tables-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pair-tables-types.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/pair-tables-types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,eAAe;IAC9B,sFAAsF;IACtF,QAAQ,EAAE,WAAW,CAAC;IACtB,iEAAiE;IACjE,UAAU,EAAE,WAAW,CAAC;IACxB,6DAA6D;IAC7D,aAAa,EAAE,WAAW,CAAC;IAC3B,4DAA4D;IAC5D,SAAS,EAAE,UAAU,CAAC;IACtB,sEAAsE;IACtE,MAAM,EAAE,WAAW,CAAC;IACpB,6DAA6D;IAC7D,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CASxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,GAAG,WAAW,CAczF"}

package/dist/puzzles/cube3/solver/pair-tables-types.js

@@ -0,0 +1,29 @@
+/**
+ * Pair-table types shared by the node and browser loaders.
+ */
+export function checksumBytes(values) {
+    let hash = 0x811c9dc5;
+    for (let index = 0; index < values.length; index += 1) {
+        hash ^= values[index];
+        hash = Math.imul(hash, 0x01000193);
+    }
+    return hash >>> 0;
+}
+/**
+ * Builds the dense class map (first-appearance order, matching exp3-gen).
+ */
+export function buildDenseMin(canonCpMin, expectedCount) {
+    const denseMin = new Uint16Array(40320).fill(0xffff);
+    let next = 0;
+    for (let cp = 0; cp < 40320; cp += 1) {
+        const minCp = canonCpMin[cp];
+        if (denseMin[minCp] === 0xffff) {
+            denseMin[minCp] = next;
+            next += 1;
+        }
+    }
+    if (next !== expectedCount) {
+        throw new Error(`Dense class count mismatch: ${next} != ${expectedCount}.`);
+    }
+    return denseMin;
+}

package/dist/puzzles/cube3/solver/pair-tables.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Combined (cp x uep) phase-2 pruning table (experiment:
+ * experiment/cube3-pair-pruning). The exact distance to (cp==0 && uep==0)
+ * with the slice permutation free, canonicalized under the slice-16
+ * conjugation group:
+ *
+ *   index = denseMin[canonCpMin[cp]] * 40320 + uep*
+ *   uep*  = min over the cp-minimizer set (canonTaus) of conjEp[g][uep]
+ *
+ * The distance is ~3.5-4 moves tighter than max(cpsp, uepsp) (the plain
+ * phase-2 bound) and admissible for the joint phase-2 problem
+ * (d_pair <= d_joint), so it prunes the deep phase-2 searches
+ * exponentially. Measured in the native C++ repo (exp3): phase-2 drops
+ * from ~34k nodes to ~37 (990x) and the full scramble from ~5.7 ms to
+ * ~1.2 ms. Generated by the C++ tool `tools/exp3-gen`, ~1 min,
+ * deterministic, FNV-1a checksummed.
+ *
+ * The tables live in `puzzles/cube3/solver/generated/pair/` next to the
+ * standard solver tables.
+ */
+import type { Cube3PairTables } from "./pair-tables-types.js";
+export declare function getCachedPairTables(): Cube3PairTables | undefined;
+export declare function loadCube3PairTables(): Promise<Cube3PairTables | undefined>;
+/**
+ * The pair distance of (cp, uep) — the exact distance to (cp==0 && uep==0)
+ * with the slice free. Admissible as a phase-2 lower bound.
+ */
+export declare function pairBound(tables: Cube3PairTables, cp: number, uep: number): number;
+//# sourceMappingURL=pair-tables.d.ts.map

package/dist/puzzles/cube3/solver/pair-tables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pair-tables.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/pair-tables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,mBAAmB,IAAI,eAAe,GAAG,SAAS,CAEjE;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAKhF;AAwBD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAelF"}

package/dist/puzzles/cube3/solver/pair-tables.js

@@ -0,0 +1,69 @@
+/**
+ * Combined (cp x uep) phase-2 pruning table (experiment:
+ * experiment/cube3-pair-pruning). The exact distance to (cp==0 && uep==0)
+ * with the slice permutation free, canonicalized under the slice-16
+ * conjugation group:
+ *
+ *   index = denseMin[canonCpMin[cp]] * 40320 + uep*
+ *   uep*  = min over the cp-minimizer set (canonTaus) of conjEp[g][uep]
+ *
+ * The distance is ~3.5-4 moves tighter than max(cpsp, uepsp) (the plain
+ * phase-2 bound) and admissible for the joint phase-2 problem
+ * (d_pair <= d_joint), so it prunes the deep phase-2 searches
+ * exponentially. Measured in the native C++ repo (exp3): phase-2 drops
+ * from ~34k nodes to ~37 (990x) and the full scramble from ~5.7 ms to
+ * ~1.2 ms. Generated by the C++ tool `tools/exp3-gen`, ~1 min,
+ * deterministic, FNV-1a checksummed.
+ *
+ * The tables live in `puzzles/cube3/solver/generated/pair/` next to the
+ * standard solver tables.
+ */
+let cached;
+export function getCachedPairTables() {
+    return cached;
+}
+export async function loadCube3PairTables() {
+    if (cached === undefined) {
+        cached = await loadPairTables();
+    }
+    return cached;
+}
+async function loadPairTables() {
+    try {
+        if (typeof self !== "undefined") {
+            const loader = await import(
+            /* webpackIgnore: true */
+            /* @vite-ignore */
+            "./pair-browser-loader.js");
+            return await loader.loadBrowserPairTables();
+        }
+        const loader = await import(
+        /* webpackIgnore: true */
+        /* @vite-ignore */
+        "./pair-node-loader.js");
+        return loader.loadNodePairTables();
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * The pair distance of (cp, uep) — the exact distance to (cp==0 && uep==0)
+ * with the slice free. Admissible as a phase-2 lower bound.
+ */
+export function pairBound(tables, cp, uep) {
+    const minCp = tables.canonCpMin[cp];
+    const start = tables.canonTauStart[cp];
+    const end = tables.canonTauStart[cp + 1];
+    let bestUep = 0x7fffffff;
+    for (let index = start; index < end; index += 1) {
+        const g = tables.canonTaus[index];
+        const e = tables.conjEp[g * 40320 + uep];
+        if (e < bestUep) {
+            bestUep = e;
+        }
+    }
+    const pairIndex = tables.denseMin[minCp] * 40320 + bestUep;
+    const nibble = tables.dist[pairIndex >> 1];
+    return (nibble >> ((pairIndex & 1) << 2)) & 0x0f;
+}

package/dist/puzzles/cube3/solver/phase1.d.ts

@@ -1,5 +1,5 @@
 import type { Cube3Move, Cube3State } from "../types.js";
-import type { Cube3Phase1Tables } from "./tables.js";
+import type { Cube3JointTables, Cube3Phase1Tables } from "./tables.js";
 export interface Cube3Phase1Coordinates {
     cornerOrientation: number;
     edgeOrientation: number;
@@ -9,6 +9,8 @@ export interface Cube3Phase1Options {
     maxDepth?: number;
     timeoutMs?: number;
     tables?: Cube3Phase1Tables;
+    /** Phase-1 joint tables (ud x co / ud x eo), experimental. */
+    jointTables?: Cube3JointTables | undefined;
 }
 export interface Cube3Phase1Result {
     moves: Cube3Move[];

package/dist/puzzles/cube3/solver/phase1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phase1.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/phase1.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOrD,MAAM,WAAW,sBAAsB;IACrC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,sBAAsB,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAElB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAKlD;AA8BD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAoE5B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,sBAAsB,CAMtF;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,UAAU,GAAG,sBAAsB,EAC1C,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAQT;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,SAAS,SAAS,EAAE,GAC1B,UAAU,CAEZ"}
+{"version":3,"file":"phase1.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/phase1.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOvE,MAAM,WAAW,sBAAsB;IACrC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,8DAA8D;IAC9D,WAAW,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC5C;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,sBAAsB,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAElB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAKlD;AA+BD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAkF5B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,sBAAsB,CAMtF;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,UAAU,GAAG,sBAAsB,EAC1C,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAQT;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,SAAS,SAAS,EAAE,GAC1B,UAAU,CAEZ"}

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

@@ -24,11 +24,13 @@ const PHASE1_VALID_MOVES = Array.from({ length: 7 }, (_, prevPlusOne) => Array.f
 }));
 export async function solveCube3Phase1(state, options = {}) {
     const tables = options.tables ?? await loadCube3Phase1Tables();
+    const jointTables = options.jointTables ?? tables.jointTables;
     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,
@@ -48,7 +50,19 @@ export async function solveCube3Phase1(state, options = {}) {
     const combinedIndex = (start.cornerOrientation << 11) + start.edgeOrientation;
     const coeo = (coeoTable[combinedIndex >> 1] >> ((combinedIndex & 1) << 2)) & 0x0f;
     const udSliceDist = (udPruningTable[start.udSlice >> 1] >> ((start.udSlice & 1) << 2)) & 0x0f;
-    const minDepth = coeo > udSliceDist ? coeo : udSliceDist;
+    let minDepth = coeo > udSliceDist ? coeo : udSliceDist;
+    if (jointTables) {
+        const jc = (jointTables.jointUdCo[(start.udSlice * 2187 + start.cornerOrientation) >> 1] >>
+            (((start.udSlice * 2187 + start.cornerOrientation) & 1) << 2)) & 0x0f;
+        if (jc > minDepth) {
+            minDepth = jc;
+        }
+        const je = (jointTables.jointUdEo[(start.udSlice * 2048 + start.edgeOrientation) >> 1] >>
+            (((start.udSlice * 2048 + start.edgeOrientation) & 1) << 2)) & 0x0f;
+        if (je > minDepth) {
+            minDepth = je;
+        }
+    }
     for (let depth = minDepth; depth <= maxDepth; depth += 1) {
         const path = [];
         const solved = searchPhase1(start.cornerOrientation, start.edgeOrientation, start.udSlice, -1, -1, depth, path, context);
@@ -120,10 +134,26 @@ function searchPhase1(cornerOrientation, edgeOrientation, udSlice, previousFace,
         const combinedIndex = (nextCornerOrientation << 11) + nextEdgeOrientation;
         const coeo = (coeoTable[combinedIndex >> 1] >> ((combinedIndex & 1) << 2)) & 0x0f;
         const udSliceDist = (udPruningTable[nextUdSlice >> 1] >> ((nextUdSlice & 1) << 2)) & 0x0f;
-        const nextLowerBound = coeo > udSliceDist ? coeo : udSliceDist;
+        let nextLowerBound = coeo > udSliceDist ? coeo : udSliceDist;
         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;
+            if (jc > nextLowerBound) {
+                nextLowerBound = jc;
+            }
+            const udEoIndex = nextUdSlice * 2048 + nextEdgeOrientation;
+            const je = (jointTables.jointUdEo[udEoIndex >> 1] >> ((udEoIndex & 1) << 2)) & 0x0f;
+            if (je > nextLowerBound) {
+                nextLowerBound = je;
+            }
+            if (nextLowerBound > remainingDepth - 1) {
+                continue;
+            }
+        }
         const face = PHASE1_MOVE_FACES[moveIndex];
         path.push(context.tables.phase1Moves[moveIndex]);
         if (searchPhase1(nextCornerOrientation, nextEdgeOrientation, nextUdSlice, face, previousFace, remainingDepth - 1, path, context)) {

package/dist/puzzles/cube3/solver/phase2.d.ts

@@ -1,6 +1,7 @@
 import type { Cube3Move, Cube3State } from "../types.js";
 import type { Cube3Phase1Options, Cube3Phase1Result } from "./phase1.js";
 import type { Cube3Phase2Tables } from "./tables.js";
+import type { Cube3PairTables } from "./pair-tables-types.js";
 export interface Cube3Phase2Coordinates {
     cornerPermutation: number;
     udEdgePermutation: number;
@@ -10,6 +11,8 @@ export interface Cube3Phase2Options {
     maxDepth?: number;
     timeoutMs?: number;
     tables?: Cube3Phase2Tables;
+    /** Combined (cp x uep) pair-distance pruning tables (experimental). */
+    pairTables?: Cube3PairTables | undefined;
     previousFace?: number;
     previousPreviousFace?: number;
 }

package/dist/puzzles/cube3/solver/phase2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phase2.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/phase2.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAczD,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAcrD,MAAM,WAAW,sBAAsB;IACrC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,sBAAsB,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAElB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAKlD;AA6BD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CA+E5B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CA+B3B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,sBAAsB,CAMtF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,sBAAsB,GAAG,OAAO,CAQvF;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,SAAS,SAAS,EAAE,GAC1B,UAAU,CAEZ"}
+{"version":3,"file":"phase2.d.ts","sourceRoot":"","sources":["../../../../src/puzzles/cube3/solver/phase2.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAczD,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAarD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,WAAW,sBAAsB;IACrC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,uEAAuE;IACvE,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,sBAAsB,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,CAAC,EAAE,kBAAkB,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAElB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAKlD;AA8BD,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAuF5B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CA+B3B;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,sBAAsB,CAMtF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,sBAAsB,GAAG,OAAO,CAQvF;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,SAAS,SAAS,EAAE,GAC1B,UAAU,CAEZ"}