day 22: change part1 to match part2 changes in input read.

2022-01-27 19:10:36 +01:00
parent 97411fbb08
commit 35053f3c8c
2 changed files with 154 additions and 36 deletions
--- a/2021/day22/EXAMPLE3.txt
+++ b/2021/day22/EXAMPLE3.txt
@@ -0,0 +1,60 @@
+on x=-5..47,y=-31..22,z=-19..33
+on x=-44..5,y=-27..21,z=-14..35
+on x=-49..-1,y=-11..42,z=-10..38
+on x=-20..34,y=-40..6,z=-44..1
+off x=26..39,y=40..50,z=-2..11
+on x=-41..5,y=-41..6,z=-36..8
+off x=-43..-33,y=-45..-28,z=7..25
+on x=-33..15,y=-32..19,z=-34..11
+off x=35..47,y=-46..-34,z=-11..5
+on x=-14..36,y=-6..44,z=-16..29
+on x=-57795..-6158,y=29564..72030,z=20435..90618
+on x=36731..105352,y=-21140..28532,z=16094..90401
+on x=30999..107136,y=-53464..15513,z=8553..71215
+on x=13528..83982,y=-99403..-27377,z=-24141..23996
+on x=-72682..-12347,y=18159..111354,z=7391..80950
+on x=-1060..80757,y=-65301..-20884,z=-103788..-16709
+on x=-83015..-9461,y=-72160..-8347,z=-81239..-26856
+on x=-52752..22273,y=-49450..9096,z=54442..119054
+on x=-29982..40483,y=-108474..-28371,z=-24328..38471
+on x=-4958..62750,y=40422..118853,z=-7672..65583
+on x=55694..108686,y=-43367..46958,z=-26781..48729
+on x=-98497..-18186,y=-63569..3412,z=1232..88485
+on x=-726..56291,y=-62629..13224,z=18033..85226
+on x=-110886..-34664,y=-81338..-8658,z=8914..63723
+on x=-55829..24974,y=-16897..54165,z=-121762..-28058
+on x=-65152..-11147,y=22489..91432,z=-58782..1780
+on x=-120100..-32970,y=-46592..27473,z=-11695..61039
+on x=-18631..37533,y=-124565..-50804,z=-35667..28308
+on x=-57817..18248,y=49321..117703,z=5745..55881
+on x=14781..98692,y=-1341..70827,z=15753..70151
+on x=-34419..55919,y=-19626..40991,z=39015..114138
+on x=-60785..11593,y=-56135..2999,z=-95368..-26915
+on x=-32178..58085,y=17647..101866,z=-91405..-8878
+on x=-53655..12091,y=50097..105568,z=-75335..-4862
+on x=-111166..-40997,y=-71714..2688,z=5609..50954
+on x=-16602..70118,y=-98693..-44401,z=5197..76897
+on x=16383..101554,y=4615..83635,z=-44907..18747
+off x=-95822..-15171,y=-19987..48940,z=10804..104439
+on x=-89813..-14614,y=16069..88491,z=-3297..45228
+on x=41075..99376,y=-20427..49978,z=-52012..13762
+on x=-21330..50085,y=-17944..62733,z=-112280..-30197
+on x=-16478..35915,y=36008..118594,z=-7885..47086
+off x=-98156..-27851,y=-49952..43171,z=-99005..-8456
+off x=2032..69770,y=-71013..4824,z=7471..94418
+on x=43670..120875,y=-42068..12382,z=-24787..38892
+off x=37514..111226,y=-45862..25743,z=-16714..54663
+off x=25699..97951,y=-30668..59918,z=-15349..69697
+off x=-44271..17935,y=-9516..60759,z=49131..112598
+on x=-61695..-5813,y=40978..94975,z=8655..80240
+off x=-101086..-9439,y=-7088..67543,z=33935..83858
+off x=18020..114017,y=-48931..32606,z=21474..89843
+off x=-77139..10506,y=-89994..-18797,z=-80..59318
+off x=8476..79288,y=-75520..11602,z=-96624..-24783
+on x=-47488..-1262,y=24338..100707,z=16292..72967
+off x=-84341..13987,y=2429..92914,z=-90671..-1318
+off x=-37810..49457,y=-71013..-7894,z=-105357..-13188
+off x=-27365..46395,y=31009..98017,z=15428..76570
+off x=-70369..-16548,y=22648..78696,z=-1892..86821
+on x=-53470..21291,y=-120233..-33476,z=-44150..38147
+off x=-93533..-4276,y=-16170..68771,z=-104985..-24507
--- a/2021/day22/aoc-c.c
+++ b/2021/day22/aoc-c.c
@@ -22,6 +22,7 @@

 typedef struct step {
    int onoff;
+    s64 volume;
    int x[2], y[2], z[2];
    struct list_head list_step;
 } step_t;
@@ -33,7 +34,14 @@ pool_t *pool_step;
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 #define MIN(x,y) ((x) < (y) ? (x) : (y))

-static void print_steps()
+static inline int cube_volume(step_t *c)
+{
+    return (c->x[1] - c->x[0] + 1) *
+        (c->y[1] - c->y[0] + 1) *
+        (c->z[1] - c->z[0] + 1);
+}
+
+static void print_cubes()
 {
    step_t *cur;
    int nlines = 1;
@@ -48,56 +56,89 @@ static void print_steps()
    }
 }

-static int read_input()
+static step_t *read_instruction(step_t *cube)
 {
    char onoff[5];
-    int nlines = 0;
-    step_t input, *cur;

-    pool_step = pool_create("steps", 512, sizeof(step_t));
-    while (scanf("%5s x=%d..%d,y=%d..%d,z=%d..%d\n", onoff,
-                 &input.x[0], &input.x[1],
-                 &input.y[0], &input.y[1],
-                 &input.z[0], &input.z[1]) == 7) {
-        cur = pool_get(pool_step);
-        *cur = input;
-        cur->onoff = onoff[1] == 'n';
-        list_add_tail(&cur->list_step, &list_step);
-        nlines++;
+    if (scanf("%5s x=%d..%d,y=%d..%d,z=%d..%d\n", onoff,
+              &cube->x[0], &cube->x[1],
+              &cube->y[0], &cube->y[1],
+              &cube->z[0], &cube->z[1]) == 7) {
+        cube->onoff = onoff[1] == 'n';
+        return cube;
    }
-    return nlines;
+    return NULL;
+}
+
+/* intersect 2 cubes (x axis calculation):
+ *
+ *  x10       x11
+ *  +---------+
+ *  |     x0  |
+ *  |     +---|---+
+ *  |     |   |   |
+ *  +---------+   |
+ *        |   x1  |
+ *        +-------+
+ *        x20     x21
+ *
+ * x0 = MAX(x10, x20)
+ * x1 = MIN(x11, x21)
+ *
+ * If x0 > x1, cubew do not intersect.
+ */
+static step_t *cube_intersect(step_t *c1, step_t *c2)
+{
+    step_t *cube = NULL;
+    int x[2], y[2], z[2];
+
+    x[0] = MAX(c1->x[0], c2->x[0]);
+    x[1] = MIN(c1->x[1], c2->x[1]);
+    if (x[0] > x[1])
+        goto end;
+    y[0] = MAX(c1->y[0], c2->y[0]);
+    y[1] = MIN(c1->y[1], c2->y[1]);
+    if (y[0] > y[1])
+        goto end;
+    z[0] = MAX(c1->z[0], c2->z[0]);
+    z[1] = MIN(c1->z[1], c2->z[1]);
+    if (z[0] > z[1])
+        goto end;
+    cube = pool_get(pool_step);
+    for (int i = 0; i < 2; ++i) {
+        cube->x[i] = x[i];
+        cube->y[i] = y[i];
+        cube->z[i] = z[i];
+    }
+    cube->volume = -cube_volume(cube);
+    list_add_tail(&cube->list_step, &list_step);
+end:
+    return cube;
 }

 static int part1()
 {
-    step_t *cur;
+    step_t cur;
    static char cuboid[101][101][101];
-    u64 res = 0;
+    int res = 0;

-/*    log(1, "%s x=(%d,%d) y=(%d,%d) z=(%d,%d)\n",
-        cur->onoff? "on": "off",
-        cur->x[0], cur->x[1],
-        cur->y[0], cur->y[1],
-        cur->z[0], cur->z[1]);
-*/
-
-    list_for_each_entry(cur, &list_step, list_step) {
+    while (read_instruction(&cur)) {
        int x1, x2, y1, y2, z1, z2;

-        x1 = MAX(cur->x[0], -50);
-        x2 = MIN(cur->x[1], 50);
+        x1 = MAX(cur.x[0], -50);
+        x2 = MIN(cur.x[1], 50);

-        y1 = MAX(cur->y[0], -50);
-        y2 = MIN(cur->y[1], 50);
+        y1 = MAX(cur.y[0], -50);
+        y2 = MIN(cur.y[1], 50);

-        z1 = MAX(cur->z[0], -50);
-        z2 = MIN(cur->z[1], 50);
+        z1 = MAX(cur.z[0], -50);
+        z2 = MIN(cur.z[1], 50);

        for (int x = x1; x <= x2; ++x) {
            for (int y = y1; y <= y2; ++y) {
                for (int z = z1; z <= z2; ++z) {
-                    log(1, "(%d,%d,%d)=%d\n", x, y, z, cur->onoff);
-                    cuboid[x+50][y+50][z+50] = cur->onoff;
+                    log(1, "(%d,%d,%d)=%d\n", x, y, z, cur.onoff);
+                    cuboid[x+50][y+50][z+50] = cur.onoff;
                }
            }
        }
@@ -113,9 +154,26 @@ static int part1()
    return res;
 }

+/* For part 2, we loop over all instructions (cuboid on/off):
+ * For all previous cuboids, search for intersection, then add a "negative"
+ * cuboid for it. If new cuboid is "on", add it also to the list.
+ */
 static int part2()
 {
-    return 1;
+    step_t *cur, *tmp, *inter, *new;
+    int res = 0;
+
+    while ((new = read_instruction(tmp = pool_get(pool_step)))) {
+        list_for_each_entry(cur, &list_step, list_step) {
+            inter = cube_intersect(new, cur);
+        }
+        list_add_tail(&cur->list_step, &list_step);
+        //list_add();
+            //list_for_each_entry_safe(cur, tmp, &list_step, list_step) {
+            //res++;
+    }
+    print_cubes();
+    return res;

 }

@@ -146,8 +204,8 @@ int main(int ac, char **av)
    if (optind < ac)
        return usage(*av);

-    read_input();
-    print_steps();
+    pool_step = pool_create("steps", 512, sizeof(step_t));
+
    printf("%s : res=%d\n", *av, part == 1? part1(): part2());

    exit(0);