patrick/advent-of-code-2023
1
0
Fork 0
Code Issues Pull Requests 2 Packages Releases Activity

Better

Browse Source
This commit is contained in:
Smaug123
2023-12-05 20:11:20 +00:00
parent 10f71a4c46
commit 713b139bc2
5 changed files with 109 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/Day4.fs
View File

@@ -8,10 +8,10 @@ module Day4 =
let inline parseByte (chars : ReadOnlySpan<char>) : byte = let inline parseByte (chars : ReadOnlySpan<char>) : byte =
Byte.Parse (chars, NumberStyles.None, NumberFormatInfo.InvariantInfo) Byte.Parse (chars, NumberStyles.None, NumberFormatInfo.InvariantInfo)
//let mutable answer = 0uy //let mutable answer = 0uy
//for c in chars do //for c in chars do
// answer <- answer * 10uy + (byte c - 48uy) // answer <- answer * 10uy + (byte c - 48uy)
//answer //answer
let part1 (s : string) = let part1 (s : string) =
use lines = StringSplitEnumerator.make '\n' s use lines = StringSplitEnumerator.make '\n' s

180
AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/Day5.fs
View File

@@ -6,31 +6,34 @@ open System.Collections.Generic
[<Struct>] [<Struct>]
type Range = type Range =
{ {
SourceStart : uint64 SourceStart : uint32
DestStart : uint64 DestStart : uint32
Len : uint64 Len : uint32
} }
[<RequireQualifiedAccess>] [<RequireQualifiedAccess>]
module Day5 = module Day5 =
let remap (range : Range) (i : uint64) = let remap (range : Range) (i : uint32) =
if range.SourceStart <= i && i < range.SourceStart + range.Len then if range.SourceStart <= i && i - range.SourceStart < range.Len then
i - range.SourceStart + range.DestStart i + (range.DestStart - range.SourceStart) |> ValueSome
|> ValueSome
else else
ValueNone ValueNone
let parse (s : string) = let parse (s : string) =
use mutable lines = StringSplitEnumerator.make '\n' s use mutable lines = StringSplitEnumerator.make '\n' s
lines.MoveNext () |> ignore lines.MoveNext () |> ignore
let seeds = let seeds =
use mutable line1 = StringSplitEnumerator.make' ' ' lines.Current use mutable line1 = StringSplitEnumerator.make' ' ' lines.Current
StringSplitEnumerator.chomp "seeds:" &line1 StringSplitEnumerator.chomp "seeds:" &line1
let result = ResizeArray () let result = ResizeArray ()
while line1.MoveNext () do while line1.MoveNext () do
result.Add (UInt64.Parse line1.Current) result.Add (UInt32.Parse line1.Current)
result.ToArray () result.ToArray ()
lines.MoveNext () |> ignore lines.MoveNext () |> ignore
let mappings = ResizeArray () let mappings = ResizeArray ()
@@ -42,157 +45,150 @@ module Day5 =
if not (isNull currentMapping) then if not (isNull currentMapping) then
mappings.Add currentMapping mappings.Add currentMapping
currentMapping <- null currentMapping <- null
else if isNull currentMapping then
currentMapping <- ResizeArray ()
else else
if isNull currentMapping then use mutable line = StringSplitEnumerator.make' ' ' line
currentMapping <- ResizeArray () let destStart = StringSplitEnumerator.consumeU32 &line
else let sourceStart = StringSplitEnumerator.consumeU32 &line
use mutable line = StringSplitEnumerator.make' ' ' line let rangeLen = StringSplitEnumerator.consumeU32 &line
let destStart = StringSplitEnumerator.consumeU64 &line
let sourceStart = StringSplitEnumerator.consumeU64 &line {
let rangeLen = StringSplitEnumerator.consumeU64 &line SourceStart = sourceStart
{ DestStart = destStart
SourceStart = sourceStart Len = rangeLen
DestStart = destStart }
Len = rangeLen |> currentMapping.Add
}
|> currentMapping.Add
seeds, mappings seeds, mappings
let part1 (s : string) = let part1 (s : string) =
let seeds, mappings = parse s let seeds, mappings = parse s
let mutable best = UInt64.MaxValue let mutable best = UInt32.MaxValue
for seed in seeds do for seed in seeds do
let mutable remapped = seed let mutable remapped = seed
for map in mappings do for map in mappings do
let mutable hasRemappedThisLayer = false let mutable hasRemappedThisLayer = false
for interval in map do for interval in map do
if not hasRemappedThisLayer then if not hasRemappedThisLayer then
match remap interval remapped with match remap interval remapped with
| ValueNone -> | ValueNone -> ()
()
| ValueSome n -> | ValueSome n ->
hasRemappedThisLayer <- true hasRemappedThisLayer <- true
remapped <- n remapped <- n
if remapped < best then if remapped < best then
best <- remapped best <- remapped
best best
// The input ranges are inclusive at both ends.
let private split'' (ranges : (uint64 * uint64) ResizeArray) sourceStart sourceLen : unit =
let startsStack = ResizeArray ()
let endsStack = ResizeArray ()
startsStack.Add sourceStart
endsStack.Add (sourceStart + sourceLen - 1uL)
while startsStack.Count > 0 do
let mutable i = 0
while i < ranges.Count do
let low, high = ranges.[i]
if startsStack.Count > 0 && low <= startsStack.[startsStack.Count - 1] && endsStack.[endsStack.Count - 1] <= high then
// splitting because:
// low ... start .. finish .. high
ranges.[i] <- (low, startsStack.[startsStack.Count - 1] - 1uL)
ranges.Add (startsStack.[startsStack.Count - 1], endsStack.[endsStack.Count - 1])
ranges.Add (endsStack.[endsStack.Count - 1] + 1uL, high)
startsStack.RemoveAt (startsStack.Count - 1)
endsStack.RemoveAt (endsStack.Count - 1)
elif startsStack.Count > 0 && low <= startsStack.[startsStack.Count - 1] && startsStack.[startsStack.Count - 1] <= high then
// splitting because:
// low .. start .. high .. finish
ranges.[i] <- (low, startsStack.[startsStack.Count - 1] - 1uL)
ranges.Add (startsStack.[startsStack.Count - 1], high)
startsStack.[startsStack.Count - 1] <- high + 1uL
elif startsStack.Count > 0 && low > startsStack.[startsStack.Count - 1] && low < endsStack.[endsStack.Count - 1] && endsStack.[endsStack.Count - 1] <= high then
// splitting because:
// start .. low .. finish .. high
ranges.[i] <- (low, endsStack.[endsStack.Count - 1])
ranges.Add (endsStack.[endsStack.Count - 1], high)
endsStack.[endsStack.Count - 1] <- low - 1uL
elif startsStack.Count > 0 && low > startsStack.[startsStack.Count - 1] && low < endsStack.[endsStack.Count - 1] && high < endsStack.[endsStack.Count - 1] then
// splitting because:
// start .. low .. high .. finish
startsStack.Add (high + 1uL)
endsStack.Add endsStack.[endsStack.Count - 1]
endsStack.[endsStack.Count - 2] <- low - 1uL
i <- i + 1
// The input ranges are inclusive at both ends. // The input ranges are inclusive at both ends.
// Returns any range we didn't map. // Returns any range we didn't map.
let private split (result : ResizeArray<uint64 * uint64>) (start, finish) (rangeFromLayer : Range) : (uint64 * uint64 * (uint64 * uint64) voption) voption = let private split
let low, high = rangeFromLayer.SourceStart, rangeFromLayer.SourceStart + rangeFromLayer.Len - 1uL (result : ResizeArray<uint32 * uint32>)
(start, finish)
(rangeFromLayer : Range)
: (uint32 * uint32 * (uint32 * uint32) voption) voption
=
let low, high =
rangeFromLayer.SourceStart, rangeFromLayer.SourceStart + rangeFromLayer.Len - 1ul
if low <= start then if low <= start then
if finish <= high then if finish <= high then
// low ... start .. finish .. high // low ... start .. finish .. high
// so the entire input range gets mapped down // so the entire input range gets mapped down
result.Add (start - rangeFromLayer.SourceStart + rangeFromLayer.DestStart, finish - rangeFromLayer.SourceStart + rangeFromLayer.DestStart) result.Add (
start + rangeFromLayer.DestStart - rangeFromLayer.SourceStart,
finish + rangeFromLayer.DestStart - rangeFromLayer.SourceStart
)
ValueNone ValueNone
elif start <= high then elif start <= high then
// low .. start .. high .. finish // low .. start .. high .. finish
// so start .. high gets mapped down // so start .. high gets mapped down
// and high + 1 .. finish stays where it is. // and high + 1 .. finish stays where it is.
// high < finish is already guaranteed by previous if block. // high < finish is already guaranteed by previous if block.
result.Add (start - rangeFromLayer.SourceStart + rangeFromLayer.DestStart, high - rangeFromLayer.SourceStart + rangeFromLayer.DestStart) result.Add (
ValueSome (high + 1uL, finish, ValueNone) start + rangeFromLayer.DestStart - rangeFromLayer.SourceStart,
else high + rangeFromLayer.DestStart - rangeFromLayer.SourceStart
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
result.Add (low - rangeFromLayer.SourceStart + rangeFromLayer.DestStart, high - rangeFromLayer.SourceStart + rangeFromLayer.DestStart)
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
result.Add (low - rangeFromLayer.SourceStart + rangeFromLayer.DestStart, finish - rangeFromLayer.SourceStart + rangeFromLayer.DestStart)
ValueSome (start, low - 1uL, ValueNone)
else
ValueSome (start, finish, ValueNone)
let part2 (s : string) : uint64 = 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
result.Add (
low + rangeFromLayer.DestStart - rangeFromLayer.SourceStart,
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
result.Add (
low + rangeFromLayer.DestStart - rangeFromLayer.SourceStart,
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 seeds, mappings = parse s
let mutable intervals = ResizeArray () let mutable intervals = ResizeArray ()
for i = 0 to (seeds.Length - 1) / 2 do for i = 0 to (seeds.Length - 1) / 2 do
let t = seeds.[2 * i], seeds.[2 * i + 1] + seeds.[2 * i] - 1uL let t = seeds.[2 * i], seeds.[2 * i + 1] + seeds.[2 * i] - 1ul
intervals.Add t intervals.Add t
let mutable nextIntervals = ResizeArray () let mutable nextIntervals = ResizeArray ()
for mapLayer in mappings do for mapLayer in mappings do
let mutable i = 0 let mutable i = 0
while i < intervals.Count do while i < intervals.Count do
// split interval according to every map // split interval according to every map
let mutable allMoved = false let mutable allMoved = false
let mutable currentRange = 0 let mutable currentRange = 0
while not allMoved && currentRange < mapLayer.Count do while not allMoved && currentRange < mapLayer.Count do
let range = mapLayer.[currentRange] let range = mapLayer.[currentRange]
// range is e.g. 50 98 2, i.e. "98-99 goes to 50-51" // range is e.g. 50 98 2, i.e. "98-99 goes to 50-51"
match split nextIntervals intervals.[i] range with match split nextIntervals intervals.[i] range with
| ValueNone -> | ValueNone -> allMoved <- true
allMoved <- true
| ValueSome (start, finish, v) -> | ValueSome (start, finish, v) ->
intervals.[i] <- (start, finish) intervals.[i] <- (start, finish)
match v with match v with
| ValueNone -> () | ValueNone -> ()
| ValueSome (start, finish) -> | ValueSome (start, finish) -> intervals.Add (start, finish)
intervals.Add (start, finish)
currentRange <- currentRange + 1 currentRange <- currentRange + 1
if not allMoved then if not allMoved then
nextIntervals.Add intervals.[i] nextIntervals.Add intervals.[i]
i <- i + 1 i <- i + 1
let oldIntervals = intervals let oldIntervals = intervals
oldIntervals.Clear () oldIntervals.Clear ()
intervals <- nextIntervals intervals <- nextIntervals
nextIntervals <- oldIntervals nextIntervals <- oldIntervals
let mutable best = UInt64.MaxValue let mutable best = UInt32.MaxValue
for i, _ in intervals do for i, _ in intervals do
best <- min best i best <- min best i

6
AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.Lib/EfficientString.fs
View File

@@ -96,6 +96,12 @@ module StringSplitEnumerator =
Int32.Parse e.Current 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 = let consumeU64 (e : byref<StringSplitEnumerator>) : uint64 =
if not (e.MoveNext ()) then if not (e.MoveNext ()) then
failwith "expected an int, got nothing" failwith "expected an int, got nothing"

5
AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/Program.fs
View File

@@ -24,6 +24,7 @@ module Program =
let sw = Stopwatch.StartNew () let sw = Stopwatch.StartNew ()
printfn "=====Day 1=====" printfn "=====Day 1====="
do do
sw.Restart () sw.Restart ()
let input = Path.Combine (dir.FullName, "day1.txt") |> File.ReadAllText let input = Path.Combine (dir.FullName, "day1.txt") |> File.ReadAllText
@@ -38,6 +39,7 @@ module Program =
Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms") Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
printfn "=====Day 2=====" printfn "=====Day 2====="
do do
let input = Path.Combine (dir.FullName, "day2.txt") |> File.ReadAllText let input = Path.Combine (dir.FullName, "day2.txt") |> File.ReadAllText
sw.Restart () sw.Restart ()
@@ -52,6 +54,7 @@ module Program =
Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms") Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
printfn "=====Day 3=====" printfn "=====Day 3====="
do do
let input = Path.Combine (dir.FullName, "day3.txt") |> File.ReadAllBytes let input = Path.Combine (dir.FullName, "day3.txt") |> File.ReadAllBytes
@@ -89,6 +92,7 @@ module Program =
Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms") Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
printfn "=====Day 4=====" printfn "=====Day 4====="
do do
let input = Path.Combine (dir.FullName, "day4.txt") |> File.ReadAllText let input = Path.Combine (dir.FullName, "day4.txt") |> File.ReadAllText
sw.Restart () sw.Restart ()
@@ -103,6 +107,7 @@ module Program =
Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms") Console.Error.WriteLine ((1_000.0 * float sw.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms")
printfn "=====Day 5=====" printfn "=====Day 5====="
do do
let input = Path.Combine (dir.FullName, "day5.txt") |> File.ReadAllText let input = Path.Combine (dir.FullName, "day5.txt") |> File.ReadAllText
sw.Restart () sw.Restart ()

10
AdventOfCode2023.FSharp/Test/TestDay5.fs
View File

@@ -12,10 +12,12 @@ module TestDay5 =
let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day5.txt" let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day5.txt"
[<Test>] [<Test>]
let part1Sample () = sample |> Day5.part1 |> shouldEqual 35uL let part1Sample () =
sample |> Day5.part1 |> shouldEqual 35ul
[<Test>] [<Test>]
let part2Sample () = sample |> Day5.part2 |> shouldEqual 46uL let part2Sample () =
sample |> Day5.part2 |> shouldEqual 46ul
[<Test>] [<Test>]
let part1Actual () = let part1Actual () =
@@ -28,7 +30,7 @@ module TestDay5 =
Assert.Inconclusive () Assert.Inconclusive ()
failwith "unreachable" failwith "unreachable"
Day5.part1 s |> shouldEqual 806029445uL Day5.part1 s |> shouldEqual 806029445ul
[<Test>] [<Test>]
let part2Actual () = let part2Actual () =
@@ -41,4 +43,4 @@ module TestDay5 =
Assert.Inconclusive () Assert.Inconclusive ()
failwith "unreachable" failwith "unreachable"
Day5.part2 s |> shouldEqual 59370572uL Day5.part2 s |> shouldEqual 59370572ul