From 7a02e47899d3552cf4fa60c5b7c80d89649f9fb7 Mon Sep 17 00:00:00 2001 From: Gabriel Bizdoc Date: Mon, 8 Dec 2025 05:25:43 +0200 Subject: [PATCH] refactor aoc.utils --- year25/day1.go | 2 +- year25/day2.go | 2 +- year25/day3.go | 2 +- year25/day4.go | 2 +- year25/day5.go | 2 +- year25/day5.ts | 1 + year25/day6.go | 2 +- year25/day7.go | 13 ------------- year25/day7_pg/stack.go | 13 +++++++++++++ 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/year25/day1.go b/year25/day1.go index 04066ad..67f2508 100644 --- a/year25/day1.go +++ b/year25/day1.go @@ -7,7 +7,7 @@ import ( "iter" "strconv" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" ) func Day1Part1(ctx aoc.Context) (any, error) { diff --git a/year25/day2.go b/year25/day2.go index 771581a..ab91c12 100644 --- a/year25/day2.go +++ b/year25/day2.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" ) type day2Scanner struct { diff --git a/year25/day3.go b/year25/day3.go index 22b3885..493c347 100644 --- a/year25/day3.go +++ b/year25/day3.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" ) func Day3Part1(ctx aoc.Context) (any, error) { diff --git a/year25/day4.go b/year25/day4.go index 192c597..16ceed6 100644 --- a/year25/day4.go +++ b/year25/day4.go @@ -3,7 +3,7 @@ package year25 import ( "fmt" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" "git.bizdoc.ro/private/devkit.git/collections/geometry/v2" ) diff --git a/year25/day5.go b/year25/day5.go index 79669d8..6a27954 100644 --- a/year25/day5.go +++ b/year25/day5.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" ) type Day5Interval struct { diff --git a/year25/day5.ts b/year25/day5.ts index 89bee7a..1e7210d 100644 --- a/year25/day5.ts +++ b/year25/day5.ts @@ -9,6 +9,7 @@ const [start, end] = [0, 1] function part1(input: string): number { const [db, ids] = parseInput(input) return ids.filter(currentId => { + // @ts-ignore return db.find(id => id[start] <= currentId && id[end] >= currentId) }).length } diff --git a/year25/day6.go b/year25/day6.go index bbf110f..af22264 100644 --- a/year25/day6.go +++ b/year25/day6.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" "git.bizdoc.ro/private/devkit.git/collections/geometry/v2" ) diff --git a/year25/day7.go b/year25/day7.go index dce1647..4cd6dc6 100644 --- a/year25/day7.go +++ b/year25/day7.go @@ -4,8 +4,6 @@ import ( "fmt" "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aocutils" - "git.bizdoc.ro/gabi-public/Advent-of-Code.git/year25/day7_pg" "git.bizdoc.ro/private/devkit.git/collections/geometry/v2" ) @@ -79,14 +77,3 @@ func Day7Part2(c aoc.Context) (int, error) { } return fill(g, h, start), nil } - -func Day7Part1Render(c aoc.Context) (int, error) { - g, start, err := day7ParseInput(c) - if err != nil { - return 0, fmt.Errorf("day7: failed to parse input %w", err) - } - var ev day7_pg.Day7Part1RenderEvent - for ev = range day7_pg.Day7ProgressFillPart1(g, start) { - } - return int(ev.TotalProcessed), nil -} diff --git a/year25/day7_pg/stack.go b/year25/day7_pg/stack.go index bf11dc2..e29bb35 100644 --- a/year25/day7_pg/stack.go +++ b/year25/day7_pg/stack.go @@ -3,6 +3,7 @@ package day7_pg import ( "iter" + "git.bizdoc.ro/gabi-public/Advent-of-Code.git/aoc" "git.bizdoc.ro/private/devkit.git/collections/dsa" "git.bizdoc.ro/private/devkit.git/collections/geometry/v2" ) @@ -46,3 +47,15 @@ func Day7ProgressFillPart1(g geometry.Grid[byte], start geometry.Point) iter.Seq } } } + +func Day7Part1Render(c aoc.Context) (int, error) { + panic("not implmented") + //g, start, err := day7ParseInput(c) + //if err != nil { + // return 0, fmt.Errorf("day7: failed to parse input %w", err) + //} + //var ev Day7Part1RenderEvent + //for ev = range Day7ProgressFillPart1(g, start) { + //} + //return int(ev.TotalProcessed), nil +}