summary refs log tree commit diff homepage
diff options
context:
space:
mode:
-rw-r--r--2017/src/bin/day03.rs32
1 files changed, 5 insertions, 27 deletions
diff --git a/2017/src/bin/day03.rs b/2017/src/bin/day03.rs
index 4f38ac3..8a556a1 100644
--- a/2017/src/bin/day03.rs
+++ b/2017/src/bin/day03.rs
@@ -1,42 +1,20 @@
 use std::io::{self, Read};
 
-// 17  16  15  14  13
-// 18   5   4   3  12
-// 19   6   1   2  11
-// 20   7   8   9  10
-// 21  22  23---> ...
-//
-// 1 R
-// 1 U
-// 2 L
-// 2 D
-// 3 R
-// 3 U
-// 4 L
-// 4 D
-// 5 R
-
 fn solve1(input: i32) -> i32 {
-    let ds = [(1, 0), (0, 1), (-1, 0), (0, -1)];
-
+    let spiral = [(1, 0), (0, 1), (-1, 0), (0, -1)];
+    let (mut x, mut y) = (0i32, 0i32);
     let mut n = 1;
-    let mut x = 0i32;
-    let mut y = 0i32;
-    let mut r = 1;
-    let mut i = 0;
 
-    for &(dx, dy) in ds.iter().cycle() {
-        for _ in 0..r {
+    for (i, &(dx, dy)) in spiral.iter().cycle().enumerate() {
+        let length = 1 + i / 2;
+        for _ in 0..length {
             if n == input {
                 return x.abs() + y.abs();
             }
-
             n += 1;
             x += dx;
             y += dy;
         }
-        r += i % 2;
-        i += 1;
     }
     unreachable!()
 }
dc2c329a1833a181f7353aa62dcb64&follow=1'>Always refresh the screen with ^LChristian Kellermann 2022-03-05Update STANDARDS section authors, titles and URLsJune McEnroe 2022-03-02Show own nick on /nick without paramsJune McEnroe 2022-02-26Specify commands which depend on capsJune McEnroe 2022-02-26Only add available commands to completeJune McEnroe 2022-02-26Factor out commandAvailableJune McEnroe 2022-02-23Give examples of "general events" 2.1June McEnroe 2022-02-23Add missing unistd.h include in input.cJune McEnroe 2022-02-22Document the interfaceJune McEnroe 2022-02-20Clean up unimplemented editing mode stuffJune McEnroe 2022-02-20Save input buffer contentsJune McEnroe 2022-02-20Share a cut buffer between all edit buffersJune McEnroe 2022-02-20Assert return values in edit testsJune McEnroe 2022-02-20Move mbs out of struct Edit, use a global bufferJune McEnroe 2022-02-20Clear edit buffer before running commandJune McEnroe 2022-02-20Show indicator in status when window has pending inputJune McEnroe 2022-02-20Use separate edit buffers for each IDJune McEnroe 2022-02-20Make sure new cap is actually larger than new lengthJune McEnroe 2022-02-20Remove unused mbs.len field from struct EditJune McEnroe 2022-02-19Remove unneeded includes in ui.cJune McEnroe 2022-02-19Reimplement tab completeJune McEnroe 2022-02-19Handle errors from editFn, etc.June McEnroe 2022-02-19Reimplement text macrosJune McEnroe 2022-02-19Factor out input handling to input.cJune McEnroe 2022-02-19Factor out window management to window.cJune McEnroe 2022-02-19Enable -Wmissing-prototypesJune McEnroe 2022-02-19Fix edit.[ch] license notice additional permissionsJune McEnroe 2022-02-19Run line editing testsJune McEnroe 2022-02-18Implement new line editing "library"June McEnroe 2022-02-18Simplify cursor positioning in inputJune McEnroe 2022-02-18Fix M-f orderingJune McEnroe 2022-02-12Move sandman build to scripts/MakefileJune McEnroe 2022-02-12Use compat_readpassphrase.c on LinuxJune McEnroe 2022-02-12Copy RPP defines from oconfigureJune McEnroe