standardize input data reading

milanaleksic · Dec 9, 2023 · 1aba228 · 1aba228
1 parent 628f485
commit 1aba228
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 40 deletions.
diff --git a/src/_template.zig b/src/_template.zig
@@ -3,13 +3,38 @@ const util = @import("util.zig");
 const mem = std.mem;
 const print = std.debug.print;
 
+const Data = struct {
+    const Self = @This();
+    allocator: std.mem.Allocator,
+
+    rows: std.ArrayList(std.ArrayList(i64)),
+
+    pub fn init(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !Self {
+        for (list.items) |line| {
+            print("line={s}\n", .{line});
+        }
+        return Self{
+            // store data
+            .allocator = allocator,
+        };
+    }
+
+    pub fn deinit(self: *Self) void {
+        _ = self;
+        // deinit data
+    }
+};
+
 pub fn part1(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !i64 {
-    _ = allocator;
     var sum: i64 = 0;
 
-    for (list.items) |line| {
-        print("line={s}\n", .{line});
-    }
+    var data = try Data.init(allocator, list);
+    defer data.deinit();
+
+    // access input data...
+    // for (data.rows.items) |rowData| {
+
+    // }
 
     return sum;
 }
@@ -21,24 +46,27 @@ test "part 1 test 1" {
     defer list.deinit();
 
     const testValue: i64 = try part1(std.testing.allocator, list);
-    try std.testing.expectEqual(testValue, 13);
+    try std.testing.expectEqual(testValue, -1);
 }
 
 test "part 1 full" {
     var data = try util.openFile(std.testing.allocator, "data/input-N-1.txt");
     defer data.deinit();
 
     const testValue: i64 = try part1(std.testing.allocator, data.lines);
-    try std.testing.expectEqual(testValue, 27059);
+    try std.testing.expectEqual(testValue, -1);
 }
 
 pub fn part2(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !i64 {
-    _ = allocator;
     var sum: i64 = 0;
 
-    for (list.items) |line| {
-        print("line={s}\n", .{line});
-    }
+    var data = try Data.init(allocator, list);
+    defer data.deinit();
+
+    // access input data...
+    // for (data.rows.items) |rowData| {
+
+    // }
 
     return sum;
 }
@@ -50,13 +78,13 @@ test "part 2 test 1" {
     defer list.deinit();
 
     const testValue: i64 = try part2(std.testing.allocator, list);
-    try std.testing.expectEqual(testValue, 0);
+    try std.testing.expectEqual(testValue, -1);
 }
 
 test "part 2 full" {
     var data = try util.openFile(std.testing.allocator, "data/input-N-1.txt");
     defer data.deinit();
 
     const testValue: i64 = try part2(std.testing.allocator, data.lines);
-    try std.testing.expectEqual(testValue, 0);
+    try std.testing.expectEqual(testValue, -1);
 }
diff --git a/src/day9.zig b/src/day9.zig
@@ -3,12 +3,46 @@ const util = @import("util.zig");
 const mem = std.mem;
 const print = std.debug.print;
 
+const Data = struct {
+    const Self = @This();
+    allocator: std.mem.Allocator,
+
+    rows: std.ArrayList(std.ArrayList(i64)),
+
+    pub fn init(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !Self {
+        var rows: std.ArrayList(std.ArrayList(i64)) = std.ArrayList(std.ArrayList(i64)).init(allocator);
+        for (list.items) |line| {
+            var row: std.ArrayList(i64) = std.ArrayList(i64).init(allocator);
+            var lineIter = std.mem.split(u8, line, " ");
+            while (lineIter.next()) |number| {
+                if (number.len == 0) {
+                    continue;
+                }
+                try row.append(try util.toI64(number));
+            }
+            try rows.append(row);
+        }
+        return Self{
+            .rows = rows,
+            .allocator = allocator,
+        };
+    }
+
+    pub fn deinit(self: *Self) void {
+        for (self.rows.items) |row| {
+            row.deinit();
+        }
+        self.rows.deinit();
+    }
+};
+
 pub fn part1(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !i64 {
     var sum: i64 = 0;
 
-    for (list.items) |line| {
-        // print("line={s}\n", .{line});
+    var data = try Data.init(allocator, list);
+    defer data.deinit();
 
+    for (data.rows.items) |rowData| {
         var pyramid: std.ArrayList(std.ArrayList(i64)) = std.ArrayList(std.ArrayList(i64)).init(allocator);
         defer {
             for (pyramid.items) |row| {
@@ -17,17 +51,7 @@ pub fn part1(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !i64
             pyramid.deinit();
         }
 
-        var row: std.ArrayList(i64) = std.ArrayList(i64).init(allocator);
-
-        // convert to pyramid
-        var lineIter = std.mem.split(u8, line, " ");
-        while (lineIter.next()) |number| {
-            if (number.len == 0) {
-                continue;
-            }
-            try row.append(try util.toI64(number));
-        }
-        try pyramid.append(row);
+        try pyramid.append(try rowData.clone());
 
         // printPyramid(pyramid);
 
@@ -103,9 +127,10 @@ test "part 1 full" {
 pub fn part2(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !i64 {
     var sum: i64 = 0;
 
-    for (list.items) |line| {
-        // print("line={s}\n", .{line});
+    var data = try Data.init(allocator, list);
+    defer data.deinit();
 
+    for (data.rows.items) |rowData| {
         var pyramid: std.ArrayList(std.ArrayList(i64)) = std.ArrayList(std.ArrayList(i64)).init(allocator);
         defer {
             for (pyramid.items) |row| {
@@ -114,19 +139,7 @@ pub fn part2(allocator: std.mem.Allocator, list: std.ArrayList([]const u8)) !i64
             pyramid.deinit();
         }
 
-        var row: std.ArrayList(i64) = std.ArrayList(i64).init(allocator);
-
-        // convert to pyramid
-        var lineIter = std.mem.split(u8, line, " ");
-        while (lineIter.next()) |number| {
-            if (number.len == 0) {
-                continue;
-            }
-            try row.append(try util.toI64(number));
-        }
-        try pyramid.append(row);
-
-        // printPyramid(pyramid);
+        try pyramid.append(try rowData.clone());
 
         // calculate lower rows
         while (true) {