Merge pull request #62 from torjusti/fix/52

Fix issue #52

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cube-solver",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Solve Rubik's cube using the Kociemba algorithm.",
   "author": "Torjus Iveland <torjusti@gmail.com>",
   "main": "dist/bundle.js",

src/Search.js

@@ -138,7 +138,7 @@ class Search {
           const formatted = formatAlgorithm(solution.solution);
 
           if (solutionRotation) {
-            // If we have rotations in the scramble, apply them to the solution
+            // If we have rotations in the scramble, apply the inverse to the solution
             // and then parse again to remove the rotations. This results in a
             // solution that can be applied from the result scramble orientation.
             return formatAlgorithm(parseAlgorithm(`${solutionRotation} ${formatted}`));

src/algorithms.js

@@ -38,10 +38,14 @@ const normalize = (moves) => {
   // Replace wide moves with rotations + moves.
   moves = moves.reduce((acc, move) => {
     const axis = move.charAt(0);
-    const pow = move.charAt(1);
+    const pow = powers[move.charAt(1)];
 
     if (wideMoves[axis]) {
-      return acc.concat(wideMoves[axis].map((m) => m + pow));
+      for (let i = 0; i <= pow; i += 1) {
+        acc = acc.concat(wideMoves[axis]);
+      }
+
+      return acc;
     }
 
     return acc.concat(move);

src/tests/__snapshots__/algorithms.test.js.snap

@@ -5,10 +5,37 @@ Array [
   3,
   9,
   8,
-  11,
+  9,
+  9,
+  9,
   8,
   3,
   9,
-  5,
+  3,
+  3,
+  3,
+]
+`;
+
+exports[`algorithms should strip rotations from algorithms correctly 2`] = `
+Array [
+  9,
+  9,
+  9,
+  6,
+  6,
+  6,
+  0,
+  0,
+  0,
+  6,
+  6,
+  6,
+  9,
+  9,
+  9,
+  6,
+  6,
+  6,
 ]
 `;

src/tests/algorithms.test.js

@@ -1,7 +1,7 @@
 import * as algorithms from '../algorithms';
 
 describe('algorithms', () => {
-  it('allow parsing invalid algorithms', () => {
+  it('should not allow parsing invalid algorithms', () => {
     expect(() => {
       algorithms.parseAlgorithm("R U R' U' 1337 R' F R F'");
     }).toThrowError();
@@ -15,5 +15,9 @@ describe('algorithms', () => {
   it('should strip rotations from algorithms correctly', () => {
     expect(algorithms.parseAlgorithm("x R u R' u' y' z2 R' f R f'"))
       .toMatchSnapshot();
+
+    // Regression: Wide moves described using inverted rotations would
+    // add powers multiple times to a single move, crashing the parser. 
+    expect(algorithms.parseAlgorithm("f' r' u' b' l' d'")).toMatchSnapshot();
   });
 });