glguy/aocpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Startup returns a unique_ptr instead of using a static

Browse Source
This commit is contained in:
Eric Mertens
2022-11-21 18:49:22 -08:00
parent b053686349
commit cb70a0b1d2
34 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
2019/01.cpp
View File

@@ -45,7 +45,8 @@ TEST_CASE("part 2") {
}
auto main(int argc, char** argv) -> int {
auto& in = aocpp::Startup(argc, argv);
auto in_ptr = aocpp::Startup(argc, argv);
auto & in = *in_ptr;
std::int64_t weight;
std::int64_t part1 = 0;

2
2019/02.cpp
View File

@@ -37,7 +37,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
std::cout << "Part 1: " << Compute(machine, 12, 2) << std::endl;

3
2019/03.cpp
View File

@@ -67,7 +67,8 @@ auto Record (
} // namespace
auto main(int argc, char** argv) -> int {
auto& in = aocpp::Startup(argc, argv);
auto in_ptr = aocpp::Startup(argc, argv);
auto & in = *in_ptr;
std::string line;
std::getline(in, line);

2
2019/04.cpp
View File

@@ -44,7 +44,7 @@ auto Valid2(std::string const& str) {
} // namespace
auto main(int argc, char** argv) -> int {
auto [lo,hi] = Parse(aocpp::Startup(argc, argv));
auto [lo,hi] = Parse(*aocpp::Startup(argc, argv));
std::int64_t part1 = 0;
std::int64_t part2 = 0;

2
2019/05.cpp
View File

@@ -18,7 +18,7 @@ auto Compute(Machine machine, ValueType d) -> ValueType {
} // namespace
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
std::cout << "Part 1: " << Compute(machine, 1) << std::endl;
std::cout << "Part 2: " << Compute(std::move(machine), 5) << std::endl;
}

2
2019/06.cpp
View File

@@ -89,7 +89,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto parents = Parse(aocpp::Startup(argc, argv));
auto parents = Parse(*aocpp::Startup(argc, argv));
std::cout << "Part 1: " << Part1(parents) << std::endl;
std::cout << "Part 2: " << Part2(parents) << std::endl;
}

2
2019/07.cpp
View File

@@ -86,7 +86,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
std::cout << "Part 1: " << Part1(machine) << std::endl;
std::cout << "Part 2: " << Part2(std::move(machine)) << std::endl;
}

2
2019/08.cpp
View File

@@ -58,7 +58,7 @@ auto Draw(std::string const& picture) {
auto main(int argc, char** argv) -> int {
std::string line;
std::getline(aocpp::Startup(argc, argv), line);
std::getline(*aocpp::Startup(argc, argv), line);
std::cout << "Part 1: " << Part1(line) << std::endl;
Draw(Flatten(line));
}

2
2019/09.cpp
View File

@@ -30,7 +30,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
std::cout << "Part 1: " << Compute(machine, 1) << std::endl;
std::cout << "Part 2: " << Compute(std::move(machine), 2) << std::endl;
}

2
2019/10.cpp
View File

@@ -209,7 +209,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto grid = Grid::Parse(Startup(argc, argv));
auto grid = Grid::Parse(*Startup(argc, argv));
auto [part1, base] = Part1(grid);
std::cout << "Part 1: " << part1 << std::endl;
std::cout << "Part 2: " << Part2(grid, base, 200) << std::endl;

2
2019/11.cpp
View File

@@ -38,7 +38,7 @@ auto Compute(Machine machine, ValueType start)
} // namespace
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
std::cout << "Part 1: " << Compute(machine, 0).size() << "\nPart 2\n";
Draw(std::cout, Compute(std::move(machine), 1));
}

2
2019/12.cpp
View File

@@ -94,7 +94,7 @@ auto Part2(std::array<std::vector<Particle>, 3> const& ps) {
} // namespace
auto main(int argc, char** argv) -> int {
auto ps = Parse(aocpp::Startup(argc, argv));
auto ps = Parse(*aocpp::Startup(argc, argv));
auto part2 = Part2(ps);
auto part1 = Part1(std::move(ps), 1000);

2
2019/13.cpp
View File

@@ -60,7 +60,7 @@ auto Compute2(Machine machine) {
} // namespace
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
std::cout << "Part 1: " << Compute1(machine) << std::endl;
std::cout << "Part 2: " << Compute2(std::move(machine)) << std::endl;
}

2
2019/14.cpp
View File

@@ -229,7 +229,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto recipes = Parse(aocpp::Startup(argc, argv));
auto recipes = Parse(*aocpp::Startup(argc, argv));
auto machine = Machine(recipes);
auto part1 = machine(1);
auto part2 = ComputeFuel(machine, 1'000'000'000'000);

2
2019/15.cpp
View File

@@ -91,7 +91,7 @@ auto Compute(std::map<Coord, ValueType> world) -> std::pair<int, int> {
} // namespace
auto main(int argc, char** argv) -> int {
auto [p1,p2] = Compute(Explore(Machine{ParseStream(aocpp::Startup(argc, argv))}));
auto [p1,p2] = Compute(Explore(Machine{ParseStream(*aocpp::Startup(argc, argv))}));
std::cout << "Part 1: " << p1 << std::endl;
std::cout << "Part 2: " << p2 << std::endl;
}

2
2019/16.cpp
View File

@@ -119,7 +119,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto input = Parse(aocpp::Startup(argc, argv));
auto input = Parse(*aocpp::Startup(argc, argv));
std::cout << "Part 1: " << Compute(input, 100, 0) << std::endl;
std::cout << "Part 2: " << Part2(input) << std::endl;

2
2019/17.cpp
View File

@@ -214,7 +214,7 @@ auto GatherScore(Machine m, std::string const& program) -> ValueType {
} // namespace
auto main(int argc, char** argv) -> int {
auto machine = Machine{ParseStream(aocpp::Startup(argc, argv))};
auto machine = Machine{ParseStream(*aocpp::Startup(argc, argv))};
auto grid = GatherOutput(machine);
auto part1 = ScaffoldAlignments(grid);
auto path = ComputePath(grid);

2
2019/18.cpp
View File

@@ -160,7 +160,7 @@ auto Part2(Grid & grid, Features & features) {
} // namespace
auto main(int argc, char** argv) -> int {
auto grid = Grid::Parse(Startup(argc, argv));
auto grid = Grid::Parse(*Startup(argc, argv));
auto features = FindFeatures(grid);
auto distances = FindDistances(grid, features);
std::cout << "Part 1: " << SolveMaze(distances, "@") << std::endl;

2
2019/19.cpp
View File

@@ -46,7 +46,7 @@ auto Part2(Scanner const& scanner) {
} // namespace
auto main(int argc, char** argv) -> int {
auto scanner = Scanner{Machine{ParseStream(aocpp::Startup(argc, argv))}};
auto scanner = Scanner{Machine{ParseStream(*aocpp::Startup(argc, argv))}};
std::cout << "Part 1: " << Part1(scanner) << std::endl;
std::cout << "Part 2: " << Part2(scanner) << std::endl;
}

2
2019/20.cpp
View File

@@ -150,7 +150,7 @@ auto SolveMaze(Distances const& distances, bool const recursive) -> std::int64_t
} // namespace
auto main(int argc, char** argv) -> int {
auto map = Grid::Parse(Startup(argc, argv));
auto map = Grid::Parse(*Startup(argc, argv));
auto portals = FindPortals(map);
auto distances = FindDistances(map, portals);

2
2019/21.cpp
View File

@@ -263,7 +263,7 @@ auto Compute(
} // namespace
auto main(int argc, char** argv) -> int {
Machine machine {ParseStream(aocpp::Startup(argc, argv))};
Machine machine {ParseStream(*aocpp::Startup(argc, argv))};
Compute(machine, 4,
{ "#####.###########",

2
2019/22.cpp
View File

@@ -115,7 +115,7 @@ auto Many(Shuffle<Cards> shuffle, unsigned long n) -> Shuffle<Cards> {
} // namespace
auto main(int argc, char** argv) -> int {
auto instructions = Parse(Startup(argc, argv));
auto instructions = Parse(*Startup(argc, argv));
auto shuffle1 = FollowInstructions<10007>(instructions);
std::cout << "Part 1: " << shuffle1(2019) << std::endl;

2
2019/23.cpp
View File

@@ -56,7 +56,7 @@ auto Interact(Ethernet & ethernet, Machine & m, std::optional<Payload> p) -> voi
} // namespace
auto main(int const argc, char** const argv) -> int {
auto machines = BuildNetwork(Machine{ParseStream(aocpp::Startup(argc, argv))});
auto machines = BuildNetwork(Machine{ParseStream(*aocpp::Startup(argc, argv))});
auto ethernet = Ethernet{};
std::optional<ValueType> part1;

4
2019/24.cpp
View File

@@ -84,8 +84,8 @@ auto Step(std::vector<C> const& bugs, F with_neighbors = F{})
case 2:
if (!std::binary_search(bugs.begin(), bugs.end(), k)) {
result.push_back(k);
break;
}
break;
}
}
@@ -136,7 +136,7 @@ TEST_SUITE("documented examples") {
}
auto main(int argc, char** argv) -> int {
auto const bugs = FindBugs(Grid::Parse(Startup(argc, argv)));
auto const bugs = FindBugs(Grid::Parse(*Startup(argc, argv)));
std::cout << "Part 1: " << Part1(bugs) << std::endl;
std::cout << "Part 2: " << Part2(std::move(bugs), 200) << std::endl;
}

2
2019/25.cpp
View File

@@ -76,5 +76,5 @@ auto main(int argc, char** argv) -> int {
Search(script);
RunWithIO(Machine{ParseStream(aocpp::Startup(argc, argv))}, script);
RunWithIO(Machine{ParseStream(*aocpp::Startup(argc, argv))}, script);
}