cubing 0.21.1 → 0.22.1

package/src/cubing/puzzles/stickerings/global-custom-stickering-hack.ts

@@ -46,7 +46,7 @@ export function useGlobalCustomStickerer(
 }
 
 if (
-  typeof location !== "undefined" &&
+  globalThis.location &&
   new URL(location.href).searchParams.get("global-custom-stickerer") === "true"
 ) {
   (window as any).setGlobalCustomStickerer = setGlobalCustomStickerer;

package/src/cubing/search/esm-test-worker.js

@@ -1,7 +1,7 @@
 // We need to use a static `import` statement instead of dynamic `import()` to
 // test true compatibility (Snowpack behaves differently for those two, for
 // example). This may result in an unpreventable extra error in the console.
-import { expose } from "./vendor/comlink-everywhere/inside";
+import { expose } from "../vendor/comlink-everywhere/inside";
 
 export const esmTestAPIImplementation = {
   test: (s) => {

package/src/cubing/search/inside/api.ts

@@ -30,6 +30,7 @@ import { bigCubeRandomMoves } from "./solve/puzzles/big-cubes";
 import { oriented555RandomMoves } from "./solve/puzzles/5x5x5";
 import { getRandomSquare1Scramble } from "./solve/puzzles/sq1";
 import type { Transformation } from "../../kpuzzle";
+import { randomFTOScramble } from "./solve/puzzles/fto";
 
 setIsInsideWorker(true);
 
@@ -134,6 +135,8 @@ export const insideAPI = {
           "getRandomSquare1Scramble",
           getRandomSquare1Scramble,
         );
+      case "fto":
+        return measurePerf("randomFTOScramble", randomFTOScramble);
       default:
         throw new Error(`unsupported event: ${eventID}`);
     }

package/src/cubing/search/inside/entry.js

@@ -1,4 +1,4 @@
-import { expose } from "../vendor/comlink-everywhere/inside";
+import { expose } from "../../vendor/comlink-everywhere/inside";
 import { insideAPI } from "./api";
 
 expose(insideAPI);

package/src/cubing/search/inside/inside-worker.ts

@@ -7,7 +7,7 @@ export function setIsInsideWorker(inside: boolean) {
 export function mustBeInsideWorker(): void {
   if (!isInsideWorker) {
     throw new Error(
-      "Must be called from inside a worker, to avoid impct on page performance. Try importing from the top level of `cubing/solve`?",
+      "Must be called from inside a worker, to avoid impact on page performance. Try importing from the top level of `cubing/solve`?",
     );
   }
 }

package/src/cubing/search/inside/solve/addOrientationSuffix.ts

@@ -1,5 +1,5 @@
 import { Alg, AlgBuilder, Move } from "../../../alg";
-import { randomChoiceFactory } from "./vendor/random-uint-below";
+import { randomChoiceFactory } from "../../../vendor/random-uint-below";
 
 export async function addOrientationSuffix(
   alg: Alg,

package/src/cubing/search/inside/solve/puzzles/2x2x2.ts

@@ -9,7 +9,7 @@ import { mustBeInsideWorker } from "../../inside-worker";
 import {
   randomPermute,
   randomUIntBelowFactory,
-} from "../vendor/random-uint-below";
+} from "../../../../vendor/random-uint-below";
 import type { SGSCachedData } from "../parseSGS";
 import { TrembleSolver } from "../tremble";
 

package/src/cubing/search/inside/solve/puzzles/3x3x3/index.ts

@@ -3,11 +3,11 @@ import { KPuzzle, Transformation } from "../../../../../kpuzzle";
 import { puzzles } from "../../../../../puzzles";
 import { mustBeInsideWorker } from "../../../inside-worker";
 import { addOrientationSuffix } from "../../addOrientationSuffix";
-import { initialize, solveState } from "../../vendor/min2phase/gwt";
-import { randomChoiceFactory } from "../../vendor/random-uint-below";
+import { randomChoiceFactory } from "../../../../../vendor/random-uint-below";
 import { toMin2PhaseState } from "./convert";
 import { passesFilter } from "./filter";
 import { sgs3x3x3 } from "./legacy-sgs";
+import { initialize, solveState } from "../../../../../vendor/min2phase/gwt";
 
 export async function random333State(): Promise<Transformation> {
   const def = await puzzles["3x3x3"].def();

package/src/cubing/search/inside/solve/puzzles/4x4x4.ts

@@ -1,10 +1,10 @@
 import type { Alg } from "../../../../alg";
 import { addOrientationSuffix } from "../addOrientationSuffix";
-import { random444Scramble } from "../vendor/cstimer/src/js/scramble/scramble_444";
+import { random444Scramble } from "../../../../vendor/cstimer/src/js/scramble/scramble_444";
 export {
   initialize as initialize444,
   random444Scramble,
-} from "../vendor/cstimer/src/js/scramble/scramble_444";
+} from "../../../../vendor/cstimer/src/js/scramble/scramble_444";
 
 const randomSuffixes = [
   [null, "x", "x2", "x'", "z", "z'"],

package/src/cubing/search/inside/solve/puzzles/big-cubes.ts

@@ -2,7 +2,7 @@ import { Alg, AlgBuilder, Move, QuantumMove } from "../../../../alg";
 import {
   randomChoiceFactory,
   randomUIntBelowFactory,
-} from "../vendor/random-uint-below";
+} from "../../../../vendor/random-uint-below";
 
 function numMoves(n: number): number {
   switch (n) {

package/src/cubing/search/inside/solve/puzzles/clock.ts

@@ -1,4 +1,4 @@
-import { randomUIntBelowFactory } from "../vendor/random-uint-below";
+import { randomUIntBelowFactory } from "../../../../vendor/random-uint-below";
 
 const pins = ["UR", "DR", "DL", "UL"];
 const backMoves = ["U", "R", "D", "L", "ALL"];

package/src/cubing/search/inside/solve/puzzles/{FTO.sgs → fto.sgs.json.ts}

@@ -1,16 +1,49 @@
-SubgroupSizes 12 12 11 12 12 11 10 9 11 8 10 9 7 8 10 10 6 9 8 5 7 6 5 4 4 8 7 3 6 6 2 5 3 4 3
-
-Alg BB
-Alg BB'
+import type { KPuzzleDefinition } from "../../../../kpuzzle";
+import { getPuzzleGeometryByName } from "../../../../puzzle-geometry";
+import { parseSGS, SGSCachedData } from "../parseSGS";
+
+export async function ftoDef(): Promise<KPuzzleDefinition> {
+  return getPuzzleGeometryByName("FTO", {
+    allMoves: true,
+    orientCenters: true,
+    addRotations: true,
+  }).writekpuzzle(true);
+}
+
+let cachedData: Promise<SGSCachedData> | null = null;
+export async function sgsDataFTO() {
+  return (cachedData ??= uncachedSGSDataFTO());
+}
+
+// TODO: Reduce info.
+async function uncachedSGSDataFTO(): Promise<SGSCachedData> {
+  return parseSGS(
+    await ftoDef(),
+    `SubgroupSizes 24 12 11 12 12 11 10 9 11 8 10 9 7 8 10 10 6 9 8 5 7 6 5 4 4 8 7 3 6 6 2 5 3 4 3
+
+Alg T
+Alg B
+Alg B T
+Alg B'
+Alg B' T
 Alg U
+Alg U T
 Alg U'
-Alg BB BL
-Alg BB BL'
-Alg BB' BR
-Alg BB' BR'
+Alg U' T
+Alg B BL
+Alg B BL T
+Alg B BL'
+Alg B BL' T
+Alg B' BR
+Alg B' BR T
+Alg B' BR'
+Alg B' BR' T
 Alg U R'
+Alg U R' T
 Alg U' L
-Alg BB BL' D
+Alg U' L T
+Alg B BL' D
+Alg B BL' D T
 
 Alg R
 Alg R'
@@ -21,19 +54,19 @@ Alg R BR'
 Alg R' F
 Alg R' L
 Alg R' L'
-Alg BB L BB'
+Alg B L B'
 Alg U L' U'
 
-Alg BB U BB'
-Alg BB U' BB'
-Alg BB R BB'
-Alg BB R' BB'
-Alg BB' U' BB
-Alg BB' U BB L
-Alg BB' U BB L'
-Alg BB' U' BB BL'
-Alg BB U' BB' BR
-Alg BB' R' BB F
+Alg B U B'
+Alg B U' B'
+Alg B R B'
+Alg B R' B'
+Alg B' U' B
+Alg B' U B L
+Alg B' U B L'
+Alg B' U' B BL'
+Alg B U' B' BR
+Alg B' R' B F
 
 Alg BR
 Alg BR'
@@ -42,22 +75,22 @@ Alg BR BL'
 Alg BR' F
 Alg BR' F'
 Alg BR' D
-Alg BB BR BB'
+Alg B BR B'
 Alg U F U'
 Alg BR BL L
 Alg BR' D BR'
 
-Alg BB' BL BB
-Alg BB' BL' BB
+Alg B' BL B
+Alg B' BL' B
 Alg BR D' BR'
-Alg BB' BL BB D'
-Alg BB' BL BB BL
-Alg BB' BL BB BL'
-Alg BB' BL L BB
-Alg BB' BL' BB F'
-Alg BB' BL' BB L'
-Alg BB' BL' BB BL'
-Alg BB' BL' L BL' BB
+Alg B' BL B D'
+Alg B' BL B BL
+Alg B' BL B BL'
+Alg B' BL L B
+Alg B' BL' B F'
+Alg B' BL' B L'
+Alg B' BL' B BL'
+Alg B' BL' L BL' B
 
 Alg R' BR R
 Alg R' BR' R
@@ -65,8 +98,8 @@ Alg BR BL' D BR
 Alg R' BR D R
 Alg R' BR D' R
 Alg R' BR R BL
-Alg BB' D' BL D BB
-Alg BR BB D' BB' BR'
+Alg B' D' BL D B
+Alg BR B D' B' BR'
 Alg BR BL' D BR L'
 Alg BR BL' D BL BR
 
@@ -74,31 +107,31 @@ Alg U BR U'
 Alg U BR' U'
 Alg U' R U
 Alg U' R' U
-Alg U BR BB' U'
+Alg U BR B' U'
 Alg U BR' U' D
 Alg U BR' U' D'
 Alg U' R F' U
 Alg U' R' U L'
 
-Alg U BB U'
-Alg U BB' U'
-Alg U BB U' L
-Alg U BB U' L'
-Alg U BB' U' BL'
-Alg U BB U' L F
-Alg U BB U' L F'
-Alg U BB' U' BL' D'
-
-Alg BB BL' L BL BB'
-Alg BB BL' L' BL BB'
-Alg U BB' D BB U'
-Alg U BB' D' BB U'
+Alg U B U'
+Alg U B' U'
+Alg U B U' L
+Alg U B U' L'
+Alg U B' U' BL'
+Alg U B U' L F
+Alg U B U' L F'
+Alg U B' U' BL' D'
+
+Alg B BL' L BL B'
+Alg B BL' L' BL B'
+Alg U B' D B U'
+Alg U B' D' B U'
 Alg U R D R' U'
 Alg U R D' R' U'
 Alg R' F L F' R
 Alg R' F L' F' R
-Alg BB L' BB F' D BB
-Alg U BB' D' BB U' D
+Alg B L' B F' D B
+Alg U B' D' B U' D
 
 Alg F
 Alg F'
@@ -148,19 +181,19 @@ Alg R' D R
 Alg R' D' R
 Alg L D L' D'
 Alg L R L' R'
-Alg L' BB' L BB
+Alg L' B' L B
 Alg R' D R BL
 Alg L BL' L' BL L'
 
 Alg U L' D L U'
-Alg U BB D BB' U'
+Alg U B D B' U'
 Alg U L' D' L U'
-Alg U BB D' BB' U'
+Alg U B D' B' U'
 Alg R' D' BL' D R
-Alg U BB D' BB' U' D
-Alg U BB' L BB L' U'
-Alg U BB D BB' U' BL'
-Alg U BB D' BB' L' D' L U'
+Alg U B D' B' U' D
+Alg U B' L B L' U'
+Alg U B D B' U' BL'
+Alg U B D' B' L' D' L U'
 
 Alg F L F'
 Alg F L' F'
@@ -172,18 +205,18 @@ Alg L BL' D BL L'
 Alg L BL' D' BL L'
 Alg F D L D' L' F'
 Alg F L D L' D' F'
-Alg F L' BB' L BB F'
+Alg F L' B' L B F'
 Alg F' D' R' D R F
 Alg F D L D' L' F' BL'
-Alg F' R' BB' R' BB R' F
+Alg F' R' B' R' B R' F
 
-Alg BB D BB'
-Alg BB D' BB'
+Alg B D B'
+Alg B D' B'
 Alg L' D L
 Alg L' D' L
-Alg BB D BB' D'
-Alg BB' L BB L'
-Alg BB D BB' D' BL
+Alg B D B' D'
+Alg B' L B L'
+Alg B D B' D' BL
 
 Alg D
 Alg D'
@@ -192,14 +225,14 @@ Alg D BL'
 
 Alg D BL' D BL D'
 Alg D BL' D' BL D'
-Alg BB D R D' R' BB'
-Alg BB R D R' D' BB'
+Alg B D R D' R' B'
+Alg B R D R' D' B'
 Alg D BL' D BL D' BL
 Alg D BL' D BL D' BL'
 
 Alg D BL D BL' D'
 Alg D BL D' BL' D'
-Alg BB' BL' BB BR D' BR'
+Alg B' BL' B BR D' BR'
 Alg D BL D BL' D' BL
 Alg D BL D BL' D' BL'
 
@@ -208,15 +241,15 @@ Alg D' BL' D
 Alg D' BL D BL
 Alg D' BL D BL'
 
-Alg BB D' BB' BL BB D BB'
-Alg BB D' BB' BL' BB D BB'
+Alg B D' B' BL B D B'
+Alg B D' B' BL' B D B'
 Alg D' BL' D BL D' BL D
 
-Alg BB R' BB' BL BB R BB'
-Alg BB R' BB' BL' BB R BB'
+Alg B R' B' BL B R B'
+Alg B R' B' BL' B R B'
 Alg L R L' BL' L R' L'
 
-Alg F BL' BB' BL F' BL' BB
+Alg F BL' B' BL F' BL' B
 Alg F' R' F BL F' R F
 Alg F' R' F BL' F' R F
 Alg BR R BR' BL' BR R' BR'
@@ -241,7 +274,7 @@ Alg BR F BL F' BL' BR'
 Alg F U' F' U BL' U BL U'
 
 Alg F U' F' D F U F' D'
-Alg BB' U' F U BB U' F' U
+Alg B' U' F U B U' F' U
 Alg D F U' F' D' F U F'
 Alg BR' U BR D' BR' U' BR D
 Alg D' BR BL' F BL' F' BL BR' BL D
@@ -250,15 +283,18 @@ Alg U BR' U' BR BL' BR BL BR'
 
 Alg F L F' BL D F' D' F BL' L'
 Alg F' BR F BR' L BL' BR' BL BR L'
-Alg BB BR' U R BR' R' BR U' BB' BR
+Alg B BR' U R BR' R' BR U' B' BR
 Alg U BR' U' BR L' BL BR BL' BR' L
 
-Alg F BL F' BL F BL F' BL
-Alg F BL' F' BL' F BL' F' BL'
+Alg B' F' BR' L R' BL U R BL' BR L' B' F BL' B'
+Alg B BL F' B L BR' BL R' U' BL' R L' BR F B
 
 Alg F' D BR F' R F R' BR' F D'
-Alg BB BL U' L U L' BL' U BB' U'
-Alg U BB U' BL L U' L' U BL' BB'
-
-Alg F BL F' BL' BB F' BR F BR' BB'
-Alg BB BR F' BR' BB' F BL F BL' F'
+Alg B BL U' L U L' BL' U B' U'
+Alg U B U' BL L U' L' U BL' B'
+
+Alg F BL F' BL' B F' BR F BR' B'
+Alg B BR F' BR' B' F BL F BL' F'
+`,
+  );
+}

package/src/cubing/search/inside/solve/puzzles/fto.ts

@@ -0,0 +1,58 @@
+import type { Alg } from "../../../../alg";
+import type { Transformation } from "../../../../kpuzzle";
+import { mustBeInsideWorker } from "../../inside-worker";
+import type { SGSCachedData } from "../parseSGS";
+import { randomStateFromSGS, TrembleSolver } from "../tremble";
+
+const TREMBLE_DEPTH = 3;
+
+let cachedTrembleSolver: Promise<TrembleSolver> | null = null;
+async function getCachedTrembleSolver(): Promise<TrembleSolver> {
+  return (
+    cachedTrembleSolver ||
+    (cachedTrembleSolver = (async (): Promise<TrembleSolver> => {
+      const sgs = await import("./fto.sgs.json");
+      const json: SGSCachedData = await sgs.sgsDataFTO();
+      return new TrembleSolver(await sgs.ftoDef(), json, [
+        "U",
+        "R",
+        "F",
+        "L",
+        "D",
+        "B",
+        "BR",
+        "BL",
+      ]);
+    })())
+  );
+}
+
+export async function preInitializeFTO(): Promise<void> {
+  await getCachedTrembleSolver();
+}
+
+// TODO: centers
+export async function solveFTO(state: Transformation): Promise<Alg> {
+  mustBeInsideWorker();
+  const trembleSolver = await getCachedTrembleSolver();
+  const alg = await trembleSolver.solve(
+    state,
+    TREMBLE_DEPTH,
+    () => 3, // TODO: Attach quantum move order lookup to puzzle.
+  );
+  return alg;
+}
+
+let warned = false;
+export async function randomFTOScramble(): Promise<Alg> {
+  if (!warned) {
+    console.warn(
+      "FTO scrambles are not yet optimized. They may be much too long (≈90 moves).",
+    );
+    warned = true;
+  }
+  const sgs = await import("./fto.sgs.json");
+  return solveFTO(
+    await randomStateFromSGS(await sgs.ftoDef(), await sgs.sgsDataFTO()),
+  );
+}

package/src/cubing/search/inside/solve/puzzles/sq1.ts

@@ -1,5 +1,5 @@
 import { Alg } from "../../../../alg";
-import { getRandomSquare1ScrambleString } from "../vendor/sq12phase/scramble_sq1";
+import { getRandomSquare1ScrambleString } from "../../../../vendor/sq12phase/scramble_sq1";
 
 export async function getRandomSquare1Scramble(): Promise<Alg> {
   return Alg.fromString(await getRandomSquare1ScrambleString());

package/src/cubing/search/inside/solve/puzzles/wca-minx.ts

@@ -1,4 +1,4 @@
-import { randomUIntBelowFactory } from "../vendor/random-uint-below";
+import { randomUIntBelowFactory } from "../../../../vendor/random-uint-below";
 
 const randomUIntBelowPromise = randomUIntBelowFactory();
 

package/src/cubing/search/inside/solve/tremble.ts

@@ -10,7 +10,7 @@ import {
 } from "../../../kpuzzle";
 import { countMoves } from "../../../notation";
 import type { SGSAction, SGSCachedData } from "./parseSGS";
-import { randomChoiceFactory } from "./vendor/random-uint-below";
+import { randomChoiceFactory } from "../../../vendor/random-uint-below";
 
 const DEFAULT_STAGE1_DEPTH_LIMIT = 2; // Moderately performant default.
 
@@ -170,6 +170,7 @@ export class TrembleSolver {
         const idx = loc.permutationIdx;
         key += ` ${inverseState[orbitName].permutation[idx]} ${inverseState[orbitName].orientation[idx]}`;
       }
+      // console.log(key, step.lookup);
       const info = step.lookup[key];
       if (!info) {
         throw new Error("Missing algorithm in sgs or esgs?");

package/src/cubing/search/instantiator.ts

@@ -4,7 +4,7 @@ import {
   constructWorkerFromString,
   workerFileConstructor,
   wrap,
-} from "./vendor/comlink-everywhere/outside";
+} from "../vendor/comlink-everywhere/outside";
 
 import type { esmTestAPIImplementation } from "./esm-test-worker";
 type ESMTestAPI = typeof esmTestAPIImplementation;