diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/2019/day5/aoc.cpp | 2 | ||||
-rw-r--r-- | src/2019/day5/aoc.h | 1 | ||||
-rw-r--r-- | src/2019/day7/aoc.cpp | 25 | ||||
-rw-r--r-- | src/2019/day7/aoc.h | 2 |
4 files changed, 23 insertions, 7 deletions
diff --git a/src/2019/day5/aoc.cpp b/src/2019/day5/aoc.cpp index 0913e40..d9c3cd0 100644 --- a/src/2019/day5/aoc.cpp +++ b/src/2019/day5/aoc.cpp @@ -112,6 +112,8 @@ int run_computer(std::vector<int> codes) { return outputs[outputs.size() - 1]; } +void run_computer(std::vector<int> codes, std::vector<int>& outputs) { run(0, codes, outputs); } + std::pair<int, int> day5(line_view file) { const char* p = file.line; std::vector<int> optcodes; diff --git a/src/2019/day5/aoc.h b/src/2019/day5/aoc.h index e226eb3..e92cd2e 100644 --- a/src/2019/day5/aoc.h +++ b/src/2019/day5/aoc.h @@ -7,5 +7,6 @@ namespace aoc2019 { void set_computer(int* i); int run_computer(std::vector<int> codes); +void run_computer(std::vector<int> codes, std::vector<int>&); std::pair<int, int> day5(line_view); } diff --git a/src/2019/day7/aoc.cpp b/src/2019/day7/aoc.cpp index 176683a..d654a0c 100644 --- a/src/2019/day7/aoc.cpp +++ b/src/2019/day7/aoc.cpp @@ -1,5 +1,6 @@ #include "aoc.h" #include "../day5/aoc.h" +#include <algorithm> #include <set> namespace aoc2019 { @@ -45,10 +46,7 @@ static void get_number(const char** pp, int* d) { *pp = p; } -int day7(line_view file) { - int max{INT32_MIN}; - int is[10] = {0}; - std::set<int> ns; +std::pair<int, int> day7(line_view file) { std::vector<int> codes; const char* p = file.line; while (p < file.line + file.length) { @@ -59,7 +57,22 @@ int day7(line_view file) { } p++; } - find_max(is, 0, ns, &max, codes); - return max; + int m1{INT32_MIN}; + int is1[10] = {0}; + std::set<int> ns1; + find_max(is1, 0, ns1, &m1, codes); + + for (int i : {5, 6, 7, 8, 9}) { + int is2[10] = {0}; + is2[0] = i; + is2[1] = 33; + set_computer(is2); + std::vector<int> outputs; + run_computer(codes, outputs); + std::for_each(outputs.begin(), outputs.end(), [](int x) { printf("%d ", x); }); + printf("\n"); + } + + return {m1, 0}; } } // namespace aoc2019 diff --git a/src/2019/day7/aoc.h b/src/2019/day7/aoc.h index de34fe8..206e60c 100644 --- a/src/2019/day7/aoc.h +++ b/src/2019/day7/aoc.h @@ -3,5 +3,5 @@ namespace aoc2019 { -int day7(line_view); +std::pair<int, int> day7(line_view); } |