[Day 9] Improve

Author: goggle

README.md

@@ -18,7 +18,7 @@ This Julia package contains my solutions for [Advent of Code 2024](https://adven
 | 6 | [:white_check_mark:](https://adventofcode.com/2024/day/6) | 549.253 ms | 50.91 MiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day06.jl) |
 | 7 | [:white_check_mark:](https://adventofcode.com/2024/day/7) | 30.710 ms | 1.53 MiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day07.jl) |
 | 8 | [:white_check_mark:](https://adventofcode.com/2024/day/8) | 94.050 μs | 46.30 KiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day08.jl) |
-| 9 | [:white_check_mark:](https://adventofcode.com/2024/day/9) | 28.732 ms | 9.58 MiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day09.jl) |
+| 9 | [:white_check_mark:](https://adventofcode.com/2024/day/9) | 28.311 ms | 9.58 MiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day09.jl) |
 | 10 | [:white_check_mark:](https://adventofcode.com/2024/day/10) | 578.868 μs | 633.67 KiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day10.jl) |
 | 11 | [:white_check_mark:](https://adventofcode.com/2024/day/11) | 15.667 ms | 12.60 MiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day11.jl) |
 | 12 | [:white_check_mark:](https://adventofcode.com/2024/day/12) | 12.204 ms | 10.00 MiB | [:white_check_mark:](https://github.com/goggle/AdventOfCode2024.jl/blob/main/src/day12.jl) |

src/day09.jl

@@ -38,17 +38,13 @@ function part1!(blocks::Vector{MVector{4,Int}})
         freeindex = blocks[i][1] + blocks[i][3]
         free = blocks[i][2] - blocks[i][3]
         maxtransfer = blocks[j][3]
-        transfer = free >= maxtransfer ? maxtransfer : free
-        data[freeindex:freeindex+transfer-1] .= blocks[j][4]
-        data[blocks[j][1]+blocks[j][3]-transfer:blocks[j][1]+blocks[j][3]-1] .= -1
+        transfer = min(free, maxtransfer)
+        @views data[freeindex:freeindex+transfer-1] .= blocks[j][4]
+        @views data[blocks[j][1]+blocks[j][3]-transfer:blocks[j][1]+blocks[j][3]-1] .= -1
         blocks[i][3] += transfer
         blocks[j][3] -= transfer
-        if blocks[i][2] == blocks[i][3]
-            i += 1
-        end
-        if blocks[j][3] == 0
-            j -= 1
-        end
+        i += (blocks[i][2] == blocks[i][3])
+        j -= (blocks[j][3] == 0)
     end
     return data |> checksum
 end
@@ -61,8 +57,8 @@ function part2!(blocks::Vector{MVector{4,Int}})
         for i ∈ 1:j-1
             free = blocks[i][2] - blocks[i][3]
             if free >= transfer
-                data[blocks[i][1]+blocks[i][3]:blocks[i][1]+blocks[i][3]+transfer-1] .= blocks[j][4]
-                data[blocks[j][1]:blocks[j][1]+transfer-1] .= -1
+                @views data[blocks[i][1]+blocks[i][3]:blocks[i][1]+blocks[i][3]+transfer-1] .= blocks[j][4]
+                @views data[blocks[j][1]:blocks[j][1]+transfer-1] .= -1
                 blocks[i][3] += transfer
                 blocks[j][3] -= transfer
                 break
@@ -75,20 +71,17 @@ end
 function generate_disk(blocks::Vector{MVector{4,Int}})
     data = -1 * ones(Int, blocks[end][1] + blocks[end][2] - 1)
     for block ∈ blocks
-        @inbounds data[block[1]:block[1]+block[3]-1] .= block[4]
+        @views data[block[1]:block[1]+block[3]-1] .= block[4]
     end
     return data
 end
 
 function checksum(data::Vector{Int})
-    s, i = 0, 1
-    @inbounds while i < length(data)
-        if data[i] == -1
-            i += 1
-            continue
+    s = 0
+    @inbounds for i ∈ eachindex(data)
+        if data[i] != -1
+            s += data[i] * (i - 1)
         end
-        s += data[i] * (i - 1)
-        i += 1
     end
     return s
 end