voroskoi/aoc2023-zig - Change 6PHXH7CUABMFHJAZDJHFQTOQIVRLCYVONQOKBYYGBOC5Z3EAZJTQC

Day5: make second part faster

Created by voroskoi on February 22, 2024

6PHXH7CUABMFHJAZDJHFQTOQIVRLCYVONQOKBYYGBOC5Z3EAZJTQC

Dependencies

[2] L3YH2NPCEC3XFHRLLAH2VQYDLPKO5CTQOZ5LQ6Y46UHZPKCEO5ZQC

In channels

main

Change contents

Replacement in src/day05.zig at line 25 [2.7269]

B:BD[2.7819] → [2.7819:7870]

    var ret: usize = std.math.maxInt(AlmanacType);

[2.7819]

[2.7870]

    var ranges = std.ArrayList([2]AlmanacType).init(allocator);
    defer ranges.deinit();

Replacement in src/day05.zig at line 28 [2.7269]

B:BD[2.7871] → [2.7871:7910]

    for (0..alm.seeds.items.len) |i| {

[2.7871]

[2.7910]

    var next = std.ArrayList([2]AlmanacType).init(allocator);
    defer next.deinit();
    for (alm.seeds.items, 0..) |item, i| {

Replacement in src/day05.zig at line 33 [2.7269]

B:BD[2.7944] → [2.7944:8144]

        for (alm.seeds.items[i]..alm.seeds.items[i] + alm.seeds.items[i + 1]) |seed| {
            const loc = alm.getLocation(@intCast(seed));
            if (loc < ret) {
                ret = loc;

[2.7944]

[2.8144]

        try ranges.append(.{ item, item + alm.seeds.items[i + 1] });
    }
    for (0..7) |map_id| {
        RANGES: while (ranges.popOrNull()) |range| {
            // std.debug.print("{any}\n", .{range});
            for (alm.maps[map_id].items) |m_item| {
                const offset: isize = @as(isize, @intCast(m_item.destination)) - m_item.from;
                // std.debug.print("map: {} {} => {}\n", .{ m_item.from, m_item.to, offset });
                if (range[1] <= m_item.from) {
                    // range is before the map start
                } else if (m_item.to <= range[0]) {
                    // range is after the map end
                } else if (m_item.from <= range[0] and m_item.to >= range[1]) {
                    // range fully contained in the map
                    try next.append(.{ @intCast(range[0] + offset), @intCast(range[1] + offset) });
                    continue :RANGES;
                } else if (m_item.from >= range[0] and m_item.to < range[1]) {
                    // map fully contained int the range
                    try next.append(.{ m_item.destination, m_item.destination + m_item.range });
                    if (m_item.from != range[0]) try ranges.append(.{ range[0], m_item.from });
                    try ranges.append(.{ m_item.to, range[1] });
                    continue :RANGES;
                } else if (m_item.from <= range[0] and m_item.to <= range[1]) {
                    // map - range - map - range
                    try next.append(.{ @intCast(range[0] + offset), @intCast(m_item.to + offset) });
                    try ranges.append(.{ m_item.to, range[1] });
                    continue :RANGES;
                } else if (range[0] <= m_item.from and range[1] <= m_item.to) {
                    // range - map - range - map
                    try next.append(.{ @intCast(m_item.from + offset), @intCast(range[1] + offset) });
                    try ranges.append(.{ range[0], m_item.from });
                    continue :RANGES;
                } else {
                    unreachable;
                }

Insertion in src/day05.zig at line 70 [2.7269]
[2.8158]
[2.8158]
```
            try next.append(range);
```

Insertion in src/day05.zig at line 72 [2.7269]

[2.8168]


        // std.debug.print("{any}\n\n", .{next.items});
        ranges.shrinkRetainingCapacity(0);
        try ranges.appendSlice(next.items);
        next.shrinkRetainingCapacity(0);

Insertion in src/day05.zig at line 80 [2.7269]

[2.8175]

    var ret: AlmanacType = std.math.maxInt(AlmanacType);
    for (ranges.items) |range| {
        if (range[0] < ret) ret = range[0];
    }

Replacement in src/day05.zig at line 88 [2.7269]
B:BD[2.8194] → [2.8194:8219]
```
const AlmanacType = u32;
```
[2.8194]
[2.8219]
```
const AlmanacType = u48;
```
Replacement in src/day05.zig at line 91 [2.7269]
B:BD[2.8277] → [2.8277:8302]
```
    source: AlmanacType,
```
[2.8277]
[2.8302]
```
    from: AlmanacType,
    to: AlmanacType,
```

Replacement in src/day05.zig at line 120 [2.7269]

B:BD[2.9030] → [2.9030:9169]

            if (seed >= item.source and seed <= item.source + item.range) {
                ret = item.destination + (seed - item.source);

[2.9030]

[2.9169]

            if (seed >= item.from and seed < item.to) {
                ret = item.destination + (seed - item.from);

Replacement in src/day05.zig at line 133 [2.7269]

B:BD[2.9410] → [2.9410:9579]

                if (map_value >= item.source and map_value <= item.source +| item.range) {
                    map_value = item.destination + (map_value - item.source);

[2.9410]

[2.9579]

                if (map_value >= item.from and map_value < item.to) {
                    map_value = item.destination + (map_value - item.from);

Replacement in src/day05.zig at line 177 [2.7269]

B:BD[2.10969] → [2.10969:11062]

                try alm.maps[map_no].append(.{ .destination = d, .source = s, .range = r });

[2.10969]

[2.11062]

                try alm.maps[map_no].append(.{ .destination = d, .from = s, .to = s + r, .range = r });