Fix

.woodpecker/.build.yml

@@ -3,16 +3,9 @@ steps:
     image: nixos/nix
     commands:
       - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf
-      # Lint
-      - "nix flake check"
-      # Test
-      - nix develop --command dotnet test AdventOfCode2023.FSharp
-      - nix develop --command dotnet test AdventOfCode2023.FSharp --configuration Release
-      - nix develop --command alejandra --check .
-      - nix develop --command dotnet tool restore
-      - nix develop --command dotnet fantomas --check .
-      # - nix develop --command dotnet publish AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.fsproj --configuration Release
-      # - nix develop --command sh -c "$(find . -type f -name AdventOfCode2023.FSharp | grep Release | grep publish) AdventOfCode2023.FSharp/Test/samples"
+      - nix develop --command dotnet --info
+      - nix develop --command dotnet publish AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.fsproj --configuration Release
+      - nix develop --command sh -c "$(find . -type f -name AdventOfCode2023.FSharp | grep Release | grep publish) AdventOfCode2023.FSharp/Test/samples"
 
     when:
       - event: "push"

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/AdventOfCode2023.FSharp.Lib.fsproj

@@ -11,8 +11,6 @@
         <Compile Include="Day1.fs" />
         <Compile Include="Day2.fs" />
         <Compile Include="Day3.fs" />
-        <Compile Include="Day4.fs" />
-        <Compile Include="Day5.fs" />
     </ItemGroup>
 
 </Project>

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/Day4.fs

@@ -1,103 +0,0 @@
-namespace AdventOfCode2023
-
-open System
-open System.Globalization
-
-[<RequireQualifiedAccess>]
-module Day4 =
-
-    let inline parseByte (chars : ReadOnlySpan<char>) : byte =
-        Byte.Parse (chars, NumberStyles.None, NumberFormatInfo.InvariantInfo)
-    //let mutable answer = 0uy
-    //for c in chars do
-    //    answer <- answer * 10uy + (byte c - 48uy)
-    //answer
-
-    let part1 (s : string) =
-        use lines = StringSplitEnumerator.make '\n' s
-        let mutable total = 0
-        let winningNumbers = ResizeArray<byte> ()
-
-        for line in lines do
-            if not (line.IsWhiteSpace ()) then
-                let mutable accumulatingWinning = true
-                winningNumbers.Clear ()
-                use mutable split = StringSplitEnumerator.make' ' ' line
-                StringSplitEnumerator.chomp "Card" &split
-
-                while split.Current.IsEmpty || split.Current.[split.Current.Length - 1] <> ':' do
-                    split.MoveNext () |> ignore
-
-                split.MoveNext () |> ignore
-
-                while accumulatingWinning do
-                    while split.Current.IsEmpty do
-                        split.MoveNext () |> ignore
-
-                    if split.Current.[0] = '|' then
-                        accumulatingWinning <- false
-                    else
-                        winningNumbers.Add (parseByte split.Current)
-                        split.MoveNext () |> ignore
-
-                let mutable answer = 0
-
-                while split.MoveNext () do
-                    if not split.Current.IsEmpty then
-                        let n = parseByte split.Current
-
-                        if winningNumbers.Contains n then
-                            answer <- answer + 1
-
-                if answer > 0 then
-                    total <- total + (1 <<< (answer - 1))
-
-        total
-
-
-
-    let part2 (s : string) =
-        use lines = StringSplitEnumerator.make '\n' s
-        let winningNumbers = ResizeArray<byte> ()
-        let winners = ResizeArray<int> ()
-
-        for line in lines do
-            if not (line.IsWhiteSpace ()) then
-                let mutable accumulatingWinning = true
-                winningNumbers.Clear ()
-                use mutable split = StringSplitEnumerator.make' ' ' line
-                StringSplitEnumerator.chomp "Card" &split
-
-                while split.Current.IsEmpty || split.Current.[split.Current.Length - 1] <> ':' do
-                    split.MoveNext () |> ignore
-
-                split.MoveNext () |> ignore
-
-                while accumulatingWinning do
-                    while split.Current.IsEmpty do
-                        split.MoveNext () |> ignore
-
-                    if split.Current.[0] = '|' then
-                        accumulatingWinning <- false
-                    else
-                        winningNumbers.Add (parseByte split.Current)
-                        split.MoveNext () |> ignore
-
-                let mutable answer = 0
-
-                while split.MoveNext () do
-                    if not split.Current.IsEmpty then
-                        let n = parseByte split.Current
-
-                        if winningNumbers.Contains n then
-                            answer <- answer + 1
-
-                winners.Add answer
-
-        let ans = Array.create winners.Count 1
-
-        for i = 0 to winners.Count - 1 do
-            for j = i + 1 to winners.[i] + i do
-                ans.[j] <- ans.[j] + ans.[i]
-
-        ans |> Array.sum

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/Day5.fs

@@ -1,191 +0,0 @@
-namespace AdventOfCode2023
-
-open System
-
-[<Struct>]
-type Range =
-    {
-        SourceStart : uint32
-        DestStart : uint32
-        Len : uint32
-    }
-
-[<RequireQualifiedAccess>]
-module Day5 =
-
-    let parse (s : string) =
-        use mutable lines = StringSplitEnumerator.make '\n' s
-        lines.MoveNext () |> ignore
-
-        let seeds =
-            use mutable line1 = StringSplitEnumerator.make' ' ' lines.Current
-            StringSplitEnumerator.chomp "seeds:" &line1
-            let result = ResizeArray ()
-
-            while line1.MoveNext () do
-                result.Add (UInt32.Parse line1.Current)
-
-            result.ToArray ()
-
-        lines.MoveNext () |> ignore
-
-        let mappings = ResizeArray ()
-
-        let mutable currentMapping = null
-
-        for line in lines do
-            if line.IsEmpty then
-                if not (isNull currentMapping) then
-                    mappings.Add currentMapping
-                    currentMapping <- null
-            else if isNull currentMapping then
-                currentMapping <- ResizeArray ()
-            else
-                use mutable line = StringSplitEnumerator.make' ' ' line
-                let destStart = StringSplitEnumerator.consumeU32 &line
-                let sourceStart = StringSplitEnumerator.consumeU32 &line
-                let rangeLen = StringSplitEnumerator.consumeU32 &line
-
-                {
-                    SourceStart = sourceStart
-                    DestStart = destStart
-                    Len = rangeLen
-                }
-                |> currentMapping.Add
-
-        seeds, mappings
-
-    let part1 (s : string) =
-        let seeds, mappings = parse s
-
-        let mutable best = UInt32.MaxValue
-
-        for seed in seeds do
-            let mutable remapped = seed
-
-            for map in mappings do
-                let mutable hasRemappedThisLayer = false
-
-                for interval in map do
-                    if not hasRemappedThisLayer then
-                        if
-                            interval.SourceStart <= remapped
-                            && remapped - interval.SourceStart < interval.Len
-                        then
-                            hasRemappedThisLayer <- true
-                            remapped <- remapped + (interval.DestStart - interval.SourceStart)
-
-            if remapped < best then
-                best <- remapped
-
-        best
-
-    // The input ranges are inclusive at both ends.
-    // Returns any range we didn't map.
-    let private split
-        (resultStarts : ResizeArray<uint32>)
-        (resultEnds : ResizeArray<uint32>)
-        start
-        finish
-        (rangeFromLayer : Range)
-        : (uint32 * uint32 * (uint32 * uint32) voption) voption
-        =
-        let low = rangeFromLayer.SourceStart
-        let high = rangeFromLayer.SourceStart + rangeFromLayer.Len - 1ul
-
-        if low <= start then
-            if finish <= high then
-                // low ... start .. finish .. high
-                // so the entire input range gets mapped down
-                resultStarts.Add (start + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-                resultEnds.Add (finish + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-
-                ValueNone
-            elif start <= high then
-                // low .. start .. high .. finish
-                // so start .. high gets mapped down
-                // and high + 1 .. finish stays where it is.
-                // high < finish is already guaranteed by previous if block.
-                resultStarts.Add (start + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-                resultEnds.Add (high + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-
-                ValueSome (high + 1ul, finish, ValueNone)
-            else
-                ValueSome (start, finish, ValueNone)
-        else if high <= finish then
-            // start .. low .. high .. finish
-            // so start .. low - 1 stays where it is
-            // low .. high gets mapped down
-            // and high + 1 .. finish stays where it is
-            resultStarts.Add (low + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-            resultEnds.Add (high + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-
-            ValueSome (start, low - 1ul, ValueSome (high + 1ul, finish))
-        elif low < finish then
-            // start .. low .. finish .. high
-            // so start .. low - 1 stays where it is
-            // and low .. finish gets mapped down
-            resultStarts.Add (low + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-            resultEnds.Add (finish + rangeFromLayer.DestStart - rangeFromLayer.SourceStart)
-
-            ValueSome (start, low - 1ul, ValueNone)
-        else
-            ValueSome (start, finish, ValueNone)
-
-    let part2 (s : string) : uint32 =
-        let seeds, mappings = parse s
-
-        let mutable intervalStarts = ResizeArray ()
-        let mutable intervalEnds = ResizeArray ()
-
-        for i = 0 to (seeds.Length - 1) / 2 do
-            intervalStarts.Add seeds.[2 * i]
-            intervalEnds.Add (seeds.[2 * i + 1] + seeds.[2 * i] - 1ul)
-
-        let mutable nextIntervalStarts = ResizeArray ()
-        let mutable nextIntervalEnds = ResizeArray ()
-
-        for mapLayer in mappings do
-            let mutable i = 0
-
-            while i < intervalStarts.Count do
-                // split interval according to every map
-                let mutable allMoved = false
-                let mutable currentRange = 0
-
-                while not allMoved && currentRange < mapLayer.Count do
-                    let range = mapLayer.[currentRange]
-                    // range is e.g. 50 98 2, i.e. "98-99 goes to 50-51"
-                    match split nextIntervalStarts nextIntervalEnds intervalStarts.[i] intervalEnds.[i] range with
-                    | ValueNone -> allMoved <- true
-                    | ValueSome (start, finish, v) ->
-                        intervalStarts.[i] <- start
-                        intervalEnds.[i] <- finish
-
-                        match v with
-                        | ValueNone -> ()
-                        | ValueSome (start, finish) ->
-                            intervalStarts.Add start
-                            intervalEnds.Add finish
-
-                    currentRange <- currentRange + 1
-
-                if not allMoved then
-                    nextIntervalStarts.Add intervalStarts.[i]
-                    nextIntervalEnds.Add intervalEnds.[i]
-
-                i <- i + 1
-
-            let oldIntervals = intervalStarts
-            oldIntervals.Clear ()
-            intervalStarts <- nextIntervalStarts
-            nextIntervalStarts <- oldIntervals
-
-            let oldIntervals = intervalEnds
-            oldIntervals.Clear ()
-            intervalEnds <- nextIntervalEnds
-            nextIntervalEnds <- oldIntervals
-
-
-        // SIMD go brrr
-        System.Linq.Enumerable.Min intervalStarts

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/EfficientString.fs

@@ -95,15 +95,3 @@ module StringSplitEnumerator =
             failwith "expected an int, got nothing"
 
         Int32.Parse e.Current
-
-    let consumeU32 (e : byref<StringSplitEnumerator>) : uint32 =
-        if not (e.MoveNext ()) then
-            failwith "expected an int, got nothing"
-
-        UInt32.Parse e.Current
-
-    let consumeU64 (e : byref<StringSplitEnumerator>) : uint64 =
-        if not (e.MoveNext ()) then
-            failwith "expected an int, got nothing"
-
-        UInt64.Parse e.Current

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.fsproj

@@ -1,28 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <PublishAot>true</PublishAot>
-        <InvariantGlobalization>true</InvariantGlobalization>
-        <UseSystemResourceKeys>true</UseSystemResourceKeys>
-
-        <IlcOptimizationPreference>Speed</IlcOptimizationPreference>
-        <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
-
-        <DebuggerSupport>false</DebuggerSupport>
-        <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
-        <EventSourceSupport>false</EventSourceSupport>
-        <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
-        <MetadataUpdaterSupport>false</MetadataUpdaterSupport>
     </PropertyGroup>
 
     <ItemGroup>
         <Compile Include="Program.fs"/>
     </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\AdventOfCode2023.FSharp.Lib\AdventOfCode2023.FSharp.Lib.fsproj" />
-    </ItemGroup>
-
 </Project>

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/Program.fs

@@ -1,131 +1,7 @@
-namespace AdventOfCode2023
-
-#if DEBUG
-#else
-#nowarn "9"
-#endif
-
-open System
-open System.Diagnostics
-open System.IO
+namespace AdventOfCode2023
 
 module Program =
 
-    let inline toUs (ticks : int64) =
-        1_000_000.0 * float ticks / float Stopwatch.Frequency
-
     [<EntryPoint>]
     let main argv =
-        let endToEnd = Stopwatch.StartNew ()
-        endToEnd.Restart ()
-
-        let dir = DirectoryInfo argv.[0]
-
-        let sw = Stopwatch.StartNew ()
-
-        printfn "=====Day 1====="
-
-        do
-            sw.Restart ()
-            let input = Path.Combine (dir.FullName, "day1.txt") |> File.ReadAllText
-            let part1 = Day1.part1 input
-            sw.Stop ()
-            Console.WriteLine (part1.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-            sw.Restart ()
-            let part2 = Day1.part2 input
-            sw.Stop ()
-            Console.WriteLine (part2.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-
-        printfn "=====Day 2====="
-
-        do
-            let input = Path.Combine (dir.FullName, "day2.txt") |> File.ReadAllText
-            sw.Restart ()
-            let part1 = Day2.part1 input
-            sw.Stop ()
-            Console.WriteLine (part1.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-            sw.Restart ()
-            let part2 = Day2.part2 input
-            sw.Stop ()
-            Console.WriteLine (part2.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-
-        printfn "=====Day 3====="
-
-        do
-            let input = Path.Combine (dir.FullName, "day3.txt") |> File.ReadAllBytes
-
-            sw.Restart ()
-            let resultArr, len, lineCount = Day3.parse input
-            sw.Stop ()
-
-            Console.Error.WriteLine (
-                (1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString ()
-                + "ms parse"
-            )
-#if DEBUG
-            let contents =
-                {
-                    Elements = Array.take len resultArr
-                    Width = len / lineCount
-                }
-#else
-            use ptr = fixed resultArr
-
-            let contents =
-                {
-                    Elements = ptr
-                    Length = len
-                    Width = len / lineCount
-                }
-#endif
-            let part1 = Day3.part1 contents
-            sw.Stop ()
-            Console.WriteLine (part1.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-            sw.Restart ()
-            let part2 = Day3.part2 contents
-            Console.WriteLine (part2.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-
-        printfn "=====Day 4====="
-
-        do
-            let input = Path.Combine (dir.FullName, "day4.txt") |> File.ReadAllText
-            sw.Restart ()
-            let part1 = Day4.part1 input
-            sw.Stop ()
-            Console.WriteLine (part1.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-            sw.Restart ()
-            let part2 = Day4.part2 input
-            sw.Stop ()
-            Console.WriteLine (part2.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-
-        printfn "=====Day 5====="
-
-        do
-            let input = Path.Combine (dir.FullName, "day5.txt") |> File.ReadAllText
-            sw.Restart ()
-            let part1 = Day5.part1 input
-            sw.Stop ()
-            Console.WriteLine (part1.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-            sw.Restart ()
-            let part2 = Day5.part2 input
-            sw.Stop ()
-            Console.WriteLine (part2.ToString ())
-            Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
-
-        endToEnd.Stop ()
-
-        Console.Error.WriteLine (
-            (1_000.0 * float endToEnd.ElapsedTicks / float Stopwatch.Frequency).ToString ()
-            + "ms total"
-        )
-
         0

AdventOfCode2023.FSharp/Test/Test.fsproj

@@ -12,14 +12,10 @@
         <Compile Include="TestDay1.fs" />
         <Compile Include="TestDay2.fs" />
         <Compile Include="TestDay3.fs" />
-        <Compile Include="TestDay4.fs" />
-        <Compile Include="TestDay5.fs" />
         <EmbeddedResource Include="samples\day1.txt" />
         <EmbeddedResource Include="samples\day1part1.txt" />
         <EmbeddedResource Include="samples\day2.txt" />
         <EmbeddedResource Include="samples\day3.txt" />
-        <EmbeddedResource Include="samples\day4.txt" />
-        <EmbeddedResource Include="samples\day5.txt" />
     </ItemGroup>
 
     <ItemGroup>

AdventOfCode2023.FSharp/Test/TestDay4.fs

@@ -1,43 +0,0 @@
-namespace AdventOfCode2023.Test
-
-open AdventOfCode2023
-open NUnit.Framework
-open FsUnitTyped
-open System.IO
-
-[<TestFixture>]
-module TestDay4 =
-
-    let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day4.txt"
-
-    [<Test>]
-    let part1Sample () = sample |> Day4.part1 |> shouldEqual 13
-
-    [<Test>]
-    let part2Sample () = sample |> Day4.part2 |> shouldEqual 30
-
-    [<Test>]
-    let part1Actual () =
-        let s =
-            try
-                File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day4.txt"))
-            with
-            | :? DirectoryNotFoundException
-            | :? FileNotFoundException ->
-                Assert.Inconclusive ()
-                failwith "unreachable"
-
-        Day4.part1 s |> shouldEqual 27454
-
-    [<Test>]
-    let part2Actual () =
-        let s =
-            try
-                File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day4.txt"))
-            with
-            | :? DirectoryNotFoundException
-            | :? FileNotFoundException ->
-                Assert.Inconclusive ()
-                failwith "unreachable"
-
-        Day4.part2 s |> shouldEqual 6857330

AdventOfCode2023.FSharp/Test/TestDay5.fs

@@ -1,46 +0,0 @@
-namespace AdventOfCode2023.Test
-
-open System
-open AdventOfCode2023
-open NUnit.Framework
-open FsUnitTyped
-open System.IO
-
-[<TestFixture>]
-module TestDay5 =
-
-    let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day5.txt"
-
-    [<Test>]
-    let part1Sample () =
-        sample |> Day5.part1 |> shouldEqual 35ul
-
-    [<Test>]
-    let part2Sample () =
-        sample |> Day5.part2 |> shouldEqual 46ul
-
-    [<Test>]
-    let part1Actual () =
-        let s =
-            try
-                File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day5.txt"))
-            with
-            | :? DirectoryNotFoundException
-            | :? FileNotFoundException ->
-                Assert.Inconclusive ()
-                failwith "unreachable"
-
-        Day5.part1 s |> shouldEqual 806029445ul
-
-    [<Test>]
-    let part2Actual () =
-        let s =
-            try
-                File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day5.txt"))
-            with
-            | :? DirectoryNotFoundException
-            | :? FileNotFoundException ->
-                Assert.Inconclusive ()
-                failwith "unreachable"
-
-        Day5.part2 s |> shouldEqual 59370572ul

AdventOfCode2023.FSharp/Test/samples/day4.txt

@@ -1,6 +0,0 @@
-Card 1: 41 48 83 86 17 | 83 86  6 31 17  9 48 53
-Card 2: 13 32 20 16 61 | 61 30 68 82 17 32 24 19
-Card 3:  1 21 53 59 44 | 69 82 63 72 16 21 14  1
-Card 4: 41 92 73 84 69 | 59 84 76 51 58  5 54 83
-Card 5: 87 83 26 28 32 | 88 30 70 12 93 22 82 36
-Card 6: 31 18 13 56 72 | 74 77 10 23 35 67 36 11

AdventOfCode2023.FSharp/Test/samples/day5.txt

@@ -1,33 +0,0 @@
-seeds: 79 14 55 13
-
-seed-to-soil map:
-50 98 2
-52 50 48
-
-soil-to-fertilizer map:
-0 15 37
-37 52 2
-39 0 15
-
-fertilizer-to-water map:
-49 53 8
-0 11 42
-42 0 7
-57 7 4
-
-water-to-light map:
-88 18 7
-18 25 70
-
-light-to-temperature map:
-45 77 23
-81 45 19
-68 64 13
-
-temperature-to-humidity map:
-0 69 1
-1 0 69
-
-humidity-to-location map:
-60 56 37
-56 93 4