diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 4b19bd1..795c53e 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -1,4 +1,4 @@ -name: gofmt + zls +name: gofmt on: push: @@ -23,12 +23,10 @@ jobs: uses: actions/setup-go@v5 - name: Format all go files run: (cd ./2024/go/ && go fmt ./...) - - name: Format all go files - run: (cd ./2024/zig/ && zig fmt .) - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v5.0.1 with: commit_message: | - Autoformatting with gofmt + zls + Autoformatting with gofmt [skip ci] diff --git a/2024/go/day1/main.go b/2024/day1/main.go similarity index 100% rename from 2024/go/day1/main.go rename to 2024/day1/main.go diff --git a/2024/go/day2/main.go b/2024/day2/main.go similarity index 100% rename from 2024/go/day2/main.go rename to 2024/day2/main.go diff --git a/2024/go/go.mod b/2024/go.mod similarity index 100% rename from 2024/go/go.mod rename to 2024/go.mod diff --git a/2024/go/test.txt b/2024/go/test.txt deleted file mode 100644 index b49c10d..0000000 --- a/2024/go/test.txt +++ /dev/null @@ -1,6 +0,0 @@ -7 6 4 2 1 -1 2 7 8 9 -9 7 6 2 1 -1 3 2 4 5 -8 6 4 4 1 -1 3 6 7 9 diff --git a/2024/zig/build.zig b/2024/zig/build.zig deleted file mode 100644 index f8751f0..0000000 --- a/2024/zig/build.zig +++ /dev/null @@ -1,91 +0,0 @@ -const std = @import("std"); - -// Although this function looks imperative, note that its job is to -// declaratively construct a build graph that will be executed by an external -// runner. -pub fn build(b: *std.Build) void { - // Standard target options allows the person running `zig build` to choose - // what target to build for. Here we do not override the defaults, which - // means any target is allowed, and the default is native. Other options - // for restricting supported target set are available. - const target = b.standardTargetOptions(.{}); - - // Standard optimization options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not - // set a preferred release mode, allowing the user to decide how to optimize. - const optimize = b.standardOptimizeOption(.{}); - - const lib = b.addStaticLibrary(.{ - .name = "zig", - // In this case the main source file is merely a path, however, in more - // complicated build scripts, this could be a generated file. - .root_source_file = b.path("src/root.zig"), - .target = target, - .optimize = optimize, - }); - - // This declares intent for the library to be installed into the standard - // location when the user invokes the "install" step (the default step when - // running `zig build`). - b.installArtifact(lib); - - const exe = b.addExecutable(.{ - .name = "zig", - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, - }); - - // This declares intent for the executable to be installed into the - // standard location when the user invokes the "install" step (the default - // step when running `zig build`). - b.installArtifact(exe); - - // This *creates* a Run step in the build graph, to be executed when another - // step is evaluated that depends on it. The next line below will establish - // such a dependency. - const run_cmd = b.addRunArtifact(exe); - - // By making the run step depend on the install step, it will be run from the - // installation directory rather than directly from within the cache directory. - // This is not necessary, however, if the application depends on other installed - // files, this ensures they will be present and in the expected location. - run_cmd.step.dependOn(b.getInstallStep()); - - // This allows the user to pass arguments to the application in the build - // command itself, like this: `zig build run -- arg1 arg2 etc` - if (b.args) |args| { - run_cmd.addArgs(args); - } - - // This creates a build step. It will be visible in the `zig build --help` menu, - // and can be selected like this: `zig build run` - // This will evaluate the `run` step rather than the default, which is "install". - const run_step = b.step("run", "Run the app"); - run_step.dependOn(&run_cmd.step); - - // Creates a step for unit testing. This only builds the test executable - // but does not run it. - const lib_unit_tests = b.addTest(.{ - .root_source_file = b.path("src/root.zig"), - .target = target, - .optimize = optimize, - }); - - const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests); - - const exe_unit_tests = b.addTest(.{ - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, - }); - - const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); - - // Similar to creating the run step earlier, this exposes a `test` step to - // the `zig build --help` menu, providing a way for the user to request - // running the unit tests. - const test_step = b.step("test", "Run unit tests"); - test_step.dependOn(&run_lib_unit_tests.step); - test_step.dependOn(&run_exe_unit_tests.step); -} diff --git a/2024/zig/build.zig.zon b/2024/zig/build.zig.zon deleted file mode 100644 index 11575f5..0000000 --- a/2024/zig/build.zig.zon +++ /dev/null @@ -1,72 +0,0 @@ -.{ - // This is the default name used by packages depending on this one. For - // example, when a user runs `zig fetch --save `, this field is used - // as the key in the `dependencies` table. Although the user can choose a - // different name, most users will stick with this provided value. - // - // It is redundant to include "zig" in this name because it is already - // within the Zig package namespace. - .name = "zig", - - // This is a [Semantic Version](https://semver.org/). - // In a future version of Zig it will be used for package deduplication. - .version = "0.0.0", - - // This field is optional. - // This is currently advisory only; Zig does not yet do anything - // with this value. - //.minimum_zig_version = "0.11.0", - - // This field is optional. - // Each dependency must either provide a `url` and `hash`, or a `path`. - // `zig build --fetch` can be used to fetch all dependencies of a package, recursively. - // Once all dependencies are fetched, `zig build` no longer requires - // internet connectivity. - .dependencies = .{ - // See `zig fetch --save ` for a command-line interface for adding dependencies. - //.example = .{ - // // When updating this field to a new URL, be sure to delete the corresponding - // // `hash`, otherwise you are communicating that you expect to find the old hash at - // // the new URL. - // .url = "https://example.com/foo.tar.gz", - // - // // This is computed from the file contents of the directory of files that is - // // obtained after fetching `url` and applying the inclusion rules given by - // // `paths`. - // // - // // This field is the source of truth; packages do not come from a `url`; they - // // come from a `hash`. `url` is just one of many possible mirrors for how to - // // obtain a package matching this `hash`. - // // - // // Uses the [multihash](https://multiformats.io/multihash/) format. - // .hash = "...", - // - // // When this is provided, the package is found in a directory relative to the - // // build root. In this case the package's hash is irrelevant and therefore not - // // computed. This field and `url` are mutually exclusive. - // .path = "foo", - - // // When this is set to `true`, a package is declared to be lazily - // // fetched. This makes the dependency only get fetched if it is - // // actually used. - // .lazy = false, - //}, - }, - - // Specifies the set of files and directories that are included in this package. - // Only files and directories listed here are included in the `hash` that - // is computed for this package. Only files listed here will remain on disk - // when using the zig package manager. As a rule of thumb, one should list - // files required for compilation plus any license(s). - // Paths are relative to the build root. Use the empty string (`""`) to refer to - // the build root itself. - // A directory listed here means that all files within, recursively, are included. - .paths = .{ - "build.zig", - "build.zig.zon", - "src", - // For example... - //"LICENSE", - //"README.md", - }, -} diff --git a/2024/zig/src/day1/main.zig b/2024/zig/src/day1/main.zig deleted file mode 100644 index cfa4cf1..0000000 --- a/2024/zig/src/day1/main.zig +++ /dev/null @@ -1,86 +0,0 @@ -const std = @import("std"); -const math = @import("std").math; -const fs = std.fs; - -const ArrayList = std.ArrayList; - -fn part1(first_col: []i32, second_col: []i32) i32 { - const first_sorted = first_col; - const second_sorted = second_col; - - std.mem.sort(i32, first_sorted, {}, comptime std.sort.asc(i32)); - std.mem.sort(i32, second_sorted, {}, comptime std.sort.asc(i32)); - - var sum: u32 = 0.0; - for (first_sorted, 0..) |value, index| { - sum += @abs(value - second_sorted[index]); - } - - return @intCast(sum); -} - -fn part2(first_col: []const i32, second_col: []const i32) i32 { - const allocator = std.heap.page_allocator; - - var counts: std.AutoHashMap(i32, i32) = std.AutoHashMap(i32, i32).init(allocator); - for (second_col) |value| { - const current_count = counts.get(value) orelse 0; - counts.put(value, current_count + 1) catch { - return 0; - }; - } - - var sum: i32 = 0; - for (first_col) |value| { - // Use .get() with a default value of 0 - const count = counts.get(value) orelse 0; - if (count > 0) { - sum += value * count; - counts.put(value, count - 1) catch { - return 0; - }; - } - } - - return sum; -} - -pub fn main() !void { - const allocator = std.heap.page_allocator; - - const args = try std.process.argsAlloc(allocator); - defer std.process.argsFree(std.heap.page_allocator, args); - - if (args.len < 2) { - std.debug.panic("Please provide a filename\n", .{}); - } - - const filename = args[1]; - const file = try fs.cwd().openFile(filename, .{}); - defer file.close(); - - var first_col = ArrayList(i32).init(allocator); - var second_col = ArrayList(i32).init(allocator); - - var reader = file.reader(); - var line_buf: [4096]u8 = undefined; - - while (try reader.readUntilDelimiterOrEof(&line_buf, '\n')) |line| { - var tokens = std.mem.split(u8, line, " "); - - const first = tokens.next().?; - const second = tokens.next().?; - - const first_num = try std.fmt.parseInt(i32, first, 10); - const second_num = try std.fmt.parseInt(i32, second, 10); - - try first_col.append(first_num); - try second_col.append(second_num); - } - - const answer1 = part1(first_col.items, second_col.items); - std.debug.print("{}\n", .{answer1}); - - const answer2 = part2(first_col.items, second_col.items); - std.debug.print("{}\n", .{answer2}); -} diff --git a/2024/zig/zig-out/bin/zig b/2024/zig/zig-out/bin/zig deleted file mode 100755 index 031b15b..0000000 Binary files a/2024/zig/zig-out/bin/zig and /dev/null differ diff --git a/2024/zig/zig-out/lib/libzig.a b/2024/zig/zig-out/lib/libzig.a deleted file mode 100644 index e48db14..0000000 Binary files a/2024/zig/zig-out/lib/libzig.a and /dev/null differ