Day 12. Part 2

hankolsen · hankolsen · commit 5d5572be745b · 2020-12-12T19:21:35.000+01:00
diff --git a/2020/12/test.js b/2020/12/test.js
@@ -34,10 +34,10 @@ describe('it should solve part 1 and part 2', () => {
     expect(rotations[0]({ waypoint: { x: 1, y: 3 } })).toEqual({ waypoint: { x: 1, y: 3 } });
     expect(rotations[1]({ waypoint: { x: 1, y: 3 } })).toEqual({ waypoint: { x: 3, y: -1 } });
     expect(rotations[2]({ waypoint: { x: 1, y: 3 } })).toEqual({ waypoint: { x: -1, y: -3 } });
-    expect(rotations[3]({ waypoint: { x: 1, y: 3 } })).toEqual({ waypoint: { x: 3, y: 1 } });
+    expect(rotations[3]({ waypoint: { x: 1, y: 3 } })).toEqual({ waypoint: { x: -3, y: 1 } });
     expect(rotations[1]({ waypoint: { x: 10, y: 4 } })).toEqual({ waypoint: { x: 4, y: -10 } });
     expect(rotations[2]({ waypoint: { x: 10, y: 4 } })).toEqual({ waypoint: { x: -10, y: -4 } });
-    expect(rotations[3]({ waypoint: { x: 10, y: 4 } })).toEqual({ waypoint: { x: 4, y: 10 } });
+    expect(rotations[3]({ waypoint: { x: 10, y: 4 } })).toEqual({ waypoint: { x: -4, y: 10 } });
   });
   test('it should solve example 1', () => {
     expect(util1(input1)).toEqual(25);
diff --git a/2020/12/utils.js b/2020/12/utils.js
@@ -58,7 +58,7 @@ const rotations = {
   },
   3: ({ ship, waypoint }) => {
     const { x, y } = waypoint;
-    waypoint.x = y;
+    waypoint.x = -y;
     waypoint.y = x;
     return { ship, waypoint };
   },
@@ -115,7 +115,6 @@ const util2 = (input) => {
   const { ship, waypoint } = input.reduce(
     ({ ship, waypoint }, instruction) => {
       const [, letter, number] = instruction.match(/([NSEWLRF])(\d+)/) || [];
-      console.log(letter, number, ship, waypoint);
       return instructions2[letter](Number(number), { ship, waypoint });
     },
     {
@@ -129,7 +128,6 @@ const util2 = (input) => {
       },
     },
   );
-  console.log({ ship, waypoint });
   return manhattanDistance(ship);
 };
 
