Compare commits
13 Commits
fd90f94653
...
minimal
Author | SHA1 | Date | |
---|---|---|---|
|
337d11e0e6 | ||
|
a401d8cf5c | ||
|
61f15726a1 | ||
|
d50618676f | ||
|
ad28718b3e | ||
|
8c244330b7 | ||
|
3cd5ae8635 | ||
|
aa2ace9bf9 | ||
|
e64b9f7cf2 | ||
|
4efbddd9d2 | ||
|
56d0b0c44e | ||
|
331092ff44 | ||
|
89958b0fa0 |
@@ -3,11 +3,9 @@ steps:
|
|||||||
image: nixos/nix
|
image: nixos/nix
|
||||||
commands:
|
commands:
|
||||||
- echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf
|
- echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf
|
||||||
# Lint
|
- nix develop --command dotnet --info
|
||||||
- "nix flake check"
|
- nix develop --command dotnet publish AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.fsproj --configuration Release
|
||||||
# Test
|
- nix develop --command sh -c "$(find . -type f -name AdventOfCode2023.FSharp | grep Release | grep publish) AdventOfCode2023.FSharp/Test/samples"
|
||||||
- nix develop --command dotnet test
|
|
||||||
- nix develop --command dotnet test --configuration Release
|
|
||||||
|
|
||||||
when:
|
when:
|
||||||
- event: "push"
|
- event: "push"
|
||||||
|
@@ -1,28 +1,12 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<PublishAot>true</PublishAot>
|
<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>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Program.fs"/>
|
<Compile Include="Program.fs"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\AdventOfCode2023.FSharp.Lib\AdventOfCode2023.FSharp.Lib.fsproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@@ -1,91 +1,7 @@
|
|||||||
namespace AdventOfCode2023
|
namespace AdventOfCode2023
|
||||||
|
|
||||||
#if DEBUG
|
|
||||||
#else
|
|
||||||
#nowarn "9"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
open System
|
|
||||||
open System.Diagnostics
|
|
||||||
open System.IO
|
|
||||||
|
|
||||||
module Program =
|
module Program =
|
||||||
|
|
||||||
let inline toUs (ticks : int64) =
|
|
||||||
1_000_000.0 * float ticks / float Stopwatch.Frequency
|
|
||||||
|
|
||||||
[<EntryPoint>]
|
[<EntryPoint>]
|
||||||
let main argv =
|
let main argv =
|
||||||
let endToEnd = Stopwatch.StartNew ()
|
|
||||||
endToEnd.Restart ()
|
|
||||||
|
|
||||||
let dir = DirectoryInfo argv.[0]
|
|
||||||
|
|
||||||
let sw = Stopwatch.StartNew ()
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
endToEnd.Stop ()
|
|
||||||
Console.Error.WriteLine ((1_000.0 * float endToEnd.ElapsedTicks / float Stopwatch.Frequency).ToString () + "ms total")
|
|
||||||
|
|
||||||
0
|
0
|
||||||
|
@@ -8,9 +8,14 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="Util.fs" />
|
||||||
<Compile Include="TestDay1.fs" />
|
<Compile Include="TestDay1.fs" />
|
||||||
<Compile Include="TestDay2.fs" />
|
<Compile Include="TestDay2.fs" />
|
||||||
<Compile Include="TestDay3.fs" />
|
<Compile Include="TestDay3.fs" />
|
||||||
|
<EmbeddedResource Include="samples\day1.txt" />
|
||||||
|
<EmbeddedResource Include="samples\day1part1.txt" />
|
||||||
|
<EmbeddedResource Include="samples\day2.txt" />
|
||||||
|
<EmbeddedResource Include="samples\day3.txt" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@@ -8,26 +8,13 @@ open System.IO
|
|||||||
[<TestFixture>]
|
[<TestFixture>]
|
||||||
module TestDay1 =
|
module TestDay1 =
|
||||||
|
|
||||||
let sample1 =
|
let sample1 = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day1part1.txt"
|
||||||
"""1abc2
|
|
||||||
pqr3stu8vwx
|
|
||||||
a1b2c3d4e5f
|
|
||||||
treb7uchet
|
|
||||||
"""
|
|
||||||
|
|
||||||
[<Test>]
|
[<Test>]
|
||||||
let part1Sample () =
|
let part1Sample () =
|
||||||
sample1 |> Day1.part1 |> shouldEqual 142
|
sample1 |> Day1.part1 |> shouldEqual 142
|
||||||
|
|
||||||
let sample2 =
|
let sample2 = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day1.txt"
|
||||||
"""two1nine
|
|
||||||
eightwothree
|
|
||||||
abcone2threexyz
|
|
||||||
xtwone3four
|
|
||||||
4nineeightseven2
|
|
||||||
zoneight234
|
|
||||||
7pqrstsixteen
|
|
||||||
"""
|
|
||||||
|
|
||||||
[<Test>]
|
[<Test>]
|
||||||
let part2Sample () =
|
let part2Sample () =
|
||||||
@@ -38,7 +25,9 @@ zoneight234
|
|||||||
let s =
|
let s =
|
||||||
try
|
try
|
||||||
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day1.txt"))
|
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day1.txt"))
|
||||||
with :? FileNotFoundException ->
|
with
|
||||||
|
| :? DirectoryNotFoundException
|
||||||
|
| :? FileNotFoundException ->
|
||||||
Assert.Inconclusive ()
|
Assert.Inconclusive ()
|
||||||
failwith "unreachable"
|
failwith "unreachable"
|
||||||
|
|
||||||
@@ -49,7 +38,9 @@ zoneight234
|
|||||||
let s =
|
let s =
|
||||||
try
|
try
|
||||||
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day1.txt"))
|
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day1.txt"))
|
||||||
with :? FileNotFoundException ->
|
with
|
||||||
|
| :? DirectoryNotFoundException
|
||||||
|
| :? FileNotFoundException ->
|
||||||
Assert.Inconclusive ()
|
Assert.Inconclusive ()
|
||||||
failwith "unreachable"
|
failwith "unreachable"
|
||||||
|
|
||||||
|
@@ -8,13 +8,7 @@ open System.IO
|
|||||||
[<TestFixture>]
|
[<TestFixture>]
|
||||||
module TestDay2 =
|
module TestDay2 =
|
||||||
|
|
||||||
let sample =
|
let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day2.txt"
|
||||||
"""Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green
|
|
||||||
Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue
|
|
||||||
Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red
|
|
||||||
Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red
|
|
||||||
Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
|
|
||||||
"""
|
|
||||||
|
|
||||||
[<Test>]
|
[<Test>]
|
||||||
let part1Sample () = sample |> Day2.part1 |> shouldEqual 8
|
let part1Sample () = sample |> Day2.part1 |> shouldEqual 8
|
||||||
@@ -28,7 +22,9 @@ Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
|
|||||||
let s =
|
let s =
|
||||||
try
|
try
|
||||||
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day2.txt"))
|
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day2.txt"))
|
||||||
with :? FileNotFoundException ->
|
with
|
||||||
|
| :? DirectoryNotFoundException
|
||||||
|
| :? FileNotFoundException ->
|
||||||
Assert.Inconclusive ()
|
Assert.Inconclusive ()
|
||||||
failwith "unreachable"
|
failwith "unreachable"
|
||||||
|
|
||||||
@@ -39,7 +35,9 @@ Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
|
|||||||
let s =
|
let s =
|
||||||
try
|
try
|
||||||
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day2.txt"))
|
File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day2.txt"))
|
||||||
with :? FileNotFoundException ->
|
with
|
||||||
|
| :? DirectoryNotFoundException
|
||||||
|
| :? FileNotFoundException ->
|
||||||
Assert.Inconclusive ()
|
Assert.Inconclusive ()
|
||||||
failwith "unreachable"
|
failwith "unreachable"
|
||||||
|
|
||||||
|
@@ -13,18 +13,7 @@ open System.IO
|
|||||||
[<TestFixture>]
|
[<TestFixture>]
|
||||||
module TestDay3 =
|
module TestDay3 =
|
||||||
|
|
||||||
let sample =
|
let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day3.txt"
|
||||||
"""467..114..
|
|
||||||
...*......
|
|
||||||
..35..633.
|
|
||||||
......#...
|
|
||||||
617*......
|
|
||||||
.....+.58.
|
|
||||||
..592.....
|
|
||||||
......755.
|
|
||||||
...$.*....
|
|
||||||
.664.598..
|
|
||||||
"""
|
|
||||||
|
|
||||||
[<Test>]
|
[<Test>]
|
||||||
let part1Sample () =
|
let part1Sample () =
|
||||||
@@ -77,7 +66,9 @@ module TestDay3 =
|
|||||||
let bytes =
|
let bytes =
|
||||||
try
|
try
|
||||||
File.ReadAllBytes (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day3.txt"))
|
File.ReadAllBytes (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day3.txt"))
|
||||||
with :? FileNotFoundException ->
|
with
|
||||||
|
| :? DirectoryNotFoundException
|
||||||
|
| :? FileNotFoundException ->
|
||||||
Assert.Inconclusive ()
|
Assert.Inconclusive ()
|
||||||
failwith "unreachable"
|
failwith "unreachable"
|
||||||
|
|
||||||
@@ -107,7 +98,9 @@ module TestDay3 =
|
|||||||
let bytes =
|
let bytes =
|
||||||
try
|
try
|
||||||
File.ReadAllBytes (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day3.txt"))
|
File.ReadAllBytes (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day3.txt"))
|
||||||
with :? FileNotFoundException ->
|
with
|
||||||
|
| :? DirectoryNotFoundException
|
||||||
|
| :? FileNotFoundException ->
|
||||||
Assert.Inconclusive ()
|
Assert.Inconclusive ()
|
||||||
failwith "unreachable"
|
failwith "unreachable"
|
||||||
|
|
||||||
|
22
AdventOfCode2023.FSharp/Test/Util.fs
Normal file
22
AdventOfCode2023.FSharp/Test/Util.fs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
namespace AdventOfCode2023.Test
|
||||||
|
|
||||||
|
open System.IO
|
||||||
|
open System.Reflection
|
||||||
|
|
||||||
|
type Dummy =
|
||||||
|
class
|
||||||
|
end
|
||||||
|
|
||||||
|
[<RequireQualifiedAccess>]
|
||||||
|
module Assembly =
|
||||||
|
let getEmbeddedResource (assembly : Assembly) (name : string) : string =
|
||||||
|
let names = assembly.GetManifestResourceNames ()
|
||||||
|
let names = names |> Seq.filter (fun s -> s.EndsWith name)
|
||||||
|
|
||||||
|
use s =
|
||||||
|
names
|
||||||
|
|> Seq.exactlyOne
|
||||||
|
|> assembly.GetManifestResourceStream
|
||||||
|
|> fun s -> new StreamReader (s)
|
||||||
|
|
||||||
|
s.ReadToEnd ()
|
7
AdventOfCode2023.FSharp/Test/samples/day1.txt
Normal file
7
AdventOfCode2023.FSharp/Test/samples/day1.txt
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
two1nine
|
||||||
|
eightwothree
|
||||||
|
abcone2threexyz
|
||||||
|
xtwone3four
|
||||||
|
4nineeightseven2
|
||||||
|
zoneight234
|
||||||
|
7pqrstsixteen
|
4
AdventOfCode2023.FSharp/Test/samples/day1part1.txt
Normal file
4
AdventOfCode2023.FSharp/Test/samples/day1part1.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
1abc2
|
||||||
|
pqr3stu8vwx
|
||||||
|
a1b2c3d4e5f
|
||||||
|
treb7uchet
|
5
AdventOfCode2023.FSharp/Test/samples/day2.txt
Normal file
5
AdventOfCode2023.FSharp/Test/samples/day2.txt
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green
|
||||||
|
Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue
|
||||||
|
Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red
|
||||||
|
Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red
|
||||||
|
Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
|
10
AdventOfCode2023.FSharp/Test/samples/day3.txt
Normal file
10
AdventOfCode2023.FSharp/Test/samples/day3.txt
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
467..114..
|
||||||
|
...*......
|
||||||
|
..35..633.
|
||||||
|
......#...
|
||||||
|
617*......
|
||||||
|
.....+.58.
|
||||||
|
..592.....
|
||||||
|
......755.
|
||||||
|
...$.*....
|
||||||
|
.664.598..
|
63
flake.nix
63
flake.nix
@@ -1,26 +1,45 @@
|
|||||||
{
|
{
|
||||||
description = "Advent of Code 2023";
|
description = "Advent of Code 2023";
|
||||||
inputs = {
|
inputs = {
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-utils,
|
flake-utils,
|
||||||
}: flake-utils.lib.eachDefaultSystem (system:
|
}:
|
||||||
let pkgs = nixpkgs.legacyPackages.${system}; in
|
flake-utils.lib.eachDefaultSystem (
|
||||||
{
|
system: let
|
||||||
devShells = { default = pkgs.mkShell {
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
buildInputs = with pkgs; [
|
in
|
||||||
(with dotnetCorePackages;
|
# Conditionally include Swift and Apple SDK for Darwin systems
|
||||||
combinePackages [
|
let
|
||||||
dotnet-sdk_8
|
darwinDeps =
|
||||||
dotnetPackages.Nuget
|
if system == "x86_64-darwin" || system == "aarch64-darwin"
|
||||||
])
|
then [
|
||||||
] ++ [pkgs.swift darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.CryptoKit darwin.apple_sdk.frameworks.GSS pkgs.zlib pkgs.zlib.dev pkgs.openssl pkgs.icu];
|
pkgs.swift
|
||||||
};};
|
pkgs.darwin.apple_sdk.frameworks.Foundation
|
||||||
}
|
pkgs.darwin.apple_sdk.frameworks.CryptoKit
|
||||||
|
pkgs.darwin.apple_sdk.frameworks.GSS
|
||||||
|
]
|
||||||
|
else [];
|
||||||
|
in {
|
||||||
|
devShells = {
|
||||||
|
default = pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs;
|
||||||
|
[
|
||||||
|
(with dotnetCorePackages;
|
||||||
|
combinePackages [
|
||||||
|
dotnet-sdk_8
|
||||||
|
dotnetPackages.Nuget
|
||||||
|
])
|
||||||
|
]
|
||||||
|
++ darwinDeps
|
||||||
|
++ [pkgs.zlib pkgs.zlib.dev pkgs.openssl pkgs.icu pkgs.alejandra];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user