Fix analysis

simonkellly · May 25, 2024 · 0709114 · 0709114
1 parent dfab86c
commit 0709114
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/src/lib/dnfAnalyser.ts b/src/lib/dnfAnalyser.ts
@@ -1,8 +1,8 @@
 import { Alg } from 'cubing/alg';
 import { KPattern, KTransformation } from 'cubing/kpuzzle';
 import { cube3x3x3 } from 'cubing/puzzles';
-import { extractAlgs } from './solutionParser';
 import { Penalty } from './db';
+import { extractAlgs } from './solutionParser';
 
 export const SOLVED = 'Solved';
 export const PLUS_TWO = '+2';
@@ -173,10 +173,12 @@ function checkPlusTwo(solvedState: KTransformation, solvedPattern: KPattern) {
     }
   }
   return false;
-
 }
 
-export async function penaltyChecker(scramble: string, solution: string): Promise<Penalty> {
+export async function penaltyChecker(
+  scramble: string,
+  solution: string
+): Promise<Penalty> {
   const puzzle = await cube3x3x3.kpuzzle();
 
   const scrambleTransformation = puzzle.algToTransformation(scramble);
@@ -218,7 +220,6 @@ export async function dnfAnalyser(
 
   if (isSolved) return SOLVED;
 
-
   const isInverseAlg = checkInverseAlg(
     scramblePattern,
     algs.map(a => a[0])

diff --git a/src/lib/solutionParser.ts b/src/lib/solutionParser.ts
@@ -477,7 +477,10 @@ export async function extractAlgs(
     }
 
     return [
-      foundComm.replaceAll(',', ', ').replaceAll(':', ': '),
+      foundComm
+        .replaceAll(',', ', ')
+        .replaceAll(':', ': ')
+        .replaceAll('][', '] ['),
       comment,
       moveIdx,
     ];

diff --git a/src/timer/resultsCard.tsx b/src/timer/resultsCard.tsx
@@ -64,7 +64,7 @@ function SolveDialog({
   const deleteSolve = () => {
     db.solves.delete(solve.id);
     close(false);
-  }
+  };
 
   const solutionStr = solve.solution.map(s => s.move).join(' ');
 
@@ -73,11 +73,13 @@ function SolveDialog({
       ? `DNF(${convertTimeToText(solve.time)})`
       : convertSolveToText(solve);
 
-  const twistyUrl = 'https://alpha.twizzle.net/edit/?' + new URLSearchParams({
-    "setup-alg": solve.scramble,
-    "alg": solve.parsed?.join('\n') || solutionStr,
-  }).toString();
-
+  const twistyUrl =
+    'https://alpha.twizzle.net/edit/?' +
+    new URLSearchParams({
+      'setup-alg': solve.scramble,
+      alg: solve.parsed?.join('\n') || solutionStr,
+    }).toString();
+
   return (
     <Dialog open={true} onOpenChange={close}>
       <DialogContent className="sm:max-w-[425px]">
@@ -103,18 +105,14 @@ function SolveDialog({
           <li className="font-medium">Algs in solve:</li>
           <ScrollArea className="h-64">
             {!solve.parsed && solutionStr}
-            {solve.parsed && solve.parsed.map((alg, i) => (
-              <li key={i + ' ' + alg}>{alg}</li>
-            ))}
+            {solve.parsed &&
+              solve.parsed.map((alg, i) => <li key={i + ' ' + alg}>{alg}</li>)}
           </ScrollArea>
         </ul>
         {analysis && <p className="font-medium">{analysis}</p>}
         <DialogFooter>
-
           <Button type="submit" asChild>
-            <a href={twistyUrl}>
-              Twisty
-            </a>
+            <a href={twistyUrl}>Twisty</a>
           </Button>
           <Button variant="secondary" type="button" onClick={analyse}>
             Analyse

diff --git a/src/timer/useCubeTimer.tsx b/src/timer/useCubeTimer.tsx
@@ -133,7 +133,10 @@ export default function useCubeTimer() {
     const solution = solutionMoves.map(move => move.move);
     const solutionStr = solution.join(' ');
 
-    const penalty = await penaltyChecker(TimerStore.state.originalScramble, solutionStr);
+    const penalty = await penaltyChecker(
+      TimerStore.state.originalScramble,
+      solutionStr
+    );
 
     newScramble();
 
@@ -147,7 +150,6 @@ export default function useCubeTimer() {
     } as Solve;
 
     await db.solves.add(solve);
-
   }, [stopwatch]);
 
   const updateStateFromSpaceBar = useCallback(